Remove extra retry and cleanup errors for deleting api gateway resource

aws/resource_aws_api_gateway_resource.go

@@ -4,12 +4,10 @@ import (
 	"fmt"
 	"log"
 	"strings"
-	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/apigateway"
-	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
@@ -145,29 +143,18 @@ func resourceAwsApiGatewayResourceDelete(d *schema.ResourceData, meta interface{
 	conn := meta.(*AWSClient).apigateway
 	log.Printf("[DEBUG] Deleting API Gateway Resource: %s", d.Id())
 
-	err := resource.Retry(5*time.Minute, func() *resource.RetryError {
-		log.Printf("[DEBUG] schema is %#v", d)
-		_, err := conn.DeleteResource(&apigateway.DeleteResourceInput{
-			ResourceId: aws.String(d.Id()),
-			RestApiId:  aws.String(d.Get("rest_api_id").(string)),
-		})
-		if err == nil {
-			return nil
-		}
-
-		if apigatewayErr, ok := err.(awserr.Error); ok && apigatewayErr.Code() == "NotFoundException" {
-			return nil
-		}
-
-		return resource.NonRetryableError(err)
+	log.Printf("[DEBUG] schema is %#v", d)
+	_, err := conn.DeleteResource(&apigateway.DeleteResourceInput{
+		ResourceId: aws.String(d.Id()),
+		RestApiId:  aws.String(d.Get("rest_api_id").(string)),
 	})
 
-	if isResourceTimeoutError(err) {
-		_, err = conn.DeleteResource(&apigateway.DeleteResourceInput{
-			ResourceId: aws.String(d.Id()),
-			RestApiId:  aws.String(d.Get("rest_api_id").(string)),
-		})
+	if isAWSErr(err, apigateway.ErrCodeNotFoundException, "") {
+		return nil
 	}
 
-	return err
+	if err != nil {
+		return fmt.Errorf("Error deleting API Gateway Resource: %s", err)
+	}
+	return nil
 }