BugFix - handled duplicate resource name into resource discovery

Author: ravinitp

internal/commonexport/commonexport_functions.go

@@ -856,13 +856,22 @@ var GenerateTerraformNameFromResource = func(resourceAttributes map[string]inter
 
 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)
+	defer ResourceNameCountLock.Unlock() // Ensure the lock is released even if a panic occurs
 
+	originalName := terraformName
+
+	// Check if resource already exists
+	for {
+		if _, exists := ResourceNameCount[terraformName]; !exists {
+			break
+		}
+		count := ResourceNameCount[originalName]
+		ResourceNameCount[originalName] = count + 1
+		terraformName = fmt.Sprintf("%s_%d", originalName, count)
 	}
+
 	ResourceNameCount[terraformName] = 1
-	ResourceNameCountLock.Unlock()
+
 	return terraformName
 }
 

internal/commonexport/commonexport_functions_test.go

@@ -0,0 +1,40 @@
+package commonexport
+
+import (
+	"sync"
+	"testing"
+)
+
+func TestUnitCheckDuplicateResourceName(t *testing.T) {
+	ResourceNameCount = make(map[string]int)
+	t.Run("Concurrency", func(t *testing.T) {
+		names := []string{"resource", "resource_1", "resource_2", "resource", "resource", "resource_1"}
+		var wg sync.WaitGroup
+		wg.Add(len(names))
+
+		results := make(chan string, len(names))
+
+		for _, name := range names {
+			go func(name string) {
+				defer wg.Done()
+				results <- CheckDuplicateResourceName(name)
+			}(name)
+		}
+
+		wg.Wait()
+		close(results)
+
+		// Map to track unique results
+		uniqueResults := make(map[string]bool)
+
+		for result := range results {
+			t.Logf("result: %v\n", result)
+			if _, exists := uniqueResults[result]; exists {
+				t.Errorf("duplicate name found: %v", result)
+			} else {
+				uniqueResults[result] = true
+			}
+		}
+
+	})
+}