fix: s3 image uploads to us-east-1 (us standard) did not return correct image urls so images shared to slack and other services was not correct, fixes #8444

pull/7727/merge v4.3.1
Torkel Ödegaard 8 years ago
parent 423ad4d36e
commit befc15c5a1
  1. 2
      package.json
  2. 6
      pkg/components/imguploader/s3uploader.go

@ -4,7 +4,7 @@
"company": "Coding Instinct AB"
},
"name": "grafana",
"version": "4.3.0",
"version": "4.3.1",
"repository": {
"type": "git",
"url": "http://github.com/grafana/grafana.git"

@ -78,5 +78,9 @@ func (u *S3Uploader) Upload(imageDiskPath string) (string, error) {
return "", err
}
return "https://" + u.bucket + ".s3-" + u.region + ".amazonaws.com/" + key, nil
if u.region == "us-east-1" {
return "https://" + u.bucket + ".s3.amazonaws.com/" + key, nil
} else {
return "https://" + u.bucket + ".s3-" + u.region + ".amazonaws.com/" + key, nil
}
}

Loading…
Cancel
Save