r/aws_mq_configuration: Add 'FindConfigurationByID'.

Acceptance test output:

% make testacc TESTARGS='-run=TestAccMQConfiguration_' PKG=mq ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/mq/... -v -count 1 -parallel 2  -run=TestAccMQConfiguration_ -timeout 180m
=== RUN   TestAccMQConfiguration_basic
=== PAUSE TestAccMQConfiguration_basic
=== RUN   TestAccMQConfiguration_withData
=== PAUSE TestAccMQConfiguration_withData
=== RUN   TestAccMQConfiguration_withLdapData
=== PAUSE TestAccMQConfiguration_withLdapData
=== RUN   TestAccMQConfiguration_tags
=== PAUSE TestAccMQConfiguration_tags
=== CONT  TestAccMQConfiguration_basic
=== CONT  TestAccMQConfiguration_withLdapData
--- PASS: TestAccMQConfiguration_withLdapData (21.43s)
=== CONT  TestAccMQConfiguration_withData
--- PASS: TestAccMQConfiguration_basic (38.58s)
=== CONT  TestAccMQConfiguration_tags
--- PASS: TestAccMQConfiguration_withData (19.96s)
--- PASS: TestAccMQConfiguration_tags (46.36s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/mq	89.544s

Author: ewbankkit

internal/service/mq/configuration.go

@@ -5,15 +5,18 @@ import (
 	"encoding/base64"
 	"fmt"
 	"log"
+	"strconv"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/mq"
 	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"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"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
+	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
 )
 
@@ -97,81 +100,101 @@ func resourceConfigurationCreate(d *schema.ResourceData, meta interface{}) error
 	defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig
 	tags := defaultTagsConfig.MergeTags(tftags.New(d.Get("tags").(map[string]interface{})))
 
-	input := mq.CreateConfigurationRequest{
+	name := d.Get("name").(string)
+	input := &mq.CreateConfigurationRequest{
 		EngineType:    aws.String(d.Get("engine_type").(string)),
 		EngineVersion: aws.String(d.Get("engine_version").(string)),
-		Name:          aws.String(d.Get("name").(string)),
+		Name:          aws.String(name),
 	}
 
 	if v, ok := d.GetOk("authentication_strategy"); ok {
 		input.AuthenticationStrategy = aws.String(v.(string))
 	}
+
 	if len(tags) > 0 {
 		input.Tags = Tags(tags.IgnoreAWS())
 	}
 
-	log.Printf("[INFO] Creating MQ Configuration: %s", input)
-	out, err := conn.CreateConfiguration(&input)
+	output, err := conn.CreateConfiguration(input)
+
 	if err != nil {
-		return err
+		return fmt.Errorf("creating MQ Configuration (%s): %w", name, err)
 	}
 
-	d.SetId(aws.StringValue(out.Id))
-	d.Set("arn", out.Arn)
+	d.SetId(aws.StringValue(output.Id))
+
+	if v, ok := d.GetOk("data"); ok {
+		input := &mq.UpdateConfigurationRequest{
+			ConfigurationId: aws.String(d.Id()),
+			Data:            aws.String(base64.StdEncoding.EncodeToString([]byte(v.(string)))),
+		}
+
+		if v, ok := d.GetOk("description"); ok {
+			input.Description = aws.String(v.(string))
+		}
+
+		_, err := conn.UpdateConfiguration(input)
 
-	return resourceConfigurationUpdate(d, meta)
+		if err != nil {
+			return fmt.Errorf("updating MQ Configuration (%s): %w", d.Id(), err)
+		}
+	}
+
+	return resourceConfigurationRead(d, meta)
 }
 
 func resourceConfigurationRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*conns.AWSClient).MQConn
 	defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig
 	ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig
 
-	log.Printf("[INFO] Reading MQ Configuration %s", d.Id())
-	out, err := conn.DescribeConfiguration(&mq.DescribeConfigurationInput{
-		ConfigurationId: aws.String(d.Id()),
-	})
+	configuration, err := FindConfigurationByID(conn, d.Id())
+
+	if !d.IsNewResource() && tfresource.NotFound(err) {
+		log.Printf("[WARN] MQ Configuration (%s) not found, removing from state", d.Id())
+		d.SetId("")
+		return nil
+	}
+
 	if err != nil {
-		if tfawserr.ErrCodeEquals(err, mq.ErrCodeNotFoundException) {
-			log.Printf("[WARN] MQ Configuration %q not found, removing from state", d.Id())
-			d.SetId("")
-			return nil
-		}
-		return err
+		return fmt.Errorf("reading MQ Configuration (%s): %w", d.Id(), err)
 	}
 
-	d.Set("arn", out.Arn)
-	d.Set("authentication_strategy", out.AuthenticationStrategy)
-	d.Set("description", out.LatestRevision.Description)
-	d.Set("engine_type", out.EngineType)
-	d.Set("engine_version", out.EngineVersion)
-	d.Set("latest_revision", out.LatestRevision.Revision)
-	d.Set("name", out.Name)
+	d.Set("arn", configuration.Arn)
+	d.Set("authentication_strategy", configuration.AuthenticationStrategy)
+	d.Set("description", configuration.LatestRevision.Description)
+	d.Set("engine_type", configuration.EngineType)
+	d.Set("engine_version", configuration.EngineVersion)
+	d.Set("latest_revision", configuration.LatestRevision.Revision)
+	d.Set("name", configuration.Name)
 
-	rOut, err := conn.DescribeConfigurationRevision(&mq.DescribeConfigurationRevisionInput{
+	revision := strconv.FormatInt(aws.Int64Value(configuration.LatestRevision.Revision), 10)
+	configurationRevision, err := conn.DescribeConfigurationRevision(&mq.DescribeConfigurationRevisionInput{
 		ConfigurationId:       aws.String(d.Id()),
-		ConfigurationRevision: aws.String(fmt.Sprintf("%d", *out.LatestRevision.Revision)),
+		ConfigurationRevision: aws.String(revision),
 	})
+
 	if err != nil {
-		return err
+		return fmt.Errorf("reading MQ Configuration (%s) revision (%s): %w", d.Id(), revision, err)
 	}
 
-	b, err := base64.StdEncoding.DecodeString(*rOut.Data)
+	data, err := base64.StdEncoding.DecodeString(aws.StringValue(configurationRevision.Data))
+
 	if err != nil {
-		return err
+		return fmt.Errorf("base64 decoding: %w", err)
 	}
 
-	d.Set("data", string(b))
+	d.Set("data", string(data))
 
-	tags := KeyValueTags(out.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig)
+	tags := KeyValueTags(configuration.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig)
 
 	//lintignore:AWSR002
 	if err := d.Set("tags", tags.RemoveDefaultConfig(defaultTagsConfig).Map()); err != nil {
-		return fmt.Errorf("error setting tags: %w", err)
+		return fmt.Errorf("setting tags: %w", err)
 	}
 
 	if err := d.Set("tags_all", tags.Map()); err != nil {
-		return fmt.Errorf("error setting tags_all: %w", err)
+		return fmt.Errorf("setting tags_all: %w", err)
 	}
 
 	return nil
@@ -181,35 +204,58 @@ func resourceConfigurationUpdate(d *schema.ResourceData, meta interface{}) error
 	conn := meta.(*conns.AWSClient).MQConn
 
 	if d.HasChanges("data", "description") {
-		rawData := d.Get("data").(string)
-		data := base64.StdEncoding.EncodeToString([]byte(rawData))
-
-		input := mq.UpdateConfigurationRequest{
+		input := &mq.UpdateConfigurationRequest{
 			ConfigurationId: aws.String(d.Id()),
-			Data:            aws.String(data),
+			Data:            aws.String(base64.StdEncoding.EncodeToString([]byte(d.Get("data").(string)))),
 		}
+
 		if v, ok := d.GetOk("description"); ok {
 			input.Description = aws.String(v.(string))
 		}
 
-		log.Printf("[INFO] Updating MQ Configuration %s: %s", d.Id(), input)
-		_, err := conn.UpdateConfiguration(&input)
+		_, err := conn.UpdateConfiguration(input)
+
 		if err != nil {
-			return err
+			return fmt.Errorf("updating MQ Configuration (%s): %w", d.Id(), err)
 		}
 	}
 
 	if d.HasChange("tags_all") {
 		o, n := d.GetChange("tags_all")
 
 		if err := UpdateTags(conn, d.Get("arn").(string), o, n); err != nil {
-			return fmt.Errorf("error updating MQ Broker (%s) tags: %s", d.Get("arn").(string), err)
+			return fmt.Errorf("updating MQ Configuration (%s) tags: %w", d.Get("arn").(string), err)
 		}
 	}
 
 	return resourceConfigurationRead(d, meta)
 }
 
+func FindConfigurationByID(conn *mq.MQ, id string) (*mq.DescribeConfigurationOutput, error) {
+	input := &mq.DescribeConfigurationInput{
+		ConfigurationId: aws.String(id),
+	}
+
+	output, err := conn.DescribeConfiguration(input)
+
+	if tfawserr.ErrCodeEquals(err, mq.ErrCodeNotFoundException) {
+		return nil, &resource.NotFoundError{
+			LastError:   err,
+			LastRequest: input,
+		}
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	if output == nil {
+		return nil, tfresource.NewEmptyResultError(input)
+	}
+
+	return output, nil
+}
+
 func suppressXMLEquivalentConfig(k, old, new string, d *schema.ResourceData) bool {
 	os, err := CanonicalXML(old)
 	if err != nil {