fix(storage): accept emulator env var without scheme

storage/storage.go

@@ -120,13 +120,26 @@ func NewClient(ctx context.Context, opts ...option.ClientOption) (*Client, error
 		opts = append(opts, internaloption.WithDefaultEndpoint("https://storage.googleapis.com/storage/v1/"))
 		opts = append(opts, internaloption.WithDefaultMTLSEndpoint("https://storage.mtls.googleapis.com/storage/v1/"))
 	} else {
-		scheme = "http"
-		readHost = host
+		// Add scheme for user if not supplied in STORAGE_EMULATOR_HOST
+		var hostURL *url.URL
+		if strings.Contains(host, "://") {
+			h, err := url.Parse(host)
+			if err != nil {
+				return nil, err
+			}
+			hostURL = h
+		} else {
+			hostURL = &url.URL{Scheme: "http", Host: host}
+		}
+
+		// Prepend an endpoint for the user in case they don't supply one
+		hostURL.Path = "storage/v1/"
+		endpoint := hostURL.String()
 
 		opts = append([]option.ClientOption{option.WithoutAuthentication()}, opts...)
 
-		opts = append(opts, internaloption.WithDefaultEndpoint(host))
-		opts = append(opts, internaloption.WithDefaultMTLSEndpoint(host))
+		opts = append(opts, internaloption.WithDefaultEndpoint(endpoint))
+		opts = append(opts, internaloption.WithDefaultMTLSEndpoint(endpoint))
 	}
 
 	// htransport selects the correct endpoint among WithEndpoint (user override), WithDefaultEndpoint, and WithDefaultMTLSEndpoint.

storage/storage_test.go

@@ -1287,7 +1287,15 @@ func TestWithEndpoint(t *testing.T) {
 			desc:                "Emulator host specified, no specified endpoint",
 			CustomEndpoint:      "",
 			StorageEmulatorHost: "http://emu.com",
-			WantRawBasePath:     "http://emu.com",
+			WantRawBasePath:     "http://emu.com/storage/v1/",
+			WantReadHost:        "emu.com",
+			WantScheme:          "http",
+		},
+		{
+			desc:                "Emulator host specified without scheme",
+			CustomEndpoint:      "",
+			StorageEmulatorHost: "emu.com",
+			WantRawBasePath:     "http://emu.com/storage/v1/",
 			WantReadHost:        "emu.com",
 			WantScheme:          "http",
 		},
@@ -1315,9 +1323,6 @@ func TestWithEndpoint(t *testing.T) {
 		if err != nil {
 			t.Fatalf("error creating client: %v", err)
 		}
-		if err != nil {
-			t.Fatalf("error creating client: %v", err)
-		}
 
 		if c.raw.BasePath != tc.WantRawBasePath {
 			t.Errorf("%s: raw.BasePath not set correctly\n\tgot %v, want %v", tc.desc, c.raw.BasePath, tc.WantRawBasePath)