mirror of
https://github.com/thegeeklab/drone-s3-sync.git
synced 2024-06-18 11:20:51 +02:00
try to handle 404s correctly
This commit is contained in:
Nathan LaFreniere
parent
742f2b5e17
commit
32a26aa1a4
174
aws.go
174
aws.go
|
|
@ -9,6 +9,7 @@ import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"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/aws/credentials"
|
"github.com/aws/aws-sdk-go/aws/credentials"
|
||||||
"github.com/aws/aws-sdk-go/aws/session"
|
"github.com/aws/aws-sdk-go/aws/session"
|
||||||
"github.com/aws/aws-sdk-go/service/s3"
|
"github.com/aws/aws-sdk-go/service/s3"
|
||||||
|
|
@ -98,112 +99,109 @@ func (a *AWS) Upload(local, remote string) error {
|
||||||
Bucket: aws.String(a.vargs.Bucket),
|
Bucket: aws.String(a.vargs.Bucket),
|
||||||
Key: aws.String(remote),
|
Key: aws.String(remote),
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil && err.(awserr.Error).Code() != "404" {
|
||||||
|
if err.(awserr.Error).Code() == "404" {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
debug("Uploading \"%s\" with Content-Type \"%s\" and permissions \"%s\"", local, contentType, access)
|
||||||
|
_, err = a.client.PutObject(&s3.PutObjectInput{
|
||||||
|
Bucket: aws.String(a.vargs.Bucket),
|
||||||
|
Key: aws.String(remote),
|
||||||
|
Body: file,
|
||||||
|
ContentType: aws.String(contentType),
|
||||||
|
ACL: aws.String(access),
|
||||||
|
Metadata: metadata,
|
||||||
|
})
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if head != nil {
|
hash := md5.New()
|
||||||
hash := md5.New()
|
io.Copy(hash, file)
|
||||||
io.Copy(hash, file)
|
sum := fmt.Sprintf("\"%x\"", hash.Sum(nil))
|
||||||
sum := fmt.Sprintf("\"%x\"", hash.Sum(nil))
|
|
||||||
|
|
||||||
if sum == *head.ETag {
|
if sum == *head.ETag {
|
||||||
shouldCopy := false
|
shouldCopy := false
|
||||||
|
|
||||||
if head.ContentType == nil && contentType != "" {
|
if head.ContentType == nil && contentType != "" {
|
||||||
debug("Content-Type has changed from unset to %s", contentType)
|
debug("Content-Type has changed from unset to %s", contentType)
|
||||||
shouldCopy = true
|
shouldCopy = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if !shouldCopy && head.ContentType != nil && contentType != *head.ContentType {
|
if !shouldCopy && head.ContentType != nil && contentType != *head.ContentType {
|
||||||
debug("Content-Type has changed from %s to %s", *head.ContentType, contentType)
|
debug("Content-Type has changed from %s to %s", *head.ContentType, contentType)
|
||||||
shouldCopy = true
|
shouldCopy = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if !shouldCopy && len(head.Metadata) != len(metadata) {
|
if !shouldCopy && len(head.Metadata) != len(metadata) {
|
||||||
debug("Count of metadata values has changed for %s", local)
|
debug("Count of metadata values has changed for %s", local)
|
||||||
shouldCopy = true
|
shouldCopy = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if !shouldCopy && len(metadata) > 0 {
|
if !shouldCopy && len(metadata) > 0 {
|
||||||
for k, v := range metadata {
|
for k, v := range metadata {
|
||||||
if hv, ok := head.Metadata[k]; ok {
|
if hv, ok := head.Metadata[k]; ok {
|
||||||
if *v != *hv {
|
if *v != *hv {
|
||||||
debug("Metadata values have changed for %s", local)
|
debug("Metadata values have changed for %s", local)
|
||||||
shouldCopy = true
|
shouldCopy = true
|
||||||
break
|
break
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if !shouldCopy {
|
if !shouldCopy {
|
||||||
grant, err := a.client.GetObjectAcl(&s3.GetObjectAclInput{
|
grant, err := a.client.GetObjectAcl(&s3.GetObjectAclInput{
|
||||||
Bucket: aws.String(a.vargs.Bucket),
|
Bucket: aws.String(a.vargs.Bucket),
|
||||||
Key: aws.String(remote),
|
Key: aws.String(remote),
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
previousAccess := "private"
|
|
||||||
for _, g := range grant.Grants {
|
|
||||||
gt := *g.Grantee
|
|
||||||
if gt.URI != nil {
|
|
||||||
if *gt.URI == "http://acs.amazonaws.com/groups/global/AllUsers" {
|
|
||||||
if *g.Permission == "READ" {
|
|
||||||
previousAccess = "public-read"
|
|
||||||
} else if *g.Permission == "WRITE" {
|
|
||||||
previousAccess = "public-read-write"
|
|
||||||
}
|
|
||||||
} else if *gt.URI == "http://acs.amazonaws.com/groups/global/AllUsers" {
|
|
||||||
if *g.Permission == "READ" {
|
|
||||||
previousAccess = "authenticated-read"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if previousAccess != access {
|
|
||||||
debug("Permissions for \"%s\" have changed from \"%s\" to \"%s\"", remote, previousAccess, access)
|
|
||||||
shouldCopy = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !shouldCopy {
|
|
||||||
debug("Skipping \"%s\" because hashes and metadata match", local)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
debug("Updating metadata for \"%s\" Content-Type: \"%s\", ACL: \"%s\"", local, contentType, access)
|
|
||||||
_, err = a.client.CopyObject(&s3.CopyObjectInput{
|
|
||||||
Bucket: aws.String(a.vargs.Bucket),
|
|
||||||
Key: aws.String(remote),
|
|
||||||
CopySource: aws.String(fmt.Sprintf("%s/%s", a.vargs.Bucket, remote)),
|
|
||||||
ACL: aws.String(access),
|
|
||||||
ContentType: aws.String(contentType),
|
|
||||||
Metadata: metadata,
|
|
||||||
MetadataDirective: aws.String("REPLACE"),
|
|
||||||
})
|
})
|
||||||
return err
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
previousAccess := "private"
|
||||||
|
for _, g := range grant.Grants {
|
||||||
|
gt := *g.Grantee
|
||||||
|
if gt.URI != nil {
|
||||||
|
if *gt.URI == "http://acs.amazonaws.com/groups/global/AllUsers" {
|
||||||
|
if *g.Permission == "READ" {
|
||||||
|
previousAccess = "public-read"
|
||||||
|
} else if *g.Permission == "WRITE" {
|
||||||
|
previousAccess = "public-read-write"
|
||||||
|
}
|
||||||
|
} else if *gt.URI == "http://acs.amazonaws.com/groups/global/AllUsers" {
|
||||||
|
if *g.Permission == "READ" {
|
||||||
|
previousAccess = "authenticated-read"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if previousAccess != access {
|
||||||
|
debug("Permissions for \"%s\" have changed from \"%s\" to \"%s\"", remote, previousAccess, access)
|
||||||
|
shouldCopy = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = file.Seek(0, 0)
|
if !shouldCopy {
|
||||||
if err != nil {
|
debug("Skipping \"%s\" because hashes and metadata match", local)
|
||||||
return err
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
debug("Updating metadata for \"%s\" Content-Type: \"%s\", ACL: \"%s\"", local, contentType, access)
|
||||||
|
_, err = a.client.CopyObject(&s3.CopyObjectInput{
|
||||||
|
Bucket: aws.String(a.vargs.Bucket),
|
||||||
|
Key: aws.String(remote),
|
||||||
|
CopySource: aws.String(fmt.Sprintf("%s/%s", a.vargs.Bucket, remote)),
|
||||||
|
ACL: aws.String(access),
|
||||||
|
ContentType: aws.String(contentType),
|
||||||
|
Metadata: metadata,
|
||||||
|
MetadataDirective: aws.String("REPLACE"),
|
||||||
|
})
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
debug("Uploading \"%s\" with Content-Type \"%s\" and permissions \"%s\"", local, contentType, access)
|
return nil
|
||||||
_, err = a.client.PutObject(&s3.PutObjectInput{
|
|
||||||
Bucket: aws.String(a.vargs.Bucket),
|
|
||||||
Key: aws.String(remote),
|
|
||||||
Body: file,
|
|
||||||
ContentType: aws.String(contentType),
|
|
||||||
ACL: aws.String(access),
|
|
||||||
Metadata: metadata,
|
|
||||||
})
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *AWS) Redirect(path, location string) error {
|
func (a *AWS) Redirect(path, location string) error {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user