address review comments

Author: Shadow649

sysdig/resource_sysdig_secure_zone.go

@@ -382,10 +382,26 @@ func resourceSysdigSecureZoneDelete(ctx context.Context, d *schema.ResourceData,
 		return diag.FromErr(err)
 	}
 
-	id, _ := strconv.Atoi(d.Id())
-	err = client.DeleteZone(ctx, id)
+	clientV2, err := getZoneV2Client(m.(SysdigClients))
 	if err != nil {
-		return diag.FromErr(fmt.Errorf("error deleting Sysdig Zone: %s", err))
+		return diag.FromErr(err)
+	}
+
+	id, _ := strconv.Atoi(d.Id())
+	legacyZone, e := categorizeZone(d)
+	if e != nil {
+		return diag.FromErr(fmt.Errorf("error analyzing zone scope: %s", e))
+	}
+	if !legacyZone {
+		err = clientV2.DeleteZoneV2(ctx, id)
+		if err != nil {
+			return diag.FromErr(fmt.Errorf("error deleting Sysdig Zone: %s", err))
+		}
+	} else {
+		err = client.DeleteZone(ctx, id)
+		if err != nil {
+			return diag.FromErr(fmt.Errorf("error deleting Sysdig Zone: %s", err))
+		}
 	}
 
 	d.SetId("")

sysdig/resource_sysdig_secure_zone_migration_test.go

@@ -67,7 +67,7 @@ func TestExpandFlattenFilter_MultipleExpressions(t *testing.T) {
 			},
 			map[string]interface{}{
 				"field":    "agent.tag.key2",
-				"operator": "not contains",
+				"operator": "not_contains",
 				"value":    "value2",
 			},
 		},
@@ -96,9 +96,7 @@ func TestFlattenZoneV21_MultipleScopesAndFilters(t *testing.T) {
 
 	scopes := flattenZoneV21(zone, false)
 	err := d.Set(SchemaScopeKey, scopes)
-	if err != nil {
-		return
-	}
+	require.NoError(t, err)
 
 	if rawScopes, ok := d.Get(SchemaScopeKey).(*schema.Set); ok {
 		scopes := rawScopes.List()
@@ -144,9 +142,7 @@ func TestExpandFlattenZoneV21_RoundTrip(t *testing.T) {
 	d2 := schema.TestResourceDataRaw(t, resourceSysdigSecureZone().Schema, nil)
 	scopes := flattenZoneV21(zone, false)
 	err := d2.Set(SchemaScopeKey, scopes)
-	if err != nil {
-		return
-	}
+	require.NoError(t, err)
 
 	require.ElementsMatch(t, d1.Get("scope").(*schema.Set).List(), d2.Get("scope").(*schema.Set).List())
 }

sysdig/resource_sysdig_secure_zone_test.go

@@ -234,7 +234,7 @@ resource "sysdig_secure_zone" "expr" {
 
     expression {
       field    = "agent.tag.key2"
-      operator = "not contains"
+      operator = "not_contains"
       value    = "value2"
     }
   }
@@ -273,7 +273,7 @@ resource "sysdig_secure_zone" "migrate" {
 
     expression {
       field    = "agent.tag.key2"
-      operator = "not contains"
+      operator = "not_contains"
       value    = "value2"
     }
   }