feat: schedule extra data

Author: Alexandre Bortoluzzi

awx/helpers.go

@@ -168,3 +168,20 @@ func normalizeYamlOk(s interface{}) (string, bool) {
 	b, _ := yaml.Marshal(j)
 	return string(b[:]), true
 }
+
+func unmarshalYaml(str string) map[string]interface{} {
+	asMap := map[string]interface{}{}
+	err := yaml.Unmarshal([]byte(str), &asMap)
+	if err != nil {
+		asMap = nil
+	}
+	return asMap
+}
+
+func marshalYaml(v interface{}) string {
+	extraDataBytes, err := yaml.Marshal(v)
+	if err != nil {
+		return string(extraDataBytes)
+	}
+	return ""
+}

awx/resource_schedule.go

@@ -8,6 +8,9 @@ resource "awx_schedule" "default" {
   name                      = "schedule-test"
   rrule                     = "DTSTART;TZID=Europe/Paris:20211214T120000 RRULE:INTERVAL=1;FREQ=DAILY"
   unified_job_template_id   = awx_job_template.baseconfig.id
+  extra_data                = <<EOL
+organization_name: testorg
+EOL
 }
 ```
 
@@ -58,6 +61,12 @@ func resourceSchedule() *schema.Resource {
 				Type:     schema.TypeInt,
 				Optional: true,
 			},
+			"extra_data": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Default:     "",
+				Description: "Extra data to be pass for the schedule (YAML format)",
+			},
 		},
 	}
 }
@@ -74,6 +83,7 @@ func resourceScheduleCreate(ctx context.Context, d *schema.ResourceData, m inter
 		"description":          d.Get("description").(string),
 		"enabled":              d.Get("enabled").(bool),
 		"inventory":            d.Get("inventory").(int),
+		"extra_data":           unmarshalYaml(d.Get("extra_data").(string)),
 	}, map[string]string{})
 	if err != nil {
 		log.Printf("Fail to Create Schedule %v", err)
@@ -110,7 +120,8 @@ func resourceScheduleUpdate(ctx context.Context, d *schema.ResourceData, m inter
 		"unified_job_template": d.Get("unified_job_template_id").(int),
 		"description":          d.Get("description").(string),
 		"enabled":              d.Get("enabled").(bool),
-		"inventory":            d.Get("inventory").(int),
+		"inventory":            AtoipOr(d.Get("inventory").(string), nil),
+		"extra_data":           unmarshalYaml(d.Get("extra_data").(string)),
 	}, map[string]string{})
 	if err != nil {
 		diags = append(diags, diag.Diagnostic{
@@ -167,6 +178,7 @@ func setScheduleResourceData(d *schema.ResourceData, r *awx.Schedule) *schema.Re
 	d.Set("description", r.Description)
 	d.Set("enabled", r.Enabled)
 	d.Set("inventory", r.Inventory)
+	d.Set("extra_data", marshalYaml(r.ExtraData))
 	d.SetId(strconv.Itoa(r.ID))
 	return d
 }

awx/resource_workflow_job_template_schedule.go

@@ -9,6 +9,9 @@ resource "awx_workflow_job_template_schedule" "default" {
 
   name                      = "schedule-test"
   rrule                     = "DTSTART;TZID=Europe/Paris:20211214T120000 RRULE:INTERVAL=1;FREQ=DAILY"
+  extra_data                = <<EOL
+organization_name: testorg
+EOL
 }
 ```
 
@@ -39,7 +42,6 @@ func resourceWorkflowJobTemplateSchedule() *schema.Resource {
 				Required:    true,
 				Description: "The workflow_job_template id for this schedule",
 			},
-
 			"name": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -66,12 +68,11 @@ func resourceWorkflowJobTemplateSchedule() *schema.Resource {
 				Optional:    true,
 				Description: "Inventory applied as a prompt, assuming job template prompts for inventory (id, default=``)",
 			},
-            "extra_data": {
+			"extra_data": {
 				Type:        schema.TypeString,
 				Optional:    true,
 				Default:     "",
-                Description: "Extra data to be pass for the scheudle (same like extra_vars)",
-				StateFunc:   normalizeJsonYaml,
+				Description: "Extra data to be pass for the schedule (YAML format)",
 			},
 		},
 	}
@@ -90,7 +91,7 @@ func resourceWorkflowJobTemplateScheduleCreate(ctx context.Context, d *schema.Re
 		"description": d.Get("description").(string),
 		"enabled":     d.Get("enabled").(bool),
 		"inventory":   AtoipOr(d.Get("inventory").(string), nil),
-        "extra_data":  d.Get("extra_data").(string),
+		"extra_data":  unmarshalYaml(d.Get("extra_data").(string)),
 	}, map[string]string{})
 	if err != nil {
 		log.Printf("Fail to Create Schedule for WorkflowJobTemplate %d: %v", workflowJobTemplateID, err)

go.mod

@@ -3,7 +3,7 @@ module github.com/denouche/terraform-provider-awx
 go 1.14
 
 require (
-	github.com/denouche/goawx v0.17.0
+	github.com/denouche/goawx v0.18.1
 	github.com/gruntwork-io/terratest v0.31.2
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1
 	github.com/stretchr/testify v1.7.0

go.sum

@@ -137,8 +137,8 @@ github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/denouche/goawx v0.17.0 h1:mtCfsYdKBSTO/3BGFPU7q13shAneLSlaJYEmqgLVwC0=
-github.com/denouche/goawx v0.17.0/go.mod h1:MppzSteoj2xgfiqiRWW/Bf1a8z2FrRyvah1z0J2vJTY=
+github.com/denouche/goawx v0.18.1 h1:fYwrvnmOrLc8OKOjhSAZnO/engSJsIjBKp6ytQABfsk=
+github.com/denouche/goawx v0.18.1/go.mod h1:MppzSteoj2xgfiqiRWW/Bf1a8z2FrRyvah1z0J2vJTY=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=