r/aws_iot_domain_configuration: Alphabetize.

Author: ewbankkit

internal/service/iot/domain_configuration.go

@@ -139,11 +139,19 @@ func resourceDomainConfigurationCreate(ctx context.Context, d *schema.ResourceDa
 	conn := meta.(*conns.AWSClient).IoTClient(ctx)
 
 	name := d.Get(names.AttrName).(string)
-	input := &iot.CreateDomainConfigurationInput{
+	input := iot.CreateDomainConfigurationInput{
 		DomainConfigurationName: aws.String(name),
 		Tags:                    getTagsIn(ctx),
 	}
 
+	if v, ok := d.GetOk("application_protocol"); ok {
+		input.ApplicationProtocol = awstypes.ApplicationProtocol(v.(string))
+	}
+
+	if v, ok := d.GetOk("authentication_type"); ok {
+		input.AuthenticationType = awstypes.AuthenticationType(v.(string))
+	}
+
 	if v, ok := d.GetOk("authorizer_config"); ok && len(v.([]any)) > 0 && v.([]any)[0] != nil {
 		input.AuthorizerConfig = expandAuthorizerConfig(v.([]any)[0].(map[string]any))
 	}
@@ -168,15 +176,7 @@ func resourceDomainConfigurationCreate(ctx context.Context, d *schema.ResourceDa
 		input.ValidationCertificateArn = aws.String(v.(string))
 	}
 
-	if v, ok := d.GetOk("authentication_type"); ok {
-		input.AuthenticationType = awstypes.AuthenticationType(v.(string))
-	}
-
-	if v, ok := d.GetOk("application_protocol"); ok {
-		input.ApplicationProtocol = awstypes.ApplicationProtocol(v.(string))
-	}
-
-	output, err := conn.CreateDomainConfiguration(ctx, input)
+	output, err := conn.CreateDomainConfiguration(ctx, &input)
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "creating IoT Domain Configuration (%s): %s", name, err)
@@ -203,7 +203,9 @@ func resourceDomainConfigurationRead(ctx context.Context, d *schema.ResourceData
 		return sdkdiag.AppendErrorf(diags, "reading IoT Domain Configuration (%s): %s", d.Id(), err)
 	}
 
+	d.Set("application_protocol", output.ApplicationProtocol)
 	d.Set(names.AttrARN, output.DomainConfigurationArn)
+	d.Set("authentication_type", output.AuthenticationType)
 	if output.AuthorizerConfig != nil {
 		if err := d.Set("authorizer_config", []any{flattenAuthorizerConfig(output.AuthorizerConfig)}); err != nil {
 			return sdkdiag.AppendErrorf(diags, "setting authorizer_config: %s", err)
@@ -227,8 +229,6 @@ func resourceDomainConfigurationRead(ctx context.Context, d *schema.ResourceData
 		d.Set("tls_config", nil)
 	}
 	d.Set("validation_certificate_arn", d.Get("validation_certificate_arn"))
-	d.Set("authentication_type", output.AuthenticationType)
-	d.Set("application_protocol", output.ApplicationProtocol)
 
 	return diags
 }
@@ -238,10 +238,18 @@ func resourceDomainConfigurationUpdate(ctx context.Context, d *schema.ResourceDa
 	conn := meta.(*conns.AWSClient).IoTClient(ctx)
 
 	if d.HasChangesExcept(names.AttrTags, names.AttrTagsAll) {
-		input := &iot.UpdateDomainConfigurationInput{
+		input := iot.UpdateDomainConfigurationInput{
 			DomainConfigurationName: aws.String(d.Id()),
 		}
 
+		if d.HasChange("application_protocol") {
+			input.ApplicationProtocol = awstypes.ApplicationProtocol(d.Get("application_protocol").(string))
+		}
+
+		if d.HasChange("authentication_type") {
+			input.AuthenticationType = awstypes.AuthenticationType(d.Get("authentication_type").(string))
+		}
+
 		if d.HasChange("authorizer_config") {
 			if v, ok := d.GetOk("authorizer_config"); ok && len(v.([]any)) > 0 && v.([]any)[0] != nil {
 				input.AuthorizerConfig = expandAuthorizerConfig(v.([]any)[0].(map[string]any))
@@ -260,15 +268,7 @@ func resourceDomainConfigurationUpdate(ctx context.Context, d *schema.ResourceDa
 			}
 		}
 
-		if d.HasChange("authentication_type") {
-			input.AuthenticationType = awstypes.AuthenticationType(d.Get("authentication_type").(string))
-		}
-
-		if d.HasChange("application_protocol") {
-			input.ApplicationProtocol = awstypes.ApplicationProtocol(d.Get("application_protocol").(string))
-		}
-
-		_, err := conn.UpdateDomainConfiguration(ctx, input)
+		_, err := conn.UpdateDomainConfiguration(ctx, &input)
 
 		if err != nil {
 			return sdkdiag.AppendErrorf(diags, "updating IoT Domain Configuration (%s): %s", d.Id(), err)
@@ -283,10 +283,11 @@ func resourceDomainConfigurationDelete(ctx context.Context, d *schema.ResourceDa
 	conn := meta.(*conns.AWSClient).IoTClient(ctx)
 
 	if d.Get(names.AttrStatus).(string) == string(awstypes.DomainConfigurationStatusEnabled) {
-		_, err := conn.UpdateDomainConfiguration(ctx, &iot.UpdateDomainConfigurationInput{
+		input := iot.UpdateDomainConfigurationInput{
 			DomainConfigurationName:   aws.String(d.Id()),
 			DomainConfigurationStatus: awstypes.DomainConfigurationStatusDisabled,
-		})
+		}
+		_, err := conn.UpdateDomainConfiguration(ctx, &input)
 
 		if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 			return diags
@@ -298,9 +299,10 @@ func resourceDomainConfigurationDelete(ctx context.Context, d *schema.ResourceDa
 	}
 
 	log.Printf("[DEBUG] Deleting IoT Domain Configuration: %s", d.Id())
-	_, err := conn.DeleteDomainConfiguration(ctx, &iot.DeleteDomainConfigurationInput{
+	input := iot.DeleteDomainConfigurationInput{
 		DomainConfigurationName: aws.String(d.Id()),
-	})
+	}
+	_, err := conn.DeleteDomainConfiguration(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 		return diags
@@ -314,11 +316,11 @@ func resourceDomainConfigurationDelete(ctx context.Context, d *schema.ResourceDa
 }
 
 func findDomainConfigurationByName(ctx context.Context, conn *iot.Client, name string) (*iot.DescribeDomainConfigurationOutput, error) {
-	input := &iot.DescribeDomainConfigurationInput{
+	input := iot.DescribeDomainConfigurationInput{
 		DomainConfigurationName: aws.String(name),
 	}
 
-	output, err := conn.DescribeDomainConfiguration(ctx, input)
+	output, err := conn.DescribeDomainConfiguration(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 		return nil, &retry.NotFoundError{

internal/service/iot/domain_configuration_test.go

@@ -335,8 +335,8 @@ func testAccDomainConfigurationConfig_securityPolicy(rName, rootDomain, domain,
 resource "aws_iot_domain_configuration" "test" {
   depends_on = [aws_acm_certificate_validation.test]
 
-	authentication_type = %[5]q
-	application_protocol = %[6]q
+  authentication_type  = %[5]q
+  application_protocol = %[6]q
 
   authorizer_config {
     allow_authorizer_override = %[4]t