Support import of _prefix arguments

.changelog/33852.txt

@@ -0,0 +1,99 @@
+```release-note:enhancement
+resource/aws_cloudfront_public_key: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_docdb_cluster: Support import of `cluster_identifier_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_docdb_cluster_instance: Support import of `identifier_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_docdb_cluster_parameter_group: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_docdb_subnet_group: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_elb: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_alb: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_lb: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_alb_target_group: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_lb_target_group: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_emr_security_configuration: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_iam_group_policy: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_iam_role_policy: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_iam_user_policy: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_neptune_cluster: Support import of `cluster_identifier_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_neptune_cluster_instance: Support import of `identifier_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_neptune_cluster_parameter_group: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_neptune_event_subscription: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_pinpoint_app: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_db_option_group: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_rds_cluster: Support import of `cluster_identifier_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_rds_cluster_instance: Support import of `identifier_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_signer_signing_profile: Support import of `name_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_signer_signing_profile_permission: Support import of `statement_id_prefix` argument
+```
+
+```release-note:enhancement
+resource/aws_signer_signing_profile_permission: Add `signer:SignPayload` as a valid `action` value
+```

docs/resource-name-generation.md

@@ -141,21 +141,3 @@ resource "aws_service_thing" "test" {
 ```markdown
 * `name` - (Optional) Name of the thing. If omitted, Terraform will assign a random, unique name. Conflicts with `name_prefix`.
 ```
-
-## Resource name generation with suffix
-
-Some generated resource names require a fixed suffix (for example Amazon SNS FIFO topic names must end in `.fifo`).
-In these cases use `create.NameWithSuffix()` in the resource `Create` function and `create.NamePrefixFromNameWithSuffix()` in the resource `Read` function, e.g.
-
-```go
-name := create.NameWithSuffix(d.Get("name").(string), d.Get("name_prefix").(string), ".fifo")
-```
-
-and
-
-```go
-d.Set("name", resp.Name)
-d.Set("name_prefix", create.NamePrefixFromNameWithSuffix(aws.StringValue(resp.Name), ".fifo"))
-```
-
-There are also functions `acctest.CheckResourceAttrNameWithSuffixGenerated` and `acctest.CheckResourceAttrNameWithSuffixFromPrefix` for use in tests.

internal/acctest/acctest.go

@@ -380,6 +380,13 @@ func CheckResourceAttrNameGenerated(resourceName string, attributeName string) r
 	return CheckResourceAttrNameWithSuffixGenerated(resourceName, attributeName, "")
 }
 
+// CheckResourceAttrNameGeneratedWithPrefix verifies that the state attribute value matches name automatically generated with prefix
+func CheckResourceAttrNameGeneratedWithPrefix(resourceName string, attributeName string, prefix string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		return resource.TestMatchResourceAttr(resourceName, attributeName, resourceUniqueIDPrefixPlusAdditionalSuffixRegexp(prefix, ""))(s)
+	}
+}
+
 // CheckResourceAttrNameWithSuffixGenerated verifies that the state attribute value matches name with suffix automatically generated without prefix
 func CheckResourceAttrNameWithSuffixGenerated(resourceName string, attributeName string, suffix string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {

internal/create/naming.go

@@ -12,21 +12,7 @@ import (
 
 // Name returns in order the name if non-empty, a prefix generated name if non-empty, or fully generated name prefixed with terraform-
 func Name(name string, namePrefix string) string {
-	return NameWithSuffix(name, namePrefix, "")
-}
-
-// NameWithSuffix returns in order the name if non-empty, a prefix generated name if non-empty, or fully generated name prefixed with "terraform-".
-// In the latter two cases, any suffix is appended to the generated name
-func NameWithSuffix(name string, namePrefix string, nameSuffix string) string {
-	if name != "" {
-		return name
-	}
-
-	if namePrefix != "" {
-		return id.PrefixedUniqueId(namePrefix) + nameSuffix
-	}
-
-	return id.UniqueId() + nameSuffix
+	return NewNameGenerator(WithConfiguredName(name), WithConfiguredPrefix(namePrefix)).Generate()
 }
 
 // hasResourceUniqueIDPlusAdditionalSuffix returns true if the string has the built-in unique ID suffix plus an additional suffix
@@ -62,3 +48,71 @@ func NamePrefixFromNameWithSuffix(name, nameSuffix string) *string {
 
 	return &namePrefix
 }
+
+type nameGenerator struct {
+	configuredName   string
+	configuredPrefix string
+	defaultPrefix    string
+	suffix           string
+}
+
+// nameGeneratorOptionsFunc is a type alias for a name generator functional option.
+type NameGeneratorOptionsFunc func(*nameGenerator)
+
+// WithConfiguredName is a helper function to construct functional options
+// that set a name generator's configured name value.
+// An empty ("") configured name inidicates that no name was configured.
+func WithConfiguredName(name string) NameGeneratorOptionsFunc {
+	return func(g *nameGenerator) {
+		g.configuredName = name
+	}
+}
+
+// WithConfiguredPrefix is a helper function to construct functional options
+// that set a name generator's configured prefix value.
+// An empty ("") configured prefix inidicates that no prefix was configured.
+func WithConfiguredPrefix(prefix string) NameGeneratorOptionsFunc {
+	return func(g *nameGenerator) {
+		g.configuredPrefix = prefix
+	}
+}
+
+// WithDefaultPrefix is a helper function to construct functional options
+// that set a name generator's default prefix value.
+func WithDefaultPrefix(prefix string) NameGeneratorOptionsFunc {
+	return func(g *nameGenerator) {
+		g.defaultPrefix = prefix
+	}
+}
+
+// WithSuffix is a helper function to construct functional options
+// that set a name generator's suffix value.
+func WithSuffix(suffix string) NameGeneratorOptionsFunc {
+	return func(g *nameGenerator) {
+		g.suffix = suffix
+	}
+}
+
+// NewNameGenerator returns a new name generator from the specified varidaic list of functional options.
+func NewNameGenerator(optFns ...NameGeneratorOptionsFunc) *nameGenerator {
+	g := &nameGenerator{defaultPrefix: id.UniqueIdPrefix}
+
+	for _, optFn := range optFns {
+		optFn(g)
+	}
+
+	return g
+}
+
+// Generate generates a new name.
+func (g *nameGenerator) Generate() string {
+	if g.configuredName != "" {
+		return g.configuredName
+	}
+
+	prefix := g.defaultPrefix
+	if g.configuredPrefix != "" {
+		prefix = g.configuredPrefix
+	}
+	return id.PrefixedUniqueId(prefix) + g.suffix
+}