Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remote/s3: Add support for ACL #3233

Merged
merged 2 commits into from
Oct 4, 2015
Merged

remote/s3: Add support for ACL #3233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d77d15
remote/s3: Add support for ACL
Sep 14, 2015
4f7f20b
remote/s3: Add some docs for supported parameters
Sep 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions state/remote/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"fmt"
"io"
"log"
"os"
"strconv"

Expand Down Expand Up @@ -45,6 +46,11 @@ func s3Factory(conf map[string]string) (Client, error) {
serverSideEncryption = v
}

acl := ""
if raw, ok := conf["acl"]; ok {
acl = raw
}

accessKeyId := conf["access_key"]
secretAccessKey := conf["secret_key"]

Expand Down Expand Up @@ -77,6 +83,7 @@ func s3Factory(conf map[string]string) (Client, error) {
bucketName: bucketName,
keyName: keyName,
serverSideEncryption: serverSideEncryption,
acl: acl,
}, nil
}

Expand All @@ -85,6 +92,7 @@ type S3Client struct {
bucketName string
keyName string
serverSideEncryption bool
acl string
}

func (c *S3Client) Get() (*Payload, error) {
Expand Down Expand Up @@ -140,6 +148,12 @@ func (c *S3Client) Put(data []byte) error {
i.ServerSideEncryption = aws.String("AES256")
}

if c.acl != "" {
i.ACL = aws.String(c.acl)
}

log.Printf("[DEBUG] Uploading remote state to S3: %#v", i)

if _, err := c.nativeClient.PutObject(i); err == nil {
return nil
} else {
Expand Down
7 changes: 7 additions & 0 deletions website/source/docs/commands/remote-config.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ The following backends are supported:
in the `access_key`, `secret_key` and `region` variables
respectively, but passing credentials this way is not recommended since they
will be included in cleartext inside the persisted state.
Other supported parameters include:
* `bucket` - the name of the S3 bucket
* `key` - path where to place/look for state file inside the bucket
* `encrypt` - whether to enable [server side encryption](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html)
of the state file
* `acl` - [Canned ACL](http://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl)
to be applied to the state file.

* HTTP - Stores the state using a simple REST client. State will be fetched
via GET, updated via POST, and purged with DELETE. Requires the `address` variable.
Expand Down