Exporter: fix issue with exporting of resources with simple name (#1891)

* Exporter: fix issue with exporting of resources with simple name

The `Add` function is called only from the `Emit` so it's safe to remove the check if
resource was already imported or not.

this fixes #1838

* Make unique names for secret scopes & secrets

It's possible to use mixed characters in names that will generate non-unique names of
secret scopes & secrets.  Like, for unique scopes `Test-scope` and `test_scope` will
generate the same name, so terraform will complain about it.  The solution - add MD5
checksum over the scope & secret names

* Restore Has check in the Add, but do it differently

Author: alexott

exporter/context.go

@@ -345,8 +345,14 @@ func (ic *importContext) Find(r *resource, pick string, matchType MatchType) (st
 	return "", nil
 }
 
+// This function checks if resource exist in any state (already added or in process of addition)
 func (ic *importContext) Has(r *resource) bool {
-	if _, visiting := ic.importing[r.String()]; visiting {
+	return ic.HasInState(r, false)
+}
+
+// This function checks if resource exist. onlyAdded flag enforces that true is returned only if it was added with Add()
+func (ic *importContext) HasInState(r *resource, onlyAdded bool) bool {
+	if v, visiting := ic.importing[r.String()]; visiting && (v || !onlyAdded) {
 		return true
 	}
 	k, v := r.MatchPair()
@@ -364,9 +370,10 @@ func (ic *importContext) Has(r *resource) bool {
 }
 
 func (ic *importContext) Add(r *resource) {
-	if ic.Has(r) {
+	if ic.HasInState(r, true) { // resource must exist and already marked as added
 		return
 	}
+	ic.importing[r.String()] = true // mark resource as added
 	state := r.Data.State()
 	if state == nil {
 		log.Printf("[ERROR] state is nil for %s", r)
@@ -437,7 +444,7 @@ func (ic *importContext) Emit(r *resource) {
 		ic.testEmits[r.String()] = true
 		return
 	}
-	ic.importing[r.String()] = true
+	ic.importing[r.String()] = false // we're starting to add a new resource
 	pr, ok := ic.Resources[r.Resource]
 	if !ok {
 		log.Printf("[ERROR] %s is not available in provider", r)

exporter/importables.go

@@ -774,7 +774,8 @@ var resourcesMap map[string]importable = map[string]importable{
 	"databricks_secret_scope": {
 		Service: "secrets",
 		Name: func(ic *importContext, d *schema.ResourceData) string {
-			return d.Get("name").(string)
+			name := d.Get("name").(string)
+			return name + "_" + generateUniqueID(name)
 		},
 		List: func(ic *importContext) error {
 			ssAPI := secrets.NewSecretScopesAPI(ic.Context, ic.Client)
@@ -788,7 +789,6 @@ var resourcesMap map[string]importable = map[string]importable{
 					ic.Emit(&resource{
 						Resource: "databricks_secret_scope",
 						ID:       scope.Name,
-						Name:     scope.Name,
 					})
 					log.Printf("[INFO] Imported %d of %d secret scopes", i+1, len(scopes))
 				}
@@ -829,7 +829,8 @@ var resourcesMap map[string]importable = map[string]importable{
 			{Path: "string_value", Resource: "aws_secretsmanager_secret_version", Match: "secret_string"},
 		},
 		Name: func(ic *importContext, d *schema.ResourceData) string {
-			return fmt.Sprintf("%s_%s", d.Get("scope"), d.Get("key"))
+			name := fmt.Sprintf("%s_%s", d.Get("scope"), d.Get("key"))
+			return name + "_" + generateUniqueID(name)
 		},
 	},
 	"databricks_secret_acl": {

exporter/importables_test.go

@@ -194,7 +194,7 @@ func TestSecretScope(t *testing.T) {
 	d.Set("name", "abc")
 	ic := importContextForTest()
 	name := ic.Importables["databricks_secret_scope"].Name(ic, d)
-	assert.Equal(t, "abc", name)
+	assert.Equal(t, "abc_a9993e3647", name)
 }
 
 func TestInstancePoolNameFromID(t *testing.T) {
@@ -769,8 +769,8 @@ func TestSecretGen(t *testing.T) {
 
 		ic.generateHclForResources(nil)
 		assert.Equal(t, commands.TrimLeadingWhitespace(`
-		resource "databricks_secret" "a_b" {
-		  string_value = var.string_value_a_b
+		resource "databricks_secret" "a_b_eb2980a5a2" {
+		  string_value = var.string_value_a_b_eb2980a5a2
 		  scope        = "a"
 		  key          = "b"
 		}`), string(ic.Files["secrets"].Bytes()))

exporter/util.go

@@ -1,6 +1,7 @@
 package exporter
 
 import (
+	"crypto/sha1"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -506,3 +507,7 @@ func resourceOrDataBlockBody(ic *importContext, body *hclwrite.Body, r *resource
 	return ic.dataToHcl(ic.Importables[r.Resource],
 		[]string{}, ic.Resources[r.Resource], r.Data, resourceBlock.Body())
 }
+
+func generateUniqueID(v string) string {
+	return fmt.Sprintf("%x", sha1.Sum([]byte(v)))[:10]
+}