Fixed agent create crash (#6570)

* Fixed agent create crash

* Fixed agent delete logic

Author: VaishnaviGopal

ibm/service/schematics/resource_ibm_schematics_agent.go

@@ -586,7 +586,14 @@ func resourceIbmSchematicsAgentCreate(context context.Context, d *schema.Resourc
 	if _, ok := d.GetOk("agent_metadata"); ok {
 		var agentMetadata []schematicsv1.AgentMetadataInfo
 		for _, e := range d.Get("agent_metadata").([]interface{}) {
-			value := e.(map[string]interface{})
+			if e == nil {
+				continue
+			}
+
+			value, ok := e.(map[string]interface{})
+			if !ok {
+				continue
+			}
 			agentMetadataItem, err := resourceIbmSchematicsAgentMapToAgentMetadataInfo(value)
 			if err != nil {
 				tfErr := flex.TerraformErrorf(err, fmt.Sprintf("resourceIbmSchematicsAgentCreate failed: %s", err.Error()), "ibm_schematics_agent", "create")
@@ -1061,24 +1068,48 @@ func resourceIbmSchematicsAgentDelete(context context.Context, d *schema.Resourc
 	deleteAgentDataOptions.Headers = ff
 
 	deleteAgentDataOptions.SetAgentID(d.Id())
+	// get the agent data and check if deploy resources exist and then call this
 
-	// first try destroying resources associated with agent deploy and then delete the agent
-
-	deleteAgentResourcesOptions := &schematicsv1.DeleteAgentResourcesOptions{}
-	deleteAgentResourcesOptions.Headers = ff
+	getAgentDataOptions := &schematicsv1.GetAgentDataOptions{
+		Profile: core.StringPtr("detailed"),
+	}
 
-	deleteAgentResourcesOptions.SetAgentID(d.Id())
-	deleteAgentResourcesOptions.SetRefreshToken(iamRefreshToken)
+	getAgentDataOptions.SetAgentID(d.Id())
 
-	response, err := schematicsClient.DeleteAgentResourcesWithContext(context, deleteAgentResourcesOptions)
+	agentData, response, err := schematicsClient.GetAgentDataWithContext(context, getAgentDataOptions)
 	if err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("resourceIbmSchematicsAgentDelete DeleteAgentResourcesWithContext failed with error: %s and response:\n%s", err, response), "ibm_schematics_agent", "delete")
+		if response != nil && response.StatusCode == 404 {
+			d.SetId("")
+			return nil
+		}
+
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("resourceIbmSchematicsAgentUpdate GetAgentDataWithContext failed with error: %s and response:\n%s", err, response), "ibm_schematics_agent", "update")
 		log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
-	} else {
-		_, err = isWaitForAgentDestroyResources(context, schematicsClient, *deleteAgentResourcesOptions.AgentID, d.Timeout(schema.TimeoutDelete))
-		if err != nil {
+		return tfErr.GetDiag()
+	}
+
+	// first try destroying resources associated with agent deploy and then delete the agent
+	if agentData.RecentDeployJob != nil {
+		if agentData.RecentDeployJob.JobID != nil {
+			// first try destroying resources associated with agent deploy and then delete the agent
+			deleteAgentResourcesOptions := &schematicsv1.DeleteAgentResourcesOptions{}
+			deleteAgentResourcesOptions.Headers = ff
+
+			deleteAgentResourcesOptions.SetAgentID(d.Id())
+			deleteAgentResourcesOptions.SetRefreshToken(iamRefreshToken)
 
+			response, err := schematicsClient.DeleteAgentResourcesWithContext(context, deleteAgentResourcesOptions)
+			if err != nil {
+				tfErr := flex.TerraformErrorf(err, fmt.Sprintf("resourceIbmSchematicsAgentDelete DeleteAgentResourcesWithContext failed with error: %s and response:\n%s", err, response), "ibm_schematics_agent", "delete")
+				log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
+			} else {
+				_, err = isWaitForAgentDestroyResources(context, schematicsClient, *deleteAgentResourcesOptions.AgentID, d.Timeout(schema.TimeoutDelete))
+				if err != nil {
+
+				}
+			}
 		}
+
 	}
 
 	// After deploy associated resources are destroyed, now attempt to delete the agent

ibm/service/schematics/resource_ibm_schematics_agent_test.go

@@ -58,11 +58,11 @@ func TestAccIbmSchematicsAgentBasic(t *testing.T) {
 func TestAccIbmSchematicsAgentAllArgs(t *testing.T) {
 	var conf schematicsv1.AgentData
 	name := fmt.Sprintf("tf_name_%d", acctest.RandIntRange(10, 100))
-	version := "1.1.0"
+	version := "1.4.0"
 	schematicsLocation := "us-south"
 	agentLocation := "eu-de"
 	nameUpdate := fmt.Sprintf("tf_name_%d", acctest.RandIntRange(10, 100))
-	versionUpdate := "1.2.0"
+	versionUpdate := "1.5.0"
 	schematicsLocationUpdate := "us-east"
 	agentLocationUpdate := "eu-gb"
 	description := fmt.Sprintf("tf_description_%d", acctest.RandIntRange(10, 100))
@@ -94,6 +94,19 @@ func TestAccIbmSchematicsAgentAllArgs(t *testing.T) {
 					resource.TestCheckResourceAttr("ibm_schematics_agent.schematics_agent_instance", "description", descriptionUpdate),
 				),
 			},
+			resource.TestStep{
+				Config: testAccIbmSchematicsAgentConfig_withMetadata(name, version, schematicsLocation, agentLocation),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckIbmSchematicsAgentExists("ibm_schematics_agent.schematics_agent_instance", conf),
+					resource.TestCheckResourceAttr("ibm_schematics_agent.schematics_agent_instance", "name", name),
+					resource.TestCheckResourceAttr("ibm_schematics_agent.schematics_agent_instance", "version", version),
+					resource.TestCheckResourceAttr("ibm_schematics_agent.schematics_agent_instance", "schematics_location", schematicsLocation),
+					resource.TestCheckResourceAttr("ibm_schematics_agent.schematics_agent_instance", "agent_location", agentLocation),
+					resource.TestCheckResourceAttr("ibm_schematics_agent.schematics_agent_instance", "agent_metadata.#", "2"),
+					resource.TestCheckResourceAttr("ibm_schematics_agent.schematics_agent_instance", "agent_metadata.0.name", "purpose"),
+					resource.TestCheckResourceAttr("ibm_schematics_agent.schematics_agent_instance", "agent_metadata.0.value.0", "terraform"),
+				),
+			},
 			resource.TestStep{
 				ResourceName:      "ibm_schematics_agent.schematics_agent_instance",
 				ImportState:       true,
@@ -151,6 +164,39 @@ func testAccCheckIbmSchematicsAgentConfig(name string, version string, schematic
 	`, name, version, schematicsLocation, agentLocation, description)
 }
 
+func testAccIbmSchematicsAgentConfig_withMetadata(name, version, schematicsLocation, agentLocation string) string {
+	return fmt.Sprintf(`
+		resource "ibm_schematics_agent" "schematics_agent_instance" {
+			name = "%s"
+			resource_group = "Default"
+			version = "%s"
+			schematics_location = "%s"
+			agent_location = "%s"
+            tags           = ["test-tag"]
+			agent_infrastructure {
+				infra_type = "ibm_kubernetes"
+				cluster_id = "cluster_id"
+				cluster_resource_group = "cluster_resource_group"
+				cos_instance_name = "cos_instance_name"
+				cos_bucket_name = "cos_bucket_name"
+				cos_bucket_region = "cos_bucket_region"
+			}
+
+			// This block triggers the loop at line 589          
+            agent_metadata {
+                name = "purpose"
+				value = ["terraform"]
+            }
+			// Adding a second block to ensure the loop handles multiple items
+			agent_metadata {
+				name  = "purpose"
+				value = ["testing"]
+			}
+            
+		}
+	`, name, version, schematicsLocation, agentLocation)
+}
+
 func testAccCheckIbmSchematicsAgentExists(n string, obj schematicsv1.AgentData) resource.TestCheckFunc {
 
 	return func(s *terraform.State) error {