fix: correct STORAGE_EMULATOR_HOST handling (googleapis#2069, googlea…

…pis#1314) credit to @jpambrun for identifying the fix
mgabeler-lee-6rs · Sep 20, 2022 · 5ffa612 · 5ffa612
1 parent 14c4600
commit 5ffa612
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/storage.ts b/src/storage.ts
@@ -666,7 +666,7 @@ export class Storage extends Service {
     options = Object.assign({}, options, {apiEndpoint});
 
     // Note: EMULATOR_HOST is an experimental configuration variable. Use apiEndpoint instead.
-    const baseUrl = EMULATOR_HOST || `${options.apiEndpoint}/storage/v1`;
+    const baseUrl = (EMULATOR_HOST || options.apiEndpoint) + '/storage/v1';
 
     const config = {
       apiEndpoint: options.apiEndpoint!,

diff --git a/test/index.ts b/test/index.ts
@@ -437,13 +437,13 @@ describe('Storage', () => {
         delete process.env.STORAGE_EMULATOR_HOST;
       });
 
-      it('should set baseUrl to env var STORAGE_EMULATOR_HOST', () => {
+      it('should set baseUrl to env var STORAGE_EMULATOR_HOST plus standard path', () => {
         const storage = new Storage({
           projectId: PROJECT_ID,
         });
 
         const calledWith = storage.calledWith_[0];
-        assert.strictEqual(calledWith.baseUrl, EMULATOR_HOST);
+        assert.strictEqual(calledWith.baseUrl, EMULATOR_HOST + '/storage/v1');
         assert.strictEqual(
           calledWith.apiEndpoint,
           'https://internal.benchmark.com/path'
@@ -457,7 +457,7 @@ describe('Storage', () => {
         });
 
         const calledWith = storage.calledWith_[0];
-        assert.strictEqual(calledWith.baseUrl, EMULATOR_HOST);
+        assert.strictEqual(calledWith.baseUrl, EMULATOR_HOST + '/storage/v1');
         assert.strictEqual(calledWith.apiEndpoint, 'https://some.api.com');
       });
 
@@ -470,7 +470,7 @@ describe('Storage', () => {
         });
 
         const calledWith = storage.calledWith_[0];
-        assert.strictEqual(calledWith.baseUrl, EMULATOR_HOST);
+        assert.strictEqual(calledWith.baseUrl, EMULATOR_HOST + '/storage/v1');
         assert.strictEqual(
           calledWith.apiEndpoint,
           'https://internal.benchmark.com/path'