ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more tightly scope s3 bucket object error

This commit is contained in:
Clint Shryock 2015-08-05 14:22:29 -05:00
parent 285b4061db
commit bfaea76b86
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/providers/aws/resource_aws_s3_bucket_object.go
View File

@ -8,6 +8,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
) )
@ -89,10 +90,13 @@ func resourceAwsS3BucketObjectRead(d *schema.ResourceData, meta interface{}) err
}) })
if err != nil { if err != nil {
// if there is an error reading the object we assume it's not there. // If S3 returns a 404 Request Failure, mark the object as destroyed
d.SetId("") if awsErr, ok := err.(awserr.RequestFailure); ok && awsErr.StatusCode() == 404 {
log.Printf("Error Reading Object (%s): %s", key, err) d.SetId("")
return nil log.Printf("[WARN] Error Reading Object (%s), object not found (HTTP status 404)", key)
return nil
}
return err
} }
log.Printf("[DEBUG] Reading S3 Bucket Object meta: %s", resp) log.Printf("[DEBUG] Reading S3 Bucket Object meta: %s", resp)