resource/aws_api_gateway_method_settings: Prevent unexpected errors during creation and deletion

.changelog/17234.txt

@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_api_gateway_method_settings: Prevent confusing Terraform error on resource disappearance during creation
+```
+
+```release-note:bug
+resource/aws_api_gateway_method_settings: Ignore non-existent resource errors during deletion
+```

aws/resource_aws_api_gateway_method_settings.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/apigateway"
+	"github.com/hashicorp/aws-sdk-go-base/tfawserr"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
@@ -112,6 +113,10 @@ func resourceAwsApiGatewayMethodSettings() *schema.Resource {
 }
 
 func flattenAwsApiGatewayMethodSettings(settings *apigateway.MethodSetting) []interface{} {
+	if settings == nil {
+		return nil
+	}
+
 	return []interface{}{
 		map[string]interface{}{
 			"metrics_enabled":                            settings.MetricsEnabled,
@@ -131,26 +136,28 @@ func flattenAwsApiGatewayMethodSettings(settings *apigateway.MethodSetting) []in
 func resourceAwsApiGatewayMethodSettingsRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).apigatewayconn
 
-	log.Printf("[DEBUG] Reading API Gateway Method Settings %s", d.Id())
-	input := apigateway.GetStageInput{
+	input := &apigateway.GetStageInput{
 		RestApiId: aws.String(d.Get("rest_api_id").(string)),
 		StageName: aws.String(d.Get("stage_name").(string)),
 	}
-	stage, err := conn.GetStage(&input)
+
+	stage, err := conn.GetStage(input)
+
+	if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, apigateway.ErrCodeNotFoundException) {
+		log.Printf("[WARN] API Gateway Stage Method Settings (%s) not found, removing from state", d.Id())
+		d.SetId("")
+		return nil
+	}
+
 	if err != nil {
-		if isAWSErr(err, apigateway.ErrCodeNotFoundException, "") {
-			log.Printf("[WARN] API Gateway Stage (%s) not found, removing method settings", d.Id())
-			d.SetId("")
-			return nil
-		}
-		return err
+		return fmt.Errorf("error getting API Gateway Stage Method Settings (%s): %w", d.Id(), err)
 	}
-	log.Printf("[DEBUG] Received API Gateway Stage: %s", stage)
 
 	methodPath := d.Get("method_path").(string)
 	settings, ok := stage.MethodSettings[methodPath]
-	if !ok {
-		log.Printf("[WARN] API Gateway Method Settings for %q not found, removing", methodPath)
+
+	if !d.IsNewResource() && !ok {
+		log.Printf("[WARN] API Gateway Stage Method Settings (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil
 	}
@@ -265,9 +272,8 @@ func resourceAwsApiGatewayMethodSettingsUpdate(d *schema.ResourceData, meta inte
 
 func resourceAwsApiGatewayMethodSettingsDelete(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).apigatewayconn
-	log.Printf("[DEBUG] Deleting API Gateway Method Settings: %s", d.Id())
 
-	input := apigateway.UpdateStageInput{
+	input := &apigateway.UpdateStageInput{
 		RestApiId: aws.String(d.Get("rest_api_id").(string)),
 		StageName: aws.String(d.Get("stage_name").(string)),
 		PatchOperations: []*apigateway.PatchOperation{
@@ -277,12 +283,20 @@ func resourceAwsApiGatewayMethodSettingsDelete(d *schema.ResourceData, meta inte
 			},
 		},
 	}
-	log.Printf("[DEBUG] Updating API Gateway Stage: %s", input)
 
-	_, err := conn.UpdateStage(&input)
+	_, err := conn.UpdateStage(input)
+
+	if tfawserr.ErrCodeEquals(err, apigateway.ErrCodeNotFoundException) {
+		return nil
+	}
+
+	// BadRequestException: Cannot remove method setting */* because there is no method setting for this method
+	if tfawserr.ErrMessageContains(err, apigateway.ErrCodeBadRequestException, "no method setting for this method") {
+		return nil
+	}
 
 	if err != nil {
-		return fmt.Errorf("updating API Gateway Stage failed: %w", err)
+		return fmt.Errorf("error deleting API Gateway Stage Method Settings (%s): %w", d.Id(), err)
 	}
 
 	return nil