Use custom import for datacatalog taxonomy and policy_tag (#4203) (#2694

)

Signed-off-by: Modular Magician <magic-modules@google.com>

.changelog/4203.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+datacatalog: fixed an issue in `google_data_catalog_taxonomy` and `google_data_catalog_policy_tag` where importing would fail
+```

google-beta/resource_data_catalog_policy_tag.go

@@ -295,19 +295,18 @@ func resourceDataCatalogPolicyTagDelete(d *schema.ResourceData, meta interface{}
 
 func resourceDataCatalogPolicyTagImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*Config)
-	if err := parseImportId([]string{
-		"(?P<name>[^/]+)",
-	}, d, config); err != nil {
+
+	// current import_formats can't import fields with forward slashes in their value
+	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
 		return nil, err
 	}
 
-	// Replace import id for the resource id
-	id, err := replaceVars(d, config, "{{name}}")
-	if err != nil {
-		return nil, fmt.Errorf("Error constructing id: %s", err)
-	}
-	d.SetId(id)
+	name := d.Get("name").(string)
 
+	if err := d.Set("name", name); err != nil {
+		return nil, fmt.Errorf("Error setting name: %s", err)
+	}
+	d.SetId(name)
 	return []*schema.ResourceData{d}, nil
 }
 

google-beta/resource_data_catalog_taxonomy.go

@@ -323,19 +323,18 @@ func resourceDataCatalogTaxonomyDelete(d *schema.ResourceData, meta interface{})
 
 func resourceDataCatalogTaxonomyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*Config)
-	if err := parseImportId([]string{
-		"(?P<name>[^/]+)",
-	}, d, config); err != nil {
+
+	// current import_formats can't import fields with forward slashes in their value
+	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
 		return nil, err
 	}
 
-	// Replace import id for the resource id
-	id, err := replaceVars(d, config, "{{name}}")
-	if err != nil {
-		return nil, fmt.Errorf("Error constructing id: %s", err)
-	}
-	d.SetId(id)
+	name := d.Get("name").(string)
 
+	if err := d.Set("name", name); err != nil {
+		return nil, fmt.Errorf("Error setting name: %s", err)
+	}
+	d.SetId(name)
 	return []*schema.ResourceData{d}, nil
 }