Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion book/src/dev/integrations/s3.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ You can create `~/.aws/credentials` by installing the

## Endpoint

To use S3-compatible storage not provided by AWS, set the `AWS_S3_ENDPOINT`
To use S3-compatible storage not provided by AWS, set the `AWS_ENDPOINT_URL_S3`
environment variable to the hostname or URI of the provider.

## Wildcard Support
Expand Down
4 changes: 2 additions & 2 deletions pkg/s3io/s3io.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ func NewClient(cfg *aws.Config) *s3.S3 {
cfg = &aws.Config{}
}
// Add ability to override s3 endpoint via env variable (the aws sdk doesn't
// support this). This is mostly for system tests w/ minio.
if endpoint := os.Getenv("AWS_S3_ENDPOINT"); cfg.Endpoint == nil && endpoint != "" {
// support this). This is mostly for system tests.
if endpoint := os.Getenv("AWS_ENDPOINT_URL_S3"); cfg.Endpoint == nil && endpoint != "" {
cfg.Endpoint = new(endpoint)
cfg.S3ForcePathStyle = new(true) // https://github.com/minio/minio/tree/master/docs/config#domain
}
Expand Down
1 change: 0 additions & 1 deletion testdata/s3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@ EOF

export AWS_ENDPOINT_URL_S3=http://localhost:$port
export AWS_REGION=does-not-matter
export AWS_S3_ENDPOINT=$AWS_ENDPOINT_URL_S3
Loading