Handle aggregatedList case for generated sweepers

Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Jan 8, 2020 · b4893f1 · b4893f1
1 parent 1a7013b
commit b4893f1
Show file tree

Hide file tree

Showing 89 changed files with 974 additions and 333 deletions.
diff --git a/google-beta/resource_app_engine_domain_mapping_sweeper_test.go b/google-beta/resource_app_engine_domain_mapping_sweeper_test.go
@@ -70,7 +70,7 @@ func testSweepAppEngineDomainMapping(region string) error {
 
 	res, err := sendRequest(config, "GET", config.Project, listUrl, nil)
 	if err != nil {
-		log.Printf("[INFO] Unable to list %s: %s", resourceName, err)
+		log.Printf("[INFO] Unable to list resource %s (url %s ): %s", resourceName, listUrl, err)
 		return nil
 	}
 
@@ -80,13 +80,12 @@ func testSweepAppEngineDomainMapping(region string) error {
 		return nil
 	}
 
-	rl := resourceList.([]interface{})
+	rl := resourceList.([]map[string]interface{})
 
 	log.Printf("[INFO] Found %d items in %s list response.", len(rl), resourceName)
 	// items who don't match the tf-test prefix
 	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
+	for _, obj := range rl {
 		if obj["name"] == nil {
 			log.Printf("[INFO] %s resource name was nil", resourceName)
 			return nil

diff --git a/google-beta/resource_big_query_dataset_sweeper_test.go b/google-beta/resource_big_query_dataset_sweeper_test.go
@@ -70,7 +70,7 @@ func testSweepBigQueryDataset(region string) error {
 
 	res, err := sendRequest(config, "GET", config.Project, listUrl, nil)
 	if err != nil {
-		log.Printf("[INFO] Unable to list %s: %s", resourceName, err)
+		log.Printf("[INFO] Unable to list resource %s (url %s ): %s", resourceName, listUrl, err)
 		return nil
 	}
 
@@ -80,13 +80,12 @@ func testSweepBigQueryDataset(region string) error {
 		return nil
 	}
 
-	rl := resourceList.([]interface{})
+	rl := resourceList.([]map[string]interface{})
 
 	log.Printf("[INFO] Found %d items in %s list response.", len(rl), resourceName)
 	// items who don't match the tf-test prefix
 	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
+	for _, obj := range rl {
 		if obj["name"] == nil {
 			log.Printf("[INFO] %s resource name was nil", resourceName)
 			return nil

diff --git a/google-beta/resource_bigquery_data_transfer_config_sweeper_test.go b/google-beta/resource_bigquery_data_transfer_config_sweeper_test.go
@@ -70,7 +70,7 @@ func testSweepBigqueryDataTransferConfig(region string) error {
 
 	res, err := sendRequest(config, "GET", config.Project, listUrl, nil)
 	if err != nil {
-		log.Printf("[INFO] Unable to list %s: %s", resourceName, err)
+		log.Printf("[INFO] Unable to list resource %s (url %s ): %s", resourceName, listUrl, err)
 		return nil
 	}
 
@@ -80,13 +80,12 @@ func testSweepBigqueryDataTransferConfig(region string) error {
 		return nil
 	}
 
-	rl := resourceList.([]interface{})
+	rl := resourceList.([]map[string]interface{})
 
 	log.Printf("[INFO] Found %d items in %s list response.", len(rl), resourceName)
 	// items who don't match the tf-test prefix
 	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
+	for _, obj := range rl {
 		if obj["name"] == nil {
 			log.Printf("[INFO] %s resource name was nil", resourceName)
 			return nil

diff --git a/google-beta/resource_billing_budget_sweeper_test.go b/google-beta/resource_billing_budget_sweeper_test.go
@@ -70,7 +70,7 @@ func testSweepBillingBudget(region string) error {
 
 	res, err := sendRequest(config, "GET", config.Project, listUrl, nil)
 	if err != nil {
-		log.Printf("[INFO] Unable to list %s: %s", resourceName, err)
+		log.Printf("[INFO] Unable to list resource %s (url %s ): %s", resourceName, listUrl, err)
 		return nil
 	}
 
@@ -80,13 +80,12 @@ func testSweepBillingBudget(region string) error {
 		return nil
 	}
 
-	rl := resourceList.([]interface{})
+	rl := resourceList.([]map[string]interface{})
 
 	log.Printf("[INFO] Found %d items in %s list response.", len(rl), resourceName)
 	// items who don't match the tf-test prefix
 	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
+	for _, obj := range rl {
 		if obj["name"] == nil {
 			log.Printf("[INFO] %s resource name was nil", resourceName)
 			return nil

diff --git a/google-beta/resource_binary_authorization_attestor_sweeper_test.go b/google-beta/resource_binary_authorization_attestor_sweeper_test.go
@@ -70,7 +70,7 @@ func testSweepBinaryAuthorizationAttestor(region string) error {
 
 	res, err := sendRequest(config, "GET", config.Project, listUrl, nil)
 	if err != nil {
-		log.Printf("[INFO] Unable to list %s: %s", resourceName, err)
+		log.Printf("[INFO] Unable to list resource %s (url %s ): %s", resourceName, listUrl, err)
 		return nil
 	}
 
@@ -80,13 +80,12 @@ func testSweepBinaryAuthorizationAttestor(region string) error {
 		return nil
 	}
 
-	rl := resourceList.([]interface{})
+	rl := resourceList.([]map[string]interface{})
 
 	log.Printf("[INFO] Found %d items in %s list response.", len(rl), resourceName)
 	// items who don't match the tf-test prefix
 	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
+	for _, obj := range rl {
 		if obj["name"] == nil {
 			log.Printf("[INFO] %s resource name was nil", resourceName)
 			return nil

diff --git a/google-beta/resource_cloud_build_trigger_sweeper_test.go b/google-beta/resource_cloud_build_trigger_sweeper_test.go
@@ -70,7 +70,7 @@ func testSweepCloudBuildTrigger(region string) error {
 
 	res, err := sendRequest(config, "GET", config.Project, listUrl, nil)
 	if err != nil {
-		log.Printf("[INFO] Unable to list %s: %s", resourceName, err)
+		log.Printf("[INFO] Unable to list resource %s (url %s ): %s", resourceName, listUrl, err)
 		return nil
 	}
 
@@ -80,13 +80,12 @@ func testSweepCloudBuildTrigger(region string) error {
 		return nil
 	}
 
-	rl := resourceList.([]interface{})
+	rl := resourceList.([]map[string]interface{})
 
 	log.Printf("[INFO] Found %d items in %s list response.", len(rl), resourceName)
 	// items who don't match the tf-test prefix
 	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
+	for _, obj := range rl {
 		if obj["name"] == nil {
 			log.Printf("[INFO] %s resource name was nil", resourceName)
 			return nil

diff --git a/google-beta/resource_cloud_run_domain_mapping_sweeper_test.go b/google-beta/resource_cloud_run_domain_mapping_sweeper_test.go
@@ -70,7 +70,7 @@ func testSweepCloudRunDomainMapping(region string) error {
 
 	res, err := sendRequest(config, "GET", config.Project, listUrl, nil)
 	if err != nil {
-		log.Printf("[INFO] Unable to list %s: %s", resourceName, err)
+		log.Printf("[INFO] Unable to list resource %s (url %s ): %s", resourceName, listUrl, err)
 		return nil
 	}
 
@@ -80,13 +80,12 @@ func testSweepCloudRunDomainMapping(region string) error {
 		return nil
 	}
 
-	rl := resourceList.([]interface{})
+	rl := resourceList.([]map[string]interface{})
 
 	log.Printf("[INFO] Found %d items in %s list response.", len(rl), resourceName)
 	// items who don't match the tf-test prefix
 	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
+	for _, obj := range rl {
 		if obj["name"] == nil {
 			log.Printf("[INFO] %s resource name was nil", resourceName)
 			return nil

diff --git a/google-beta/resource_cloud_run_service_sweeper_test.go b/google-beta/resource_cloud_run_service_sweeper_test.go
@@ -70,7 +70,7 @@ func testSweepCloudRunService(region string) error {
 
 	res, err := sendRequest(config, "GET", config.Project, listUrl, nil)
 	if err != nil {
-		log.Printf("[INFO] Unable to list %s: %s", resourceName, err)
+		log.Printf("[INFO] Unable to list resource %s (url %s ): %s", resourceName, listUrl, err)
 		return nil
 	}
 
@@ -80,13 +80,12 @@ func testSweepCloudRunService(region string) error {
 		return nil
 	}
 
-	rl := resourceList.([]interface{})
+	rl := resourceList.([]map[string]interface{})
 
 	log.Printf("[INFO] Found %d items in %s list response.", len(rl), resourceName)
 	// items who don't match the tf-test prefix
 	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
+	for _, obj := range rl {
 		if obj["name"] == nil {
 			log.Printf("[INFO] %s resource name was nil", resourceName)
 			return nil

diff --git a/google-beta/resource_cloud_scheduler_job_sweeper_test.go b/google-beta/resource_cloud_scheduler_job_sweeper_test.go
@@ -70,7 +70,7 @@ func testSweepCloudSchedulerJob(region string) error {
 
 	res, err := sendRequest(config, "GET", config.Project, listUrl, nil)
 	if err != nil {
-		log.Printf("[INFO] Unable to list %s: %s", resourceName, err)
+		log.Printf("[INFO] Unable to list resource %s (url %s ): %s", resourceName, listUrl, err)
 		return nil
 	}
 
@@ -80,13 +80,12 @@ func testSweepCloudSchedulerJob(region string) error {
 		return nil
 	}
 
-	rl := resourceList.([]interface{})
+	rl := resourceList.([]map[string]interface{})
 
 	log.Printf("[INFO] Found %d items in %s list response.", len(rl), resourceName)
 	// items who don't match the tf-test prefix
 	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
+	for _, obj := range rl {
 		if obj["name"] == nil {
 			log.Printf("[INFO] %s resource name was nil", resourceName)
 			return nil

diff --git a/google-beta/resource_cloud_tasks_queue_sweeper_test.go b/google-beta/resource_cloud_tasks_queue_sweeper_test.go
@@ -70,7 +70,7 @@ func testSweepCloudTasksQueue(region string) error {
 
 	res, err := sendRequest(config, "GET", config.Project, listUrl, nil)
 	if err != nil {
-		log.Printf("[INFO] Unable to list %s: %s", resourceName, err)
+		log.Printf("[INFO] Unable to list resource %s (url %s ): %s", resourceName, listUrl, err)
 		return nil
 	}
 
@@ -80,13 +80,12 @@ func testSweepCloudTasksQueue(region string) error {
 		return nil
 	}
 
-	rl := resourceList.([]interface{})
+	rl := resourceList.([]map[string]interface{})
 
 	log.Printf("[INFO] Found %d items in %s list response.", len(rl), resourceName)
 	// items who don't match the tf-test prefix
 	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
+	for _, obj := range rl {
 		if obj["name"] == nil {
 			log.Printf("[INFO] %s resource name was nil", resourceName)
 			return nil

diff --git a/google-beta/resource_compute_address_sweeper_test.go b/google-beta/resource_compute_address_sweeper_test.go
@@ -70,7 +70,7 @@ func testSweepComputeAddress(region string) error {
 
 	res, err := sendRequest(config, "GET", config.Project, listUrl, nil)
 	if err != nil {
-		log.Printf("[INFO] Unable to list %s: %s", resourceName, err)
+		log.Printf("[INFO] Unable to list resource %s (url %s ): %s", resourceName, listUrl, err)
 		return nil
 	}
 
@@ -80,13 +80,12 @@ func testSweepComputeAddress(region string) error {
 		return nil
 	}
 
-	rl := resourceList.([]interface{})
+	rl := resourceList.([]map[string]interface{})
 
 	log.Printf("[INFO] Found %d items in %s list response.", len(rl), resourceName)
 	// items who don't match the tf-test prefix
 	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
+	for _, obj := range rl {
 		if obj["name"] == nil {
 			log.Printf("[INFO] %s resource name was nil", resourceName)
 			return nil