Account validation changes (#275)

Author: AnushreeHS

prismacloud/resource_org_cloud_account_v2.go

@@ -1073,7 +1073,7 @@ func readOrgV2CloudAccount(ctx context.Context, d *schema.ResourceData, meta int
 	client := meta.(*pc.Client)
 	cloudType, id := IdToTwoStrings(d.Id())
 
-	_, err := org.Get(client, cloudType, id)
+	cloudAccount, err := org.Get(client, cloudType, id)
 	if err != nil {
 		if err == pc.ObjectNotFoundError {
 			d.SetId("")
@@ -1082,6 +1082,27 @@ func readOrgV2CloudAccount(ctx context.Context, d *schema.ResourceData, meta int
 		return diag.FromErr(err)
 	}
 
+	switch cloudType {
+	case org.TypeAwsOrg:
+		cloudAccountAws := cloudAccount.(org.AwsOrgV2)
+		if cloudAccountAws.CloudAccountResp.Deleted == true {
+			d.SetId("")
+		}
+		return nil
+	case org.TypeAzureOrg:
+		orgAccountAzure := cloudAccount.(org.AzureOrgV2)
+		if orgAccountAzure.CloudAccountAzureResp.Deleted == true {
+			d.SetId("")
+		}
+		return nil
+	case org.TypeGcpOrg:
+		orgAccountGcp := cloudAccount.(org.GcpOrgV2)
+		if orgAccountGcp.CloudAccountGcpResp.Deleted == true {
+			d.SetId("")
+		}
+		return nil
+	}
+
 	return nil
 }
 

prismacloud/resource_v2_cloud_account.go

@@ -1264,7 +1264,7 @@ func readV2CloudAccount(ctx context.Context, d *schema.ResourceData, meta interf
 	client := meta.(*pc.Client)
 	cloudType, id := IdToTwoStrings(d.Id())
 
-	_, err := accountv2.Get(client, cloudType, id)
+	cloudAccount, err := accountv2.Get(client, cloudType, id)
 	if err != nil {
 		if err == pc.ObjectNotFoundError {
 			d.SetId("")
@@ -1273,6 +1273,33 @@ func readV2CloudAccount(ctx context.Context, d *schema.ResourceData, meta interf
 		return diag.FromErr(err)
 	}
 
+	switch cloudType {
+	case accountv2.TypeAws:
+		cloudAccountAws := cloudAccount.(accountv2.AwsV2)
+		if cloudAccountAws.CloudAccountResp.Deleted == true {
+			d.SetId("")
+		}
+		return nil
+	case accountv2.TypeAzure:
+		cloudAccountAzure := cloudAccount.(accountv2.AzureV2)
+		if cloudAccountAzure.CloudAccountAzureResp.Deleted == true {
+			d.SetId("")
+		}
+		return nil
+	case accountv2.TypeGcp:
+		cloudAccountGcp := cloudAccount.(accountv2.GcpV2)
+		if cloudAccountGcp.CloudAccountGcpResp.Deleted == true {
+			d.SetId("")
+		}
+		return nil
+	case accountv2.TypeIbm:
+		cloudAccountIbm := cloudAccount.(accountv2.IbmV2)
+		if cloudAccountIbm.CloudAccountIbmResp.Deleted == true {
+			d.SetId("")
+		}
+		return nil
+	}
+
 	return nil
 }