Add check on import name split length (#2067)

Merged PR #2067.
GoogleCloudPlatform · Jul 17, 2019 · 1c21795 · 1c21795
1 parent 3c113ff
commit 1c21795
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/products/accesscontextmanager/terraform.yaml b/products/accesscontextmanager/terraform.yaml
@@ -54,7 +54,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         custom_flatten: templates/terraform/custom_flatten/default_if_empty.erb
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       encoder: templates/terraform/encoders/access_level_never_send_parent.go.erb
-      custom_import: templates/terraform/custom_import/access_level_self_link_as_name_and_set_parent.go.erb
+      custom_import: templates/terraform/custom_import/set_access_policy_parent_from_self_link.go.erb
   ServicePerimeter: !ruby/object:Overrides::Terraform::ResourceOverride
     timeouts: !ruby/object:Api::Timeouts
       insert_minutes: 6
@@ -79,7 +79,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         input: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       encoder: templates/terraform/encoders/access_level_never_send_parent.go.erb
-      custom_import: templates/terraform/custom_import/access_level_self_link_as_name_and_set_parent.go.erb
+      custom_import: templates/terraform/custom_import/set_access_policy_parent_from_self_link.go.erb
 # This is for copying files over
 files: !ruby/object:Provider::Config::Files
   # These files have templating (ERB) code that will be run.

diff --git a/...l_self_link_as_name_and_set_parent.go.erb → ...ccess_policy_parent_from_self_link.go.erb b/...l_self_link_as_name_and_set_parent.go.erb → ...ccess_policy_parent_from_self_link.go.erb
@@ -19,5 +19,8 @@
 		return nil, err
 	}
 	stringParts := strings.Split(d.Get("name").(string), "/")
+	if len(stringParts) < 2 {
+		return nil, fmt.Errorf("Error parsing parent name. Should be in form accessPolicies/{{policy_id}}/<%= object.name.pluralize.camelize(:lower) -%>/{{short_name}}")
+	}
 	d.Set("parent", fmt.Sprintf("%s/%s", stringParts[0], stringParts[1]))
 	return []*schema.ResourceData{d}, nil