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.

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

fix: dynamic route fix #1130

Merged
merged 9 commits into from
Apr 27, 2022
6 changes: 6 additions & 0 deletions baselines/compute/src/v1/addresses_client.ts.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,8 @@ export class AddressesClient {
'x-goog-request-params'
] = gax.routingHeader.fromParams({
'project': request.project || '',
'region': request.region || '',
'address': request.address || '',
});
this.initialize();
return this.innerApiCalls.delete(request, options, callback)
Expand Down Expand Up @@ -468,6 +470,7 @@ export class AddressesClient {
'x-goog-request-params'
] = gax.routingHeader.fromParams({
'project': request.project || '',
'region': request.region || '',
});
this.initialize();
return this.innerApiCalls.insert(request, options, callback)
Expand Down Expand Up @@ -636,6 +639,7 @@ export class AddressesClient {
'x-goog-request-params'
] = gax.routingHeader.fromParams({
'project': request.project || '',
'region': request.region || '',
});
this.initialize();
return this.innerApiCalls.list(request, options, callback);
Expand Down Expand Up @@ -691,6 +695,7 @@ export class AddressesClient {
'x-goog-request-params'
] = gax.routingHeader.fromParams({
'project': request.project || '',
'region': request.region || '',
});
const defaultCallSettings = this._defaults['list'];
const callSettings = defaultCallSettings.merge(options);
Expand Down Expand Up @@ -755,6 +760,7 @@ export class AddressesClient {
'x-goog-request-params'
] = gax.routingHeader.fromParams({
'project': request.project || '',
'region': request.region || '',
});
const defaultCallSettings = this._defaults['list'];
const callSettings = defaultCallSettings.merge(options);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,8 @@ export class RegionOperationsClient {
'x-goog-request-params'
] = gax.routingHeader.fromParams({
'project': request.project || '',
'region': request.region || '',
'operation': request.operation || '',
});
this.initialize();
return this.innerApiCalls.get(request, options, callback);
Expand Down Expand Up @@ -428,6 +430,8 @@ export class RegionOperationsClient {
'x-goog-request-params'
] = gax.routingHeader.fromParams({
'project': request.project || '',
'region': request.region || '',
'operation': request.operation || '',
});
this.initialize();
return this.innerApiCalls.wait(request, options, callback);
Expand Down
45 changes: 32 additions & 13 deletions baselines/compute/test/gapic_addresses_v1.ts.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,9 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.DeleteAddressRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
request.address = '';
const expectedHeaderRequestParams = "project=&region=&address=";
const expectedOptions = {
otherArgs: {
headers: {
Expand All @@ -224,7 +226,9 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.DeleteAddressRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
request.address = '';
const expectedHeaderRequestParams = "project=&region=&address=";
const expectedOptions = {
otherArgs: {
headers: {
Expand Down Expand Up @@ -259,7 +263,9 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.DeleteAddressRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
request.address = '';
const expectedHeaderRequestParams = "project=&region=&address=";
const expectedOptions = {
otherArgs: {
headers: {
Expand All @@ -282,6 +288,8 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.DeleteAddressRequest());
request.project = '';
request.region = '';
request.address = '';
const expectedError = new Error('The client has already been closed.');
client.close();
await assert.rejects(client.delete(request), expectedError);
Expand All @@ -297,7 +305,8 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.InsertAddressRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
const expectedHeaderRequestParams = "project=&region=";
const expectedOptions = {
otherArgs: {
headers: {
Expand All @@ -321,7 +330,8 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.InsertAddressRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
const expectedHeaderRequestParams = "project=&region=";
const expectedOptions = {
otherArgs: {
headers: {
Expand Down Expand Up @@ -356,7 +366,8 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.InsertAddressRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
const expectedHeaderRequestParams = "project=&region=";
const expectedOptions = {
otherArgs: {
headers: {
Expand All @@ -379,6 +390,7 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.InsertAddressRequest());
request.project = '';
request.region = '';
const expectedError = new Error('The client has already been closed.');
client.close();
await assert.rejects(client.insert(request), expectedError);
Expand Down Expand Up @@ -455,7 +467,8 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.ListAddressesRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
const expectedHeaderRequestParams = "project=&region=";
const expectedOptions = {
otherArgs: {
headers: {
Expand Down Expand Up @@ -483,7 +496,8 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.ListAddressesRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
const expectedHeaderRequestParams = "project=&region=";
const expectedOptions = {
otherArgs: {
headers: {
Expand Down Expand Up @@ -522,7 +536,8 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.ListAddressesRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
const expectedHeaderRequestParams = "project=&region=";
const expectedOptions = {
otherArgs: {
headers: {
Expand All @@ -545,7 +560,8 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.ListAddressesRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
const expectedHeaderRequestParams = "project=&region=";
const expectedResponse = [
generateSampleMessage(new protos.google.cloud.compute.v1.Address()),
generateSampleMessage(new protos.google.cloud.compute.v1.Address()),
Expand Down Expand Up @@ -584,7 +600,8 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.ListAddressesRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
const expectedHeaderRequestParams = "project=&region=";
const expectedError = new Error('expected');
client.descriptors.page.list.createStream = stubPageStreamingCall(undefined, expectedError);
const stream = client.listStream(request);
Expand Down Expand Up @@ -618,7 +635,8 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.ListAddressesRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
const expectedHeaderRequestParams = "project=&region=";
const expectedResponse = [
generateSampleMessage(new protos.google.cloud.compute.v1.Address()),
generateSampleMessage(new protos.google.cloud.compute.v1.Address()),
Expand Down Expand Up @@ -649,7 +667,8 @@ describe('v1.AddressesClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.ListAddressesRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";const expectedError = new Error('expected');
request.region = '';
const expectedHeaderRequestParams = "project=&region=";const expectedError = new Error('expected');
client.descriptors.page.list.asyncIterate = stubAsyncIterationCall(undefined, expectedError);
const iterable = client.listAsync(request);
await assert.rejects(async () => {
Expand Down
28 changes: 22 additions & 6 deletions baselines/compute/test/gapic_region_operations_v1.ts.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ describe('v1.RegionOperationsClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.GetRegionOperationRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
request.operation = '';
const expectedHeaderRequestParams = "project=&region=&operation=";
const expectedOptions = {
otherArgs: {
headers: {
Expand All @@ -177,7 +179,9 @@ describe('v1.RegionOperationsClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.GetRegionOperationRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
request.operation = '';
const expectedHeaderRequestParams = "project=&region=&operation=";
const expectedOptions = {
otherArgs: {
headers: {
Expand Down Expand Up @@ -212,7 +216,9 @@ describe('v1.RegionOperationsClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.GetRegionOperationRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
request.operation = '';
const expectedHeaderRequestParams = "project=&region=&operation=";
const expectedOptions = {
otherArgs: {
headers: {
Expand All @@ -235,6 +241,8 @@ describe('v1.RegionOperationsClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.GetRegionOperationRequest());
request.project = '';
request.region = '';
request.operation = '';
const expectedError = new Error('The client has already been closed.');
client.close();
await assert.rejects(client.get(request), expectedError);
Expand All @@ -250,7 +258,9 @@ describe('v1.RegionOperationsClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.WaitRegionOperationRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
request.operation = '';
const expectedHeaderRequestParams = "project=&region=&operation=";
const expectedOptions = {
otherArgs: {
headers: {
Expand All @@ -274,7 +284,9 @@ describe('v1.RegionOperationsClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.WaitRegionOperationRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
request.operation = '';
const expectedHeaderRequestParams = "project=&region=&operation=";
const expectedOptions = {
otherArgs: {
headers: {
Expand Down Expand Up @@ -309,7 +321,9 @@ describe('v1.RegionOperationsClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.WaitRegionOperationRequest());
request.project = '';
const expectedHeaderRequestParams = "project=";
request.region = '';
request.operation = '';
const expectedHeaderRequestParams = "project=&region=&operation=";
const expectedOptions = {
otherArgs: {
headers: {
Expand All @@ -332,6 +346,8 @@ describe('v1.RegionOperationsClient', () => {
client.initialize();
const request = generateSampleMessage(new protos.google.cloud.compute.v1.WaitRegionOperationRequest());
request.project = '';
request.region = '';
request.operation = '';
const expectedError = new Error('The client has already been closed.');
client.close();
await assert.rejects(client.wait(request), expectedError);
Expand Down
Loading