Handle aggregatedList case for generated sweepers (#2941)

Merged PR #2941.
GoogleCloudPlatform · Jan 9, 2020 · b66fd1d · b66fd1d
1 parent 19d8796
commit b66fd1d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 14 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/products/compute/terraform.yaml b/products/compute/terraform.yaml
@@ -72,8 +72,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       post_create: templates/terraform/post_create/labels.erb
   Autoscaler: !ruby/object:Overrides::Terraform::ResourceOverride
-    # TODO: Remove when aggregatedList is handled in sweeper generation
-    skip_sweeper: true
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "autoscaler_single_instance"
@@ -1010,8 +1008,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       decoder: templates/terraform/decoders/unwrap_resource.go.erb
       encoder: templates/terraform/encoders/compute_network_endpoint.go.erb
   NetworkEndpointGroup: !ruby/object:Overrides::Terraform::ResourceOverride
-    # TODO: Remove when aggregatedList is handled in sweeper generation
-    skip_sweeper: true
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "network_endpoint_group"
@@ -1030,8 +1026,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         required: false
         default_from_api: true
   NodeGroup: !ruby/object:Overrides::Terraform::ResourceOverride
-    # TODO: Remove when aggregatedList is handled in sweeper generation
-    skip_sweeper: true
     docs: !ruby/object:Provider::Terraform::Docs
       warning: |
         Due to limitations of the API, Terraform cannot update the
@@ -1343,8 +1337,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       snapshotSchedulePolicy.snapshotProperties.storageLocations: !ruby/object:Overrides::Terraform::PropertyOverride
         is_set: true
   Reservation: !ruby/object:Overrides::Terraform::ResourceOverride
-    # TODO: Remove when aggregatedList is handled in sweeper generation
-    skip_sweeper: true
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "reservation_basic"
@@ -1904,8 +1896,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       id: !ruby/object:Overrides::Terraform::PropertyOverride
         name: proxyId
   TargetInstance: !ruby/object:Overrides::Terraform::ResourceOverride
-    # TODO: Remove when aggregatedList is handled in sweeper generation
-    skip_sweeper: true
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "target_instance_basic"

diff --git a/templates/terraform/sweeper_file.go.erb b/templates/terraform/sweeper_file.go.erb
@@ -13,6 +13,12 @@ import (
 <%
 sweeper_name = product_ns + object.name
 wrap_path = object&.nested_query&.keys&.first || object.collection_url_key
+listUrlTemplate = object.__product.base_url + object.base_url
+
+listUrlTemplate.sub! "zones/{{zone}}", "aggregated"
+aggregatedList = listUrlTemplate.include? "/aggregated/"
+
+deleteUrlTemplate = object.__product.base_url + object.delete_uri
 -%>
 
 func init() {
@@ -39,7 +45,7 @@ func testSweep<%= sweeper_name -%>(region string) error {
 		return err
 	}
 
-	listTemplate := strings.Split("<%= object.__product.base_url + object.base_url -%>","?")[0]
+	listTemplate := strings.Split("<%= listUrlTemplate -%>","?")[0]
 
 	d := &ResourceDataMock{
 		FieldsInSchema: map[string]interface{}{
@@ -72,8 +78,24 @@ func testSweep<%= sweeper_name -%>(region string) error {
 		log.Printf("[INFO] Nothing found in response.")
 		return nil
 	}
+	<%  if aggregatedList -%>
+	var rl []interface{}
+	zones := resourceList.(map[string]interface{})
+	// Loop through every zone in the list response
+	for _, zonesValue := range zones {
+		zone := zonesValue.(map[string]interface{})
+		for k, v := range zone {
+			// Zone map either has resources or a warning stating there were no resources found in the zone
+			if k != "warning" {
+				resourcesInZone := v.([]interface{})
+				rl = append(rl, resourcesInZone...)
+			}
+		}
+	}
+	<%  else -%>
 
 	rl := resourceList.([]interface{})
+	<% end -%>
 
 	log.Printf("[INFO] Found %d items in %s list response.", len(rl), resourceName)
 	// items who don't match the tf-test prefix
@@ -93,7 +115,18 @@ func testSweep<%= sweeper_name -%>(region string) error {
 			nonPrefixCount++
 			continue
 		}
-		deleteTemplate := "<%= object.__product.base_url + object.delete_uri -%>"
+		deleteTemplate := "<%= deleteUrlTemplate -%>"
+		<%  if aggregatedList -%>
+
+		if obj["zone"] == nil {
+			log.Printf("[INFO] %s resource zone was nil", resourceName)
+			return nil
+		}
+		zoneSegs := strings.Split(obj["zone"].(string),"/")
+		zone := zoneSegs[len(zoneSegs)-1]
+		deleteTemplate = strings.Replace(deleteTemplate, "{{zone}}", zone, -1)
+
+		<% end -%>
 		deleteUrl, err := replaceVars(d, config, deleteTemplate)
 		if err != nil {
 			log.Printf("[INFO] error preparing delete url: %s", err)