simplify zone TF schema: remove scopes field

Author: vojindj

sysdig/resource_sysdig_secure_zone.go

@@ -46,32 +46,23 @@ func resourceSysdigSecureZone() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			SchemaScopesKey: {
-				Required: true,
+			SchemaScopeKey: {
 				Type:     schema.TypeSet,
-				MaxItems: 1,
+				MinItems: 1,
+				Required: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
-						SchemaScopeKey: {
-							Type:     schema.TypeSet,
-							MinItems: 1,
+						SchemaIDKey: {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						SchemaTargetTypeKey: {
+							Type:     schema.TypeString,
 							Required: true,
-							Elem: &schema.Resource{
-								Schema: map[string]*schema.Schema{
-									SchemaIDKey: {
-										Type:     schema.TypeInt,
-										Computed: true,
-									},
-									SchemaTargetTypeKey: {
-										Type:     schema.TypeString,
-										Required: true,
-									},
-									SchemaRulesKey: {
-										Type:     schema.TypeString,
-										Optional: true,
-									},
-								},
-							},
+						},
+						SchemaRulesKey: {
+							Type:     schema.TypeString,
+							Optional: true,
 						},
 					},
 				},
@@ -158,7 +149,7 @@ func zoneRequestFromResourceData(d *schema.ResourceData) *v2.ZoneRequest {
 	zoneRequest := &v2.ZoneRequest{
 		Name:        d.Get("name").(string),
 		Description: d.Get("description").(string),
-		Scopes:      toZoneScopesRequest(d.Get("scopes").(*schema.Set)),
+		Scopes:      toZoneScopesRequest(d.Get(SchemaScopeKey).(*schema.Set)),
 	}
 
 	if d.Id() != "" {
@@ -173,17 +164,13 @@ func zoneRequestFromResourceData(d *schema.ResourceData) *v2.ZoneRequest {
 
 func toZoneScopesRequest(scopes *schema.Set) []v2.ZoneScope {
 	var zoneScopes []v2.ZoneScope
-	for _, scopeData := range scopes.List() {
-		scopeMap := scopeData.(map[string]interface{})
-		scopeSet := scopeMap[SchemaScopeKey].(*schema.Set)
-		for _, attr := range scopeSet.List() {
-			s := attr.(map[string]interface{})
-			zoneScopes = append(zoneScopes, v2.ZoneScope{
-				ID:         s[SchemaIDKey].(int),
-				TargetType: s[SchemaTargetTypeKey].(string),
-				Rules:      s[SchemaRulesKey].(string),
-			})
-		}
+	for _, attr := range scopes.List() {
+		s := attr.(map[string]interface{})
+		zoneScopes = append(zoneScopes, v2.ZoneScope{
+			ID:         s[SchemaIDKey].(int),
+			TargetType: s[SchemaTargetTypeKey].(string),
+			Rules:      s[SchemaRulesKey].(string),
+		})
 	}
 	return zoneScopes
 }
@@ -197,28 +184,7 @@ func fromZoneScopesResponse(scopes []v2.ZoneScope) []interface{} {
 			SchemaRulesKey:      scope.Rules,
 		})
 	}
-	response := []interface{}{
-		map[string]interface{}{
-			SchemaScopeKey: schema.NewSet(schema.HashResource(&schema.Resource{
-				Schema: map[string]*schema.Schema{
-					SchemaIDKey: {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					SchemaTargetTypeKey: {
-						Type:     schema.TypeString,
-						Required: true,
-					},
-					SchemaRulesKey: {
-						Type:     schema.TypeString,
-						Optional: true,
-					},
-				},
-			}), flattenedScopes),
-		},
-	}
-
-	return response
+	return flattenedScopes
 }
 
 func getZoneClient(clients SysdigClients) (v2.ZoneInterface, error) {

sysdig/resource_sysdig_secure_zone_test.go

@@ -30,7 +30,7 @@ func TestAccSysdigZone_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("sysdig_secure_zone.test", "description", zoneDescription),
 					resource.TestCheckTypeSetElemNestedAttrs(
 						"sysdig_secure_zone.test",
-						"scopes.*.scope.*",
+						"scope.*",
 						map[string]string{
 							"target_type": "aws",
 							"rules":       "organization in (\"o1\", \"o2\") and account in (\"a1\", \"a2\")",
@@ -58,11 +58,9 @@ func zoneConfig(name, description string) string {
 resource "sysdig_secure_zone" "test" {
   name        = "%s"
   description = "%s"
-  scopes {
-    scope {
-      target_type = "aws"
-      rules       = "organization in (\"o1\", \"o2\") and account in (\"a1\", \"a2\")"
-    }
+  scope {
+    target_type = "aws"
+    rules       = "organization in (\"o1\", \"o2\") and account in (\"a1\", \"a2\")"
   }
 }
 `, name, description)

website/docs/r/secure_zone.md

@@ -19,16 +19,14 @@ resource "sysdig_secure_zone" "example" {
   name        = "example-zone"
   description = "An example Sysdig zone"
 
-  scopes {
-    scope {
-      target_type = "aws"
-      rules       = "organization in (\"o1\", \"o2\") and account in (\"a1\", \"a2\")"
-    }
-
-    scope {
-      target_type = "azure"
-      rules       = "organization contains \"o1\""
-    }
+  scope {
+    target_type = "aws"
+    rules       = "organization in (\"o1\", \"o2\") and account in (\"a1\", \"a2\")"
+  }
+
+  scope {
+    target_type = "azure"
+    rules       = "organization contains \"o1\""
   }
 }
 ```