fix lint and tests

Author: Shadow649

sysdig/data_source_sysdig_secure_zone_test.go

@@ -115,25 +115,6 @@ func TestAccDataSourceSysdigSecureZone_ByID(t *testing.T) {
 	})
 }
 
-func testAccSecureZoneWithExpression(name string) string {
-	return fmt.Sprintf(`
-resource "sysdig_secure_zone" "test" {
-  name        = "%s"
-  description = "ds acceptance test"
-
-  scope {
-    target_type = "aws"
-
-    expression {
-      field    = "organization"
-      operator = "in"
-      values   = ["o1", "o2"]
-    }
-  }
-}
-`, name)
-}
-
 func testAccDataSourceSecureZoneByName(name string) string {
 	return fmt.Sprintf(`
 resource "sysdig_secure_zone" "test" {

sysdig/resource_sysdig_secure_zone_migration_test.go

@@ -11,16 +11,16 @@ import (
 func TestExpandFlattenExpression_SingleValue(t *testing.T) {
 	raw := map[string]interface{}{
 		"field":    "agent.tag.key",
-		"operator": "is not",
-		"value":    "asd",
+		"operator": "is_not",
+		"value":    "test",
 	}
 
 	exp := expandExpressionV21(raw)
 	flat := flattenExpressionV21(exp)
 
 	require.Equal(t, "agent.tag.key", flat["field"])
 	require.Equal(t, "is_not", flat["operator"])
-	require.Equal(t, "asd", flat["value"])
+	require.Equal(t, "test", flat["value"])
 }
 
 func TestExpandFlattenExpression_MultipleValues(t *testing.T) {
@@ -63,7 +63,7 @@ func TestExpandFlattenFilter_MultipleExpressions(t *testing.T) {
 			map[string]interface{}{
 				"field":    "agent.tag.key",
 				"operator": "is not",
-				"value":    "asd",
+				"value":    "test",
 			},
 			map[string]interface{}{
 				"field":    "agent.tag.key2",
@@ -95,7 +95,10 @@ func TestFlattenZoneV21_MultipleScopesAndFilters(t *testing.T) {
 	d := schema.TestResourceDataRaw(t, resourceSysdigSecureZone().Schema, nil)
 
 	scopes := flattenZoneV21(zone, false)
-	d.Set(SchemaScopeKey, scopes)
+	err := d.Set(SchemaScopeKey, scopes)
+	if err != nil {
+		return 
+	}
 
 	if rawScopes, ok := d.Get(SchemaScopeKey).(*schema.Set); ok {
 		scopes := rawScopes.List()
@@ -122,7 +125,7 @@ func TestExpandFlattenZoneV21_RoundTrip(t *testing.T) {
 					map[string]interface{}{
 						"field":    "agent.tag.key",
 						"operator": "is_not",
-						"value":    "asd",
+						"value":    "test",
 					},
 					map[string]interface{}{
 						"field":    "agent.tag.key2",
@@ -140,7 +143,10 @@ func TestExpandFlattenZoneV21_RoundTrip(t *testing.T) {
 
 	d2 := schema.TestResourceDataRaw(t, resourceSysdigSecureZone().Schema, nil)
 	scopes := flattenZoneV21(zone, false)
-	d2.Set(SchemaScopeKey, scopes)
+	err := d2.Set(SchemaScopeKey, scopes)
+	if err != nil {
+		return 
+	}
 
 	require.ElementsMatch(t, d1.Get("scope").(*schema.Set).List(), d2.Get("scope").(*schema.Set).List())
 }