Exempted - Bug Fix for Resource Discovery Duplicate Resource Name

Author: NagendraNigade

internal/commonexport/commonexport_functions.go

@@ -587,7 +587,8 @@ func FindResourcesGeneric(ctx *ResourceDiscoveryContext, tfMeta *TerraformResour
 			}
 
 			if resource.TerraformName, err = GenerateTerraformNameFromResource(resource.SourceAttributes, elemResource.Schema); err != nil {
-				resource.TerraformName = fmt.Sprintf("%s_%s_%d", parent.TerraformName, tfMeta.ResourceAbbreviation, idx+1)
+				resource.TerraformName = fmt.Sprintf("%s_%s", parent.TerraformName, tfMeta.ResourceAbbreviation)
+				resource.TerraformName = CheckDuplicateResourceName(resource.TerraformName)
 			}
 
 			results = append(results, resource)
@@ -601,6 +602,7 @@ func FindResourcesGeneric(ctx *ResourceDiscoveryContext, tfMeta *TerraformResour
 
 		if resource.TerraformName, err = GenerateTerraformNameFromResource(resource.SourceAttributes, datasource.Schema); err != nil {
 			resource.TerraformName = fmt.Sprintf("%s_%s", parent.TerraformName, tfMeta.ResourceAbbreviation)
+			resource.TerraformName = CheckDuplicateResourceName(resource.TerraformName)
 		}
 
 		discoverable := true
@@ -826,15 +828,7 @@ var GenerateTerraformNameFromResource = func(resourceAttributes map[string]inter
 		if nameSchema, hasNameAttr := resourceSchema[nameAttribute]; hasNameAttr && nameSchema.Type == schema.TypeString {
 			if value, exists := resourceAttributes[nameAttribute]; exists {
 				terraformName := getNormalizedTerraformName(value.(string))
-				resourceNameCountLock.Lock()
-				if count, resourceNameExists := ResourceNameCount[terraformName]; resourceNameExists {
-					// Update count for existing name
-					ResourceNameCount[terraformName] = count + 1
-					terraformName = fmt.Sprintf("%s_%d", terraformName, count)
-				}
-				// add the newly generated name to map
-				ResourceNameCount[terraformName] = 1
-				resourceNameCountLock.Unlock()
+				terraformName = CheckDuplicateResourceName(terraformName)
 				return terraformName, nil
 			}
 		}
@@ -843,6 +837,18 @@ var GenerateTerraformNameFromResource = func(resourceAttributes map[string]inter
 	return "", fmt.Errorf("unable to find a suitable name from the resource attributes")
 }
 
+var CheckDuplicateResourceName = func(terraformName string) string {
+	ResourceNameCountLock.Lock()
+	if count, resourceNameExists := ResourceNameCount[terraformName]; resourceNameExists {
+		ResourceNameCount[terraformName] = count + 1
+		terraformName = fmt.Sprintf("%s_%d", terraformName, count)
+
+	}
+	ResourceNameCount[terraformName] = 1
+	ResourceNameCountLock.Unlock()
+	return terraformName
+}
+
 func getNormalizedTerraformName(source string) string {
 	// Only alphanumeric, underscore, and hyphens are allowed. Strip out anything else.
 	reg, err := regexp.Compile(`[^a-zA-Z0-9\-\_]+`)

internal/commonexport/commonexport_types.go

@@ -230,7 +230,7 @@ var FailedResourceReferenceSet map[string]bool // stores the terraform reference
 var CompartmentResourceGraphs = make(map[string]TerraformResourceGraph)
 var TenancyResourceGraphs = map[string]TerraformResourceGraph{}
 var RefMapLock sync.Mutex
-var resourceNameCountLock sync.Mutex
+var ResourceNameCountLock sync.Mutex
 var ReferenceMap map[string]string                              //	stores references to replace the ocids in config
 var LoadBalancerCertificateNameMap map[string]map[string]string // helper map to generate references for certificate names, stores certificate name to certificate name interpolation
 var ResourceNameCount map[string]int

internal/resourcediscovery/export_compartment_test.go

@@ -1560,7 +1560,7 @@ func TestUnitGetHCLString_basic(t *testing.T) {
 	}
 	resultHcl := testStringBuilder.String()
 
-	expectedHclResult := `resource oci_test_child export_string3_child_2 {
+	expectedHclResult := `resource oci_test_child export_string3_child_1 {
 a_bool = "true"
 a_float = "3.3"
 a_int = "3"

internal/resourcediscovery/export_resource_helpers.go

@@ -519,14 +519,8 @@ func (r *resourceDiscoveryWithTargetIds) discover() error {
 		}
 
 		if ociResource.TerraformName, err = tf_export.GenerateTerraformNameFromResource(ociResource.SourceAttributes, resourceSchema.Schema); err != nil {
-			terraformName := fmt.Sprintf("export_%s", resourceHint.ResourceAbbreviation)
-			if count, resourceNameExists := tf_export.ResourceNameCount[terraformName]; resourceNameExists {
-				tf_export.ResourceNameCount[terraformName] = count + 1
-				terraformName = fmt.Sprintf("%s_%d", terraformName, count)
-			} else {
-				tf_export.ResourceNameCount[terraformName] = 1
-			}
-			ociResource.TerraformName = terraformName
+			ociResource.TerraformName = fmt.Sprintf("export_%s", resourceHint.ResourceAbbreviation)
+			ociResource.TerraformName = tf_export.CheckDuplicateResourceName(ociResource.TerraformName)
 		}
 
 		r.discoveredResources = append(r.discoveredResources, ociResource)

internal/service/identity/identity_export.go

@@ -113,6 +113,7 @@ func findIdentityTags(ctx *tf_export.ResourceDiscoveryContext, tfMeta *tf_export
 
 		if resource.TerraformName, err = tf_export.GenerateTerraformNameFromResource(resource.SourceAttributes, tagResource.Schema); err != nil {
 			resource.TerraformName = fmt.Sprintf("%s_%s", parent.Parent.TerraformName, *tag.Name)
+			resource.TerraformName = tf_export.CheckDuplicateResourceName(resource.TerraformName)
 		}
 
 		results = append(results, resource)

internal/service/log_analytics/log_analytics_export.go

@@ -94,6 +94,7 @@ func findLogAnalyticsObjectCollectionRules(ctx *tf_export.ResourceDiscoveryConte
 
 		if resource.TerraformName, err = tf_export.GenerateTerraformNameFromResource(resource.SourceAttributes, logAnalyticsObjectCollectionRuleResource.Schema); err != nil {
 			resource.TerraformName = fmt.Sprintf("%s_%s", parent.Parent.TerraformName, *logAnalyticsObjectCollectionRule.Name)
+			resource.TerraformName = tf_export.CheckDuplicateResourceName(resource.TerraformName)
 		}
 
 		results = append(results, resource)