Patch: form, flow expand interface array (#1058)

* fix auth_form expand interface array * fix auth_flow expand interface array
auth0 · Oct 31, 2024 · b81a13a · b81a13a
1 parent c9e8550
commit b81a13a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 32 deletions.
diff --git a/internal/auth0/flow/expand.go b/internal/auth0/flow/expand.go
@@ -75,28 +75,20 @@ func expandInterfaceArray(d *schema.ResourceData, key string) []interface{} {
 		return result
 	}
 
-	if oldMetadata == "" {
-		if newMetadataStr, ok := newMetadata.(string); ok {
-			var newMetadataArr []interface{}
-			if err := json.Unmarshal([]byte(newMetadataStr), &newMetadataArr); err != nil {
-				return nil
-			}
-			return newMetadataArr
-		}
-		return result
-	}
-
 	if newMetadata == "" {
 		return result
 	}
 
-	b, err := json.Marshal(newMetadata)
-	if err != nil {
-		return nil
+	if newMetadataStr, ok := newMetadata.(string); ok {
+		var newMetadataArr []interface{}
+		if err := json.Unmarshal([]byte(newMetadataStr), &newMetadataArr); err != nil {
+			return nil
+		}
+		return newMetadataArr
 	}
 
-	if err := json.Unmarshal(b, &result); err != nil {
-		return nil
+	if newMetadataArr, ok := newMetadata.([]interface{}); ok {
+		return newMetadataArr
 	}
 
 	return result

diff --git a/internal/auth0/form/expand.go b/internal/auth0/form/expand.go
@@ -108,28 +108,20 @@ func expandInterfaceArray(d *schema.ResourceData, key string) []interface{} {
 		return result
 	}
 
-	if oldMetadata == "" {
-		if newMetadataStr, ok := newMetadata.(string); ok {
-			var newMetadataArr []interface{}
-			if err := json.Unmarshal([]byte(newMetadataStr), &newMetadataArr); err != nil {
-				return nil
-			}
-			return newMetadataArr
-		}
-		return result
-	}
-
 	if newMetadata == "" {
 		return result
 	}
 
-	b, err := json.Marshal(newMetadata)
-	if err != nil {
-		return nil
+	if newMetadataStr, ok := newMetadata.(string); ok {
+		var newMetadataArr []interface{}
+		if err := json.Unmarshal([]byte(newMetadataStr), &newMetadataArr); err != nil {
+			return nil
+		}
+		return newMetadataArr
 	}
 
-	if err := json.Unmarshal(b, &result); err != nil {
-		return nil
+	if newMetadataArr, ok := newMetadata.([]interface{}); ok {
+		return newMetadataArr
 	}
 
 	return result