fix(resource_job_template_launch): rename inventory to inventory_id and add support for yaml variables (#59)

Author: jnahelou

awx/resource_job_template_launch.go

@@ -61,19 +61,20 @@ func resourceJobTemplateLaunch() *schema.Resource {
 				ForceNew:    true,
 				Description: "List of comma delimited hosts to limit job execution. Required ask_limit_on_launch set on job_template.",
 			},
-			"inventory": {
+			"inventory_id": {
 				Type:        schema.TypeInt,
 				Required:    false,
 				Optional:    true,
-				Default:     "",
+				Computed:    true,
 				Description: "Override Inventory ID. Required ask_inventory_on_launch set on job_template.",
 				ForceNew:    true,
 			},
 			"extra_vars": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: "Override job template variables. Only JSON content is supported yet.",
+				Description: "Override job template variables. YAML or JSON values are supported.",
 				ForceNew:    true,
+				StateFunc:   normalizeJsonYaml,
 			},
 			"wait_for_completion": {
 				Type:        schema.TypeBool,
@@ -112,9 +113,9 @@ func jobTemplateLaunchWait(ctx context.Context, svc *awx.JobService, job *awx.Jo
 
 // JobTemplateLaunchData provides payload data used by the JobTemplateLaunch method
 type JobTemplateLaunchData struct {
-	Limit     string                 `json:"limit,omitempty"`
-	Inventory int                    `json:"inventory,omitempty"`
-	ExtraVars map[string]interface{} `json:"extra_vars,omitempty"`
+	Limit       string `json:"limit,omitempty"`
+	InventoryID int    `json:"inventory,omitempty"`
+	ExtraVars   string `json:"extra_vars,omitempty"`
 }
 
 func resourceJobTemplateLaunchCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -129,21 +130,10 @@ func resourceJobTemplateLaunchCreate(ctx context.Context, d *schema.ResourceData
 		return buildDiagNotFoundFail("job template", jobTemplateID, err)
 	}
 
-	var iExtraVars map[string]interface{}
-	err = json.Unmarshal([]byte(d.Get("extra_vars").(string)), &iExtraVars)
-	if err != nil {
-		diags = append(diags, diag.Diagnostic{
-			Severity: diag.Error,
-			Summary:  "Failed to decode extra_vars",
-			Detail:   fmt.Sprintf("JobTemplateLaunch with template ID %d, failed to decode extra_vars %s", d.Get("job_template_id").(int), err.Error()),
-		})
-		return diags
-	}
-
 	data := JobTemplateLaunchData{
-		Limit:     d.Get("limit").(string),
-		Inventory: d.Get("inventory").(int),
-		ExtraVars: iExtraVars,
+		Limit:       d.Get("limit").(string),
+		InventoryID: d.Get("inventory_id").(int),
+		ExtraVars:   d.Get("extra_vars").(string),
 	}
 
 	var iData map[string]interface{}
@@ -170,7 +160,7 @@ func resourceJobTemplateLaunchCreate(ctx context.Context, d *schema.ResourceData
 			diags = append(diags, diag.Diagnostic{
 				Severity: diag.Error,
 				Summary:  "JobTemplate execution failure",
-				Detail:   fmt.Sprintf("JobTemplateLaunch with template ID %d, failed to complete %s", d.Get("job_template_id").(int), err.Error()),
+				Detail:   fmt.Sprintf("JobTemplateLaunch with ID %d and template ID %d, failed to complete %s", res.ID, d.Get("job_template_id").(int), err.Error()),
 			})
 		}
 	}