Resolve conflicts identity generation (#15305)

BBBmau · web-flow · commit d4949ab6ab34 · 2025-10-03T11:20:02.000-07:00
diff --git a/mmv1/third_party/terraform/tpgresource/import.go b/mmv1/third_party/terraform/tpgresource/import.go
@@ -116,6 +116,8 @@ func identityImport(re *regexp.Regexp, identity *schema.IdentityData, idFormat s
 		if identityValue, identityExists := identity.GetOk(group); identityExists && group != "" {
 			log.Printf("[DEBUG] identity Importing %s = %s", group, identityValue)
 			d.Set(group, identityValue)
+		} else if group == "" {
+			continue
 		} else {
 			return fmt.Errorf("[DEBUG] No value was found for %s during import", group)
 		}

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,8 @@ func identityImport(re regexp.Regexp, identity schema.IdentityData, idFormat s`
`116`	`116`	`if identityValue, identityExists := identity.GetOk(group); identityExists && group != "" {`
`117`	`117`	`log.Printf("[DEBUG] identity Importing %s = %s", group, identityValue)`
`118`	`118`	`d.Set(group, identityValue)`
	`119`	`+ } else if group == "" {`
	`120`	`+ continue`
`119`	`121`	`} else {`
`120`	`122`	`return fmt.Errorf("[DEBUG] No value was found for %s during import", group)`
`121`	`123`	`}`