Skip to content
This repository was archived by the owner on Dec 16, 2022. It is now read-only.

Slack vitess 2018 10 29.r1 #116

Merged
rafael merged 2 commits into from
Oct 30, 2018
Merged

Slack vitess 2018 10 29.r1 #116

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
c8c34f4
change s3_backup_aws_region flag to `""`
Oct 30, 2018
b8316de
Improve warning so it's not that verbose.
Oct 29, 2018
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 go/vt/mysqlctl/s3backupstorage/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var (
region = flag.String("s3_backup_aws_region", "us-east-1", "AWS region to use")

// AWS endpoint, defaults to amazonaws.com but appliances may use a different location
endpoint = flag.String("s3_backup_aws_endpoint", "amazonaws.com", "endpoint of the S3 backend (region must be provided)")
endpoint = flag.String("s3_backup_aws_endpoint", "", "endpoint of the S3 backend (region must be provided)")

// bucket is where the backups will go.
bucket = flag.String("s3_backup_storage_bucket", "", "S3 bucket to use for backups")
Expand Down
11 changes: 7 additions & 4 deletions go/vt/topo/consultopo/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,14 @@ func NewServer(cell, serverAddr, root string) (*Server, error) {
}
cfg := api.DefaultConfig()
cfg.Address = serverAddr
if creds != nil && creds[cell] != nil {
cfg.Token = creds[cell].ACLToken
} else {
log.Warningf("Client auth not configured for cell: %v", cell)
if creds != nil {
if creds[cell] != nil {
cfg.Token = creds[cell].ACLToken
} else {
log.Warningf("Client auth not configured for cell: %v", cell)
}
}

client, err := api.NewClient(cfg)
if err != nil {
return nil, err
Expand Down