Skip to content

fix: bug preventing apiPath generation when apiId includes letter v #7279

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

Draft
pearigee wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: bug preventing apiPath generation when apiId includes letter v #7279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/gapic-node-processing/src/get-bootstrap-template-vars.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export function getServiceName(serviceConfig: ServiceConfig) {
}

export function getApiPath(apiId: string) {
return apiId.replace(/\.v.*/, '').replace(/\./g, '/');
return apiId.replace(/\.v[0-9].*/, '').replace(/\./g, '/');
}

export function getApiPathWithDashes(apiId: string) {
Expand Down
38 changes: 28 additions & 10 deletions packages/gapic-node-processing/test/get-bootstrap-template-vars.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,36 @@ const octokit = new Octokit({

describe('get bootstrap template vars', () => {
describe('tests for metadata information', () => {
it('should return the API path without the version, with slashes', async () => {
assert.deepStrictEqual(
getApiPath('cloud.google.kms.v1'),
'cloud/google/kms',
);
describe('getApiPath', () => {
it('should return without the version, with slashes', async () => {
assert.deepStrictEqual(
getApiPath('cloud.google.kms.v1'),
'cloud/google/kms',
);
});

it('should preserve package names that start with v', async () => {
assert.deepStrictEqual(
getApiPath('cloud.google.visionai.v1'),
'cloud/google/visionai',
);
});
});

it('should return the API path without the version, with dashes', async () => {
assert.deepStrictEqual(
getApiPathWithDashes('cloud.google.kms.v1'),
'cloud-google-kms',
);
describe('getApiPathWithDashes', () => {
it('should return without the version, with dashes', async () => {
assert.deepStrictEqual(
getApiPathWithDashes('cloud.google.kms.v1'),
'cloud-google-kms',
);
});

it('should preserve names that start with v', async () => {
assert.deepStrictEqual(
getApiPathWithDashes('cloud.google.visionai.v1'),
'cloud-google-visionai',
);
});
});

it('should get just the version', async () => {
Expand Down
Loading