write a new custom import that can extract taxonomy and name both. (#…

…4262) (#2744)

* write a new custom import that can extract taxonomy and name both.

* move custom import to subfolder.

* update because project and location are set in the parent actually

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

.changelog/4262.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+datacatalog: fixed permadiff on import for tags with a taxonomy set in config.
+```

google-beta/resource_data_catalog_policy_tag.go

@@ -296,12 +296,14 @@ func resourceDataCatalogPolicyTagDelete(d *schema.ResourceData, meta interface{}
 func resourceDataCatalogPolicyTagImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*Config)
 
-	// current import_formats can't import fields with forward slashes in their value
-	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+	if err := parseImportId([]string{
+		"(?P<taxonomy>projects/[^/]+/locations/[^/]+/taxonomies/[^/]+)/policyTags/(?P<name>.+)"}, d, config); err != nil {
 		return nil, err
 	}
 
-	name := d.Get("name").(string)
+	originalName := d.Get("name").(string)
+	originalTaxonomy := d.Get("taxonomy").(string)
+	name := fmt.Sprintf("%s/policyTags/%s", originalTaxonomy, originalName)
 
 	if err := d.Set("name", name); err != nil {
 		return nil, fmt.Errorf("Error setting name: %s", err)

google-beta/resource_data_catalog_taxonomy.go

@@ -324,12 +324,14 @@ func resourceDataCatalogTaxonomyDelete(d *schema.ResourceData, meta interface{})
 func resourceDataCatalogTaxonomyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*Config)
 
-	// current import_formats can't import fields with forward slashes in their value
-	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+	if err := parseImportId([]string{
+		"(?P<taxonomy>projects/[^/]+/locations/[^/]+/taxonomies/[^/]+)/policyTags/(?P<name>.+)"}, d, config); err != nil {
 		return nil, err
 	}
 
-	name := d.Get("name").(string)
+	originalName := d.Get("name").(string)
+	originalTaxonomy := d.Get("taxonomy").(string)
+	name := fmt.Sprintf("%s/policyTags/%s", originalTaxonomy, originalName)
 
 	if err := d.Set("name", name); err != nil {
 		return nil, fmt.Errorf("Error setting name: %s", err)