Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: correct STORAGE_EMULATOR_HOST handling (#2069, #1314) #2070

Merged
merged 3 commits into from Oct 18, 2022
Merged

fix: correct STORAGE_EMULATOR_HOST handling (#2069, #1314) #2070

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ffa612
fix: correct STORAGE_EMULATOR_HOST handling (#2069, #1314)
mgabeler-lee-6rs Sep 20, 2022
dcd583c
fix: normalize baseUrl
mgabeler-lee-6rs Oct 5, 2022
04940e0
fix: adjust URL normalization & tests for consistency
mgabeler-lee-6rs Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/storage.ts
View file
Open in desktop
Expand Up @@ -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';
danielbankhead marked this conversation as resolved.
Show resolved Hide resolved

const config = {
apiEndpoint: options.apiEndpoint!,
Expand Down
8 changes: 4 additions & 4 deletions test/index.ts
View file
Open in desktop
Expand Up @@ -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'
Expand All @@ -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');
});

Expand All @@ -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'
Expand Down