Merge pull request #138 from logicmonitor/DEV-241301-ExternalIdFixAWS

AWSExternalIdandCreatedAtFix

Author: lm-madhvi

logicmonitor/resources/data_resource_aws_external_id_resource.go

@@ -42,6 +42,10 @@ func getAwsExternalId(ctx context.Context, d *schema.ResourceData, m interface{}
 	}
 
 	respModel := resp.GetPayload()
+	if respModel == nil {
+		diags = append(diags, diag.Errorf("no AWS external ID returned from API")...)
+		return diags
+	}
 	schemata.SetAwsExternalIDResourceData(d, respModel)
 	return diags
 }

logicmonitor/schemata/aws_external_id_schema.go

@@ -11,12 +11,12 @@ func AwsExternalIDSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"created_at": {
 			Type: schema.TypeString,
-			Optional: true,
+			Computed: true,
 		},
 
 		"external_id": {
 			Type: schema.TypeString,
-			Optional: true,
+			Computed: true,
 		},
 
 	}
@@ -42,18 +42,12 @@ func SetAwsExternalIDSubResourceData(m []*models.AwsExternalID) (d []*map[string
 
 func AwsExternalIDModel(d map[string]interface{}) *models.AwsExternalID {
 	// assume that the incoming map only contains the relevant resource data
-	createdAt := d["created_at"].(string)
-	externalID := d["external_id"].(string)
 
 	return &models.AwsExternalID {
-		CreatedAt: createdAt,
-		ExternalID: externalID,
 	}
 }
 
 func GetAwsExternalIDPropertyFields() (t []string) {
 	return []string{
-		"created_at",
-		"external_id",
 	}
 }