fix: Do not set customEndpoint if apiEndpoint === default (#2460)

googleapis · May 8, 2024 · b4dbd73 · b4dbd73
1 parent 74461e4
commit b4dbd73
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/storage.ts b/src/storage.ts
@@ -715,7 +715,7 @@ export class Storage extends Service {
       customEndpoint = true;
     }
 
-    if (options.apiEndpoint) {
+    if (options.apiEndpoint && options.apiEndpoint !== apiEndpoint) {
       apiEndpoint = Storage.sanitizeEndpoint(options.apiEndpoint);
       customEndpoint = true;
     }

diff --git a/test/index.ts b/test/index.ts
@@ -174,6 +174,30 @@ describe('Storage', () => {
       assert.strictEqual(calledWith.apiEndpoint, `${apiEndpoint}`);
     });
 
+    it('should not set `customEndpoint` if `apiEndpoint` matches default', () => {
+      const apiEndpoint = 'https://storage.googleapis.com';
+      const storage = new Storage({
+        apiEndpoint,
+      });
+
+      const calledWith = storage.calledWith_[0];
+      assert.strictEqual(calledWith.apiEndpoint, apiEndpoint);
+      assert.strictEqual(calledWith.customEndpoint, false);
+    });
+
+    it('should not set `customEndpoint` if `apiEndpoint` matches default (w/ universe domain)', () => {
+      const universeDomain = 'my.universe';
+      const apiEndpoint = `https://storage.${universeDomain}`;
+      const storage = new Storage({
+        apiEndpoint,
+        universeDomain,
+      });
+
+      const calledWith = storage.calledWith_[0];
+      assert.strictEqual(calledWith.apiEndpoint, apiEndpoint);
+      assert.strictEqual(calledWith.customEndpoint, false);
+    });
+
     it('should propagate the useAuthWithCustomEndpoint option', () => {
       const useAuthWithCustomEndpoint = true;
       const apiEndpoint = 'https://some.fake.endpoint';