update logic to support empty cloudprovider and cloudprovider_id

Author: lorenzo-merici

sysdig/data_source_sysdig_secure_onboarding.go

@@ -369,14 +369,6 @@ func dataSourceSysdigSecureCloudIngestionAssets() *schema.Resource {
 				Type:     schema.TypeMap,
 				Computed: true,
 			},
-			"sns_routing_key": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"sns_metadata": {
-				Type:     schema.TypeMap,
-				Computed: true,
-			},
 		},
 	}
 }
@@ -396,12 +388,17 @@ func dataSourceSysdigSecureCloudIngestionAssetsRead(ctx context.Context, d *sche
 	assetsAws, _ := assets["aws"].(map[string]interface{})
 	assetsGcp, _ := assets["gcp"].(map[string]interface{})
 
+	var ingestionURL string
+	if assetsAws["snsMetadata"] != nil {
+		ingestionURL = assetsAws["snsMetadata"].(map[string]interface{})["ingestionURL"].(string)
+	}
+
 	d.SetId("cloudIngestionAssets")
 	err = d.Set("aws", map[string]interface{}{
 		"eventBusARN":     assetsAws["eventBusARN"],
 		"eventBusARNGov":  assetsAws["eventBusARNGov"],
 		"sns_routing_key": assetsAws["snsRoutingKey"],
-		"sns_metadata":    assetsAws["snsMetadata"],
+		"sns_routing_url": ingestionURL,
 	})
 	if err != nil {
 		return diag.FromErr(err)

sysdig/data_source_sysdig_secure_onboarding_test.go

@@ -176,10 +176,10 @@ func TestAccCloudIngestionAssetsDataSource(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: `data "sysdig_secure_cloud_ingestion_assets" "assets" { 
-			cloud_provider = "invalid" 
-			cloud_provider_id = "123"
-			}`,
+				Config: `data "sysdig_secure_cloud_ingestion_assets" "assets" {
+						cloud_provider = "invalid"
+						cloud_provider_id = "123"
+						}`,
 				ExpectError: regexp.MustCompile(`.*expected cloud_provider to be one of.*`),
 			},
 			{
@@ -201,8 +201,8 @@ func TestAccCloudIngestionAssetsDataSource(t *testing.T) {
 						cloud_provider_id = "012345678901"
 				}`,
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttrSet("data.sysdig_secure_cloud_ingestion_assets.assets", "sns_routing_key"),
-					// not asserting the gov exported fields because not every backend environment is gov supported and thus will have empty values
+					resource.TestCheckResourceAttrSet("data.sysdig_secure_cloud_ingestion_assets.assets", "aws.sns_routing_key"),
+					resource.TestCheckResourceAttrSet("data.sysdig_secure_cloud_ingestion_assets.assets", "aws.sns_routing_url"),
 				),
 			},
 		},