[WIP] Consistent Resource Id Separators for resources

internal/flex/flex.go

@@ -230,3 +230,10 @@ func FlattenResourceId(idParts []string, partCount int) (string, error) {
 func StringToBoolValue(v *string) bool {
 	return aws.StringValue(v) == strconv.FormatBool(true)
 }
+
+// Takes a string of resource attributes separated by the ResourceIdSeparator constant
+// returns the number of parts
+func ResourceIdPartCount(id string) int {
+	idParts := strings.Split(id, ResourceIdSeparator)
+	return len(idParts)
+}

internal/service/appconfig/configuration_profile.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"log"
 	"regexp"
-	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/arn"
@@ -15,12 +14,19 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
+	"github.com/hashicorp/terraform-provider-aws/internal/create"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
+	"github.com/hashicorp/terraform-provider-aws/internal/flex"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
+const (
+	ConfigurationProfileIdPartsCount = 2
+	ResNameConfigurationProfile      = "Configuration Profile"
+)
+
 // @SDKResource("aws_appconfig_configuration_profile", name="Connection Profile")
 // @Tags(identifierAttribute="arn")
 func ResourceConfigurationProfile() *schema.Resource {
@@ -146,7 +152,18 @@ func resourceConfigurationProfileCreate(ctx context.Context, d *schema.ResourceD
 		return sdkdiag.AppendErrorf(diags, "creating AppConfig Configuration Profile (%s) for Application (%s): empty response", name, appId)
 	}
 
-	d.SetId(fmt.Sprintf("%s:%s", aws.StringValue(profile.Id), aws.StringValue(profile.ApplicationId)))
+	idParts := []string{
+		aws.StringValue(profile.Id),
+		aws.StringValue(profile.ApplicationId),
+	}
+
+	id, err := flex.FlattenResourceId(idParts, ConfigurationProfileIdPartsCount)
+
+	if err != nil {
+		return create.DiagError(names.AppConfig, create.ErrActionFlatteningResourceId, ResNameConfigurationProfile, appId, err)
+	}
+
+	d.SetId(id)
 
 	return append(diags, resourceConfigurationProfileRead(ctx, d, meta)...)
 }
@@ -158,7 +175,7 @@ func resourceConfigurationProfileRead(ctx context.Context, d *schema.ResourceDat
 	confProfID, appID, err := ConfigurationProfileParseID(d.Id())
 
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "reading AppConfig Configuration Profile (%s): %s", d.Id(), err)
+		return create.DiagError(names.AppConfig, create.ErrActionExpandingResourceId, ResNameConfigurationProfile, d.Id(), err)
 	}
 
 	input := &appconfig.GetConfigurationProfileInput{
@@ -255,7 +272,7 @@ func resourceConfigurationProfileDelete(ctx context.Context, d *schema.ResourceD
 	confProfID, appID, err := ConfigurationProfileParseID(d.Id())
 
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "deleting AppConfig Configuration Profile (%s): %s", d.Id(), err)
+		return create.DiagError(names.AppConfig, create.ErrActionExpandingResourceId, ResNameConfigurationProfile, d.Id(), err)
 	}
 
 	input := &appconfig.DeleteConfigurationProfileInput{
@@ -277,13 +294,13 @@ func resourceConfigurationProfileDelete(ctx context.Context, d *schema.ResourceD
 }
 
 func ConfigurationProfileParseID(id string) (string, string, error) {
-	parts := strings.Split(id, ":")
+	idParts, err := flex.ExpandResourceId(id, ConfigurationProfileIdPartsCount)
 
-	if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
-		return "", "", fmt.Errorf("unexpected format of ID (%q), expected ConfigurationProfileID:ApplicationID", id)
+	if err != nil {
+		return "", "", err
 	}
 
-	return parts[0], parts[1], nil
+	return idParts[0], idParts[1], nil
 }
 
 func expandValidator(tfMap map[string]interface{}) *appconfig.Validator {

internal/service/appconfig/configuration_profile_data_source.go

@@ -13,6 +13,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/create"
+	"github.com/hashicorp/terraform-provider-aws/internal/flex"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
@@ -86,7 +87,17 @@ func dataSourceConfigurationProfileRead(ctx context.Context, d *schema.ResourceD
 
 	appId := d.Get("application_id").(string)
 	profileId := d.Get("configuration_profile_id").(string)
-	ID := fmt.Sprintf("%s:%s", profileId, appId)
+
+	idParts := []string{
+		appId,
+		profileId,
+	}
+
+	ID, err := flex.FlattenResourceId(idParts, ConfigurationProfileIdPartsCount)
+
+	if err != nil {
+		return create.DiagError(names.AppConfig, create.ErrActionFlatteningResourceId, ResNameConfigurationProfile, appId, err)
+	}
 
 	out, err := findConfigurationProfileByApplicationAndProfile(ctx, conn, appId, profileId)
 	if err != nil {

internal/service/appconfig/environment.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"log"
 	"regexp"
-	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/arn"
@@ -15,12 +14,19 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
+	"github.com/hashicorp/terraform-provider-aws/internal/create"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
+	"github.com/hashicorp/terraform-provider-aws/internal/flex"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
+const (
+	EnvironmentIdPartsCount = 2
+	ResNameEnvironment      = "Environment"
+)
+
 // @SDKResource("aws_appconfig_environment", name="Environment")
 // @Tags(identifierAttribute="arn")
 func ResourceEnvironment() *schema.Resource {
@@ -120,8 +126,19 @@ func resourceEnvironmentCreate(ctx context.Context, d *schema.ResourceData, meta
 		return sdkdiag.AppendErrorf(diags, "creating AppConfig Environment for Application (%s): empty response", appId)
 	}
 
+	idParts := []string{
+		aws.StringValue(environment.Id),
+		aws.StringValue(environment.ApplicationId),
+	}
+
+	id, err := flex.FlattenResourceId(idParts, EnvironmentIdPartsCount)
+
+	if err != nil {
+		return create.DiagError(names.AppConfig, create.ErrActionFlatteningResourceId, ResNameEnvironment, appId, err)
+	}
+
+	d.SetId(id)
 	d.Set("environment_id", environment.Id)
-	d.SetId(fmt.Sprintf("%s:%s", aws.StringValue(environment.Id), aws.StringValue(environment.ApplicationId)))
 
 	return append(diags, resourceEnvironmentRead(ctx, d, meta)...)
 }
@@ -133,7 +150,7 @@ func resourceEnvironmentRead(ctx context.Context, d *schema.ResourceData, meta i
 	envID, appID, err := EnvironmentParseID(d.Id())
 
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "reading AppConfig Environment (%s): %s", d.Id(), err)
+		return create.DiagError(names.AppConfig, create.ErrActionExpandingResourceId, ResNameEnvironment, d.Id(), err)
 	}
 
 	input := &appconfig.GetEnvironmentInput{
@@ -188,7 +205,7 @@ func resourceEnvironmentUpdate(ctx context.Context, d *schema.ResourceData, meta
 		envID, appID, err := EnvironmentParseID(d.Id())
 
 		if err != nil {
-			return sdkdiag.AppendErrorf(diags, "updating AppConfig Environment (%s): %s", d.Id(), err)
+			return create.DiagError(names.AppConfig, create.ErrActionExpandingResourceId, ResNameEnvironment, d.Id(), err)
 		}
 
 		updateInput := &appconfig.UpdateEnvironmentInput{
@@ -225,7 +242,7 @@ func resourceEnvironmentDelete(ctx context.Context, d *schema.ResourceData, meta
 	envID, appID, err := EnvironmentParseID(d.Id())
 
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "deleting AppConfig Environment (%s): %s", d.Id(), err)
+		return create.DiagError(names.AppConfig, create.ErrActionExpandingResourceId, ResNameEnvironment, d.Id(), err)
 	}
 
 	input := &appconfig.DeleteEnvironmentInput{
@@ -247,13 +264,13 @@ func resourceEnvironmentDelete(ctx context.Context, d *schema.ResourceData, meta
 }
 
 func EnvironmentParseID(id string) (string, string, error) {
-	parts := strings.Split(id, ":")
+	idParts, err := flex.ExpandResourceId(id, EnvironmentIdPartsCount)
 
-	if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
-		return "", "", fmt.Errorf("unexpected format of ID (%q), expected EnvironmentID:ApplicationID", id)
+	if err != nil {
+		return "", "", err
 	}
 
-	return parts[0], parts[1], nil
+	return idParts[0], idParts[1], nil
 }
 
 func expandEnvironmentMonitor(tfMap map[string]interface{}) *appconfig.Monitor {

internal/service/appconfig/environment_data_source.go

@@ -13,6 +13,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/create"
+	"github.com/hashicorp/terraform-provider-aws/internal/flex"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
@@ -78,7 +79,17 @@ func dataSourceEnvironmentRead(ctx context.Context, d *schema.ResourceData, meta
 
 	appID := d.Get("application_id").(string)
 	envID := d.Get("environment_id").(string)
-	ID := fmt.Sprintf("%s:%s", envID, appID)
+
+	idParts := []string{
+		envID,
+		appID,
+	}
+
+	ID, err := flex.FlattenResourceId(idParts, EnvironmentIdPartsCount)
+
+	if err != nil {
+		return create.DiagError(names.AppConfig, create.ErrActionFlatteningResourceId, ResNameEnvironment, appID, err)
+	}
 
 	out, err := findEnvironmentByApplicationAndEnvironment(ctx, conn, appID, envID)
 	if err != nil {

internal/service/appsync/api_key.go

@@ -2,9 +2,7 @@ package appsync
 
 import (
 	"context"
-	"fmt"
 	"log"
-	"strings"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -14,7 +12,15 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
+	"github.com/hashicorp/terraform-provider-aws/internal/create"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
+	"github.com/hashicorp/terraform-provider-aws/internal/flex"
+	"github.com/hashicorp/terraform-provider-aws/names"
+)
+
+const (
+	APIKeyIdPartsCount = 2
+	ResNameAPIKey      = "APIKey"
 )
 
 // @SDKResource("aws_appsync_api_key")
@@ -78,7 +84,19 @@ func resourceAPIKeyCreate(ctx context.Context, d *schema.ResourceData, meta inte
 		return sdkdiag.AppendErrorf(diags, "creating Appsync API Key: %s", err)
 	}
 
-	d.SetId(fmt.Sprintf("%s:%s", apiID, aws.StringValue(resp.ApiKey.Id)))
+	idParts := []string{
+		apiID,
+		aws.StringValue(resp.ApiKey.Id),
+	}
+
+	id, err := flex.FlattenResourceId(idParts, APIKeyIdPartsCount)
+
+	if err != nil {
+		return create.DiagError(names.AppSync, create.ErrActionFlatteningResourceId, ResNameAPIKey, apiID, err)
+	}
+
+	d.SetId(id)
+
 	return append(diags, resourceAPIKeyRead(ctx, d, meta)...)
 }
 
@@ -88,7 +106,7 @@ func resourceAPIKeyRead(ctx context.Context, d *schema.ResourceData, meta interf
 
 	apiID, keyID, err := DecodeAPIKeyID(d.Id())
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "reading Appsync API Key (%s): %s", d.Id(), err)
+		return create.DiagError(names.AppSync, create.ErrActionExpandingResourceId, ResNameAPIKey, d.Id(), err)
 	}
 
 	key, err := GetAPIKey(ctx, apiID, keyID, conn)
@@ -114,7 +132,7 @@ func resourceAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, meta inte
 
 	apiID, keyID, err := DecodeAPIKeyID(d.Id())
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "updating Appsync API Key (%s): %s", d.Id(), err)
+		return create.DiagError(names.AppSync, create.ErrActionExpandingResourceId, ResNameAPIKey, d.Id(), err)
 	}
 
 	params := &appsync.UpdateApiKeyInput{
@@ -143,7 +161,7 @@ func resourceAPIKeyDelete(ctx context.Context, d *schema.ResourceData, meta inte
 
 	apiID, keyID, err := DecodeAPIKeyID(d.Id())
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "deleting Appsync API Key (%s): %s", d.Id(), err)
+		return create.DiagError(names.AppSync, create.ErrActionExpandingResourceId, ResNameAPIKey, d.Id(), err)
 	}
 
 	input := &appsync.DeleteApiKeyInput{
@@ -162,11 +180,13 @@ func resourceAPIKeyDelete(ctx context.Context, d *schema.ResourceData, meta inte
 }
 
 func DecodeAPIKeyID(id string) (string, string, error) {
-	parts := strings.Split(id, ":")
-	if len(parts) != 2 {
-		return "", "", fmt.Errorf("Unexpected format of ID (%q), expected API-ID:API-KEY-ID", id)
+	idParts, err := flex.ExpandResourceId(id, APIKeyIdPartsCount)
+
+	if err != nil {
+		return "", "", err
 	}
-	return parts[0], parts[1], nil
+
+	return idParts[0], idParts[1], nil
 }
 
 func GetAPIKey(ctx context.Context, apiID, keyID string, conn *appsync.AppSync) (*appsync.ApiKey, error) {