feat(storage): support custom hostname for VirtualHostedStyle SignedU…

…RLs (#9348)
googleapis · Feb 1, 2024 · 7eec40e · 7eec40e
1 parent f127b46
commit 7eec40e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/storage/bucket_test.go b/storage/bucket_test.go
@@ -1411,8 +1411,8 @@ func TestBucketSignedURL_Endpoint_Emulator_Host(t *testing.T) {
 		},
 		{
 			desc:         "VirtualHostedStyle - endpoint overrides emulator",
-			emulatorHost: "localhost:9000",
-			endpoint:     &localhost6000Https,
+			emulatorHost: "localhost:8000",
+			endpoint:     &localhost9000,
 			now:          expires.Add(-24 * time.Hour),
 			opts: &SignedURLOptions{
 				GoogleAccessID: "xxx@clientid",

diff --git a/storage/integration_test.go b/storage/integration_test.go
@@ -2129,6 +2129,14 @@ func TestIntegration_SignedURL(t *testing.T) {
 				headers: map[string][]string{"X-Goog-Foo": {"bar baz"}},
 				fail:    true,
 			},
+			{
+				desc: "Virtual hosted style with custom hostname",
+				opts: SignedURLOptions{
+					Style:    VirtualHostedStyle(),
+					Hostname: "storage.googleapis.com:443",
+				},
+				fail: false,
+			},
 			{
 				desc: "Hostname v4",
 				opts: SignedURLOptions{

diff --git a/storage/storage.go b/storage/storage.go
@@ -301,7 +301,11 @@ func (s pathStyle) host(hostname, bucket string) string {
 	return "storage.googleapis.com"
 }
 
-func (s virtualHostedStyle) host(_, bucket string) string {
+func (s virtualHostedStyle) host(hostname, bucket string) string {
+	if hostname != "" {
+		return bucket + "." + stripScheme(hostname)
+	}
+
 	if host := os.Getenv("STORAGE_EMULATOR_HOST"); host != "" {
 		return bucket + "." + stripScheme(host)
 	}
@@ -457,7 +461,7 @@ type SignedURLOptions struct {
 
 	// Hostname sets the host of the signed URL. This field overrides any
 	// endpoint set on a storage Client or through STORAGE_EMULATOR_HOST.
-	// Only compatible with PathStyle URLStyle.
+	// Only compatible with PathStyle and VirtualHostedStyle URLStyles.
 	// Optional.
 	Hostname string
 }