Remove all location related changes from other providers than Azure for backport

Author: biglittlebigben

gcp.go

@@ -118,15 +118,8 @@ func (s *gcpStorage) upload(reader io.Reader, storagePath, contentType string) (
 		return "", 0, err
 	}
 
-	return s.location(storagePath), n, nil
-}
-
-func (s *gcpStorage) location(storagePath string) string {
-	return (&url.URL{
-		Scheme: "https",
-		Host:   s.conf.Bucket + ".storage.googleapis.com",
-		Path:   storagePath,
-	}).String()
+	loc := url.URL{Scheme: "https", Host: s.conf.Bucket + ".storage.googleapis.com", Path: storagePath}
+	return loc.String(), n, nil
 }
 
 func (s *gcpStorage) ListObjects(prefix string) ([]string, error) {

local.go

@@ -40,7 +40,7 @@ func NewLocal(conf *LocalConfig) (Storage, error) {
 }
 
 func (u *localUploader) UploadFile(localPath, storagePath string, _ string) (string, int64, error) {
-	storagePath = u.location(storagePath)
+	storagePath = path.Join(u.StorageDir, storagePath)
 
 	local, err := os.Open(localPath)
 	if err != nil {
@@ -69,7 +69,7 @@ func (u *localUploader) UploadFile(localPath, storagePath string, _ string) (str
 }
 
 func (u *localUploader) UploadData(data []byte, storagePath, _ string) (string, int64, error) {
-	storagePath = u.location(storagePath)
+	storagePath = path.Join(u.StorageDir, storagePath)
 
 	if dir, _ := path.Split(storagePath); dir != "" {
 		if err := os.MkdirAll(dir, 0755); err != nil {
@@ -91,10 +91,6 @@ func (u *localUploader) UploadData(data []byte, storagePath, _ string) (string,
 	return storagePath, int64(size), nil
 }
 
-func (u *localUploader) location(storagePath string) string {
-	return path.Join(u.StorageDir, storagePath)
-}
-
 func (u *localUploader) ListObjects(prefix string) ([]string, error) {
 	absPrefix := path.Join(u.StorageDir, prefix)
 	dir, filenamePrefix := path.Split(absPrefix)

location_test.go

@@ -21,64 +21,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestAliOSSLocation(t *testing.T) {
-	cases := []struct {
-		name        string
-		conf        AliOSSConfig
-		storagePath string
-		want        string
-	}{
-		{
-			name:        "normal",
-			conf:        AliOSSConfig{Bucket: "mybucket", Endpoint: "oss-region.aliyuncs.com"},
-			storagePath: "foo.mp4",
-			want:        "https://mybucket.oss-region.aliyuncs.com/foo.mp4",
-		},
-		{
-			name:        "endpoint with https:// prefix",
-			conf:        AliOSSConfig{Bucket: "mybucket", Endpoint: "https://oss-region.aliyuncs.com"},
-			storagePath: "foo.mp4",
-			want:        "https://mybucket.oss-region.aliyuncs.com/foo.mp4",
-		},
-		{
-			name:        "endpoint with http:// prefix",
-			conf:        AliOSSConfig{Bucket: "mybucket", Endpoint: "http://oss-region.aliyuncs.com"},
-			storagePath: "foo.mp4",
-			want:        "https://mybucket.oss-region.aliyuncs.com/foo.mp4",
-		},
-		{
-			name:        "nested path",
-			conf:        AliOSSConfig{Bucket: "mybucket", Endpoint: "oss-region.aliyuncs.com"},
-			storagePath: "folder/sub/foo.mp4",
-			want:        "https://mybucket.oss-region.aliyuncs.com/folder/sub/foo.mp4",
-		},
-		{
-			name:        "storagePath with leading slash",
-			conf:        AliOSSConfig{Bucket: "mybucket", Endpoint: "oss-region.aliyuncs.com"},
-			storagePath: "/foo.mp4",
-			want:        "https://mybucket.oss-region.aliyuncs.com/foo.mp4",
-		},
-		{
-			name:        "space in key",
-			conf:        AliOSSConfig{Bucket: "mybucket", Endpoint: "oss-region.aliyuncs.com"},
-			storagePath: "folder/my file.mp4",
-			want:        "https://mybucket.oss-region.aliyuncs.com/folder/my%20file.mp4",
-		},
-		{
-			name:        "unicode in key",
-			conf:        AliOSSConfig{Bucket: "mybucket", Endpoint: "oss-region.aliyuncs.com"},
-			storagePath: "café/résumé.mp4",
-			want:        "https://mybucket.oss-region.aliyuncs.com/caf%C3%A9/r%C3%A9sum%C3%A9.mp4",
-		},
-	}
-	for _, tc := range cases {
-		s := &aliOSSStorage{conf: &tc.conf}
-		got := s.location(tc.storagePath)
-		require.Equal(t, tc.want, got, tc.name)
-		requireWellFormedHTTPLocation(t, got, tc.name)
-	}
-}
-
 func TestAzureLocation(t *testing.T) {
 	cases := []struct {
 		name        string
@@ -143,178 +85,6 @@ func TestAzureLocation(t *testing.T) {
 	}
 }
 
-func TestGCPLocation(t *testing.T) {
-	cases := []struct {
-		name        string
-		conf        GCPConfig
-		storagePath string
-		want        string
-	}{
-		{
-			name:        "normal",
-			conf:        GCPConfig{Bucket: "mybucket"},
-			storagePath: "foo.mp4",
-			want:        "https://mybucket.storage.googleapis.com/foo.mp4",
-		},
-		{
-			name:        "nested path",
-			conf:        GCPConfig{Bucket: "mybucket"},
-			storagePath: "a/b/c.mp4",
-			want:        "https://mybucket.storage.googleapis.com/a/b/c.mp4",
-		},
-		{
-			name:        "storagePath with leading slash",
-			conf:        GCPConfig{Bucket: "mybucket"},
-			storagePath: "/foo.mp4",
-			want:        "https://mybucket.storage.googleapis.com/foo.mp4",
-		},
-		{
-			name:        "space in key",
-			conf:        GCPConfig{Bucket: "mybucket"},
-			storagePath: "folder/my file.mp4",
-			want:        "https://mybucket.storage.googleapis.com/folder/my%20file.mp4",
-		},
-		{
-			name:        "unicode in key",
-			conf:        GCPConfig{Bucket: "mybucket"},
-			storagePath: "café/résumé.mp4",
-			want:        "https://mybucket.storage.googleapis.com/caf%C3%A9/r%C3%A9sum%C3%A9.mp4",
-		},
-	}
-	for _, tc := range cases {
-		s := &gcpStorage{conf: &tc.conf}
-		got := s.location(tc.storagePath)
-		require.Equal(t, tc.want, got, tc.name)
-		requireWellFormedHTTPLocation(t, got, tc.name)
-	}
-}
-
-func TestS3Location(t *testing.T) {
-	cases := []struct {
-		name        string
-		conf        S3Config
-		storagePath string
-		want        string
-	}{
-		{
-			name:        "vhost default endpoint",
-			conf:        S3Config{Bucket: "mybucket"},
-			storagePath: "foo.mp4",
-			want:        "https://mybucket.s3.amazonaws.com/foo.mp4",
-		},
-		{
-			name:        "vhost custom endpoint without scheme",
-			conf:        S3Config{Bucket: "mybucket", Endpoint: "s3.example.com"},
-			storagePath: "foo.mp4",
-			want:        "https://mybucket.s3.example.com/foo.mp4",
-		},
-		{
-			name:        "vhost custom endpoint with https://",
-			conf:        S3Config{Bucket: "mybucket", Endpoint: "https://s3.example.com"},
-			storagePath: "foo.mp4",
-			want:        "https://mybucket.s3.example.com/foo.mp4",
-		},
-		{
-			name:        "vhost custom endpoint with http://",
-			conf:        S3Config{Bucket: "mybucket", Endpoint: "http://s3.example.com"},
-			storagePath: "foo.mp4",
-			want:        "https://mybucket.s3.example.com/foo.mp4",
-		},
-		{
-			name:        "vhost nested path",
-			conf:        S3Config{Bucket: "mybucket"},
-			storagePath: "a/b/c.mp4",
-			want:        "https://mybucket.s3.amazonaws.com/a/b/c.mp4",
-		},
-		{
-			name:        "vhost storagePath with leading slash",
-			conf:        S3Config{Bucket: "mybucket"},
-			storagePath: "/foo.mp4",
-			want:        "https://mybucket.s3.amazonaws.com/foo.mp4",
-		},
-		{
-			name:        "vhost space in key",
-			conf:        S3Config{Bucket: "mybucket"},
-			storagePath: "folder/my file.mp4",
-			want:        "https://mybucket.s3.amazonaws.com/folder/my%20file.mp4",
-		},
-		{
-			name:        "vhost unicode in key",
-			conf:        S3Config{Bucket: "mybucket"},
-			storagePath: "café/résumé.mp4",
-			want:        "https://mybucket.s3.amazonaws.com/caf%C3%A9/r%C3%A9sum%C3%A9.mp4",
-		},
-		{
-			name:        "force path style default endpoint",
-			conf:        S3Config{Bucket: "mybucket", ForcePathStyle: true},
-			storagePath: "foo.mp4",
-			want:        "https://s3.amazonaws.com/mybucket/foo.mp4",
-		},
-		{
-			name:        "force path style custom endpoint",
-			conf:        S3Config{Bucket: "mybucket", Endpoint: "https://minio.example.com", ForcePathStyle: true},
-			storagePath: "foo.mp4",
-			want:        "https://minio.example.com/mybucket/foo.mp4",
-		},
-		{
-			name:        "force path style nested",
-			conf:        S3Config{Bucket: "mybucket", ForcePathStyle: true},
-			storagePath: "a/b/c.mp4",
-			want:        "https://s3.amazonaws.com/mybucket/a/b/c.mp4",
-		},
-		{
-			name:        "force path style storagePath with leading slash",
-			conf:        S3Config{Bucket: "mybucket", ForcePathStyle: true},
-			storagePath: "/foo.mp4",
-			want:        "https://s3.amazonaws.com/mybucket/foo.mp4",
-		},
-	}
-	for _, tc := range cases {
-		s := &s3Storage{conf: &tc.conf}
-		got := s.location(tc.storagePath)
-		require.Equal(t, tc.want, got, tc.name)
-		requireWellFormedHTTPLocation(t, got, tc.name)
-	}
-}
-
-func TestLocalLocation(t *testing.T) {
-	cases := []struct {
-		name        string
-		storageDir  string
-		storagePath string
-		want        string
-	}{
-		{
-			name:        "normal",
-			storageDir:  "/var/storage",
-			storagePath: "foo.mp4",
-			want:        "/var/storage/foo.mp4",
-		},
-		{
-			name:        "nested path",
-			storageDir:  "/var/storage",
-			storagePath: "a/b/c.mp4",
-			want:        "/var/storage/a/b/c.mp4",
-		},
-		{
-			name:        "storagePath with leading slash",
-			storageDir:  "/var/storage",
-			storagePath: "/foo.mp4",
-			want:        "/var/storage/foo.mp4",
-		},
-		{
-			name:        "storageDir with trailing slash",
-			storageDir:  "/var/storage/",
-			storagePath: "foo.mp4",
-			want:        "/var/storage/foo.mp4",
-		},
-	}
-	for _, tc := range cases {
-		u := &localUploader{StorageDir: tc.storageDir}
-		require.Equal(t, tc.want, u.location(tc.storagePath))
-	}
-}
-
 // requireWellFormedHTTPLocation verifies an https:// location URL is parseable,
 // uses the https scheme, has a non-empty host, and contains no accidental
 // double-slashes in its path (the original Azure bug).

s3.go

@@ -260,10 +260,6 @@ func (s *s3Storage) upload(reader io.Reader, storagePath, contentType string) (s
 		return "", err
 	}
 
-	return s.location(storagePath), nil
-}
-
-func (s *s3Storage) location(storagePath string) string {
 	endpoint := "s3.amazonaws.com"
 	if s.conf.Endpoint != "" {
 		endpoint = s.conf.Endpoint
@@ -279,7 +275,8 @@ func (s *s3Storage) location(storagePath string) string {
 		loc.Host = s.conf.Bucket + "." + endpoint
 		loc.Path = storagePath
 	}
-	return loc.String()
+
+	return loc.String(), nil
 }
 
 func (s *s3Storage) ListObjects(prefix string) ([]string, error) {