diff --git a/src/v1/datastore_client.ts b/src/v1/datastore_client.ts index aadcbd82f..cd527b26a 100644 --- a/src/v1/datastore_client.ts +++ b/src/v1/datastore_client.ts @@ -357,6 +357,13 @@ export class DatastoreClient { options = optionsOrCallback as gax.CallOptions; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project_id: request.projectId || '', + }); this.initialize(); return this.innerApiCalls.lookup(request, options, callback); } @@ -441,6 +448,13 @@ export class DatastoreClient { options = optionsOrCallback as gax.CallOptions; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project_id: request.projectId || '', + }); this.initialize(); return this.innerApiCalls.runQuery(request, options, callback); } @@ -518,6 +532,13 @@ export class DatastoreClient { options = optionsOrCallback as gax.CallOptions; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project_id: request.projectId || '', + }); this.initialize(); return this.innerApiCalls.beginTransaction(request, options, callback); } @@ -612,6 +633,13 @@ export class DatastoreClient { options = optionsOrCallback as gax.CallOptions; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project_id: request.projectId || '', + }); this.initialize(); return this.innerApiCalls.commit(request, options, callback); } @@ -688,6 +716,13 @@ export class DatastoreClient { options = optionsOrCallback as gax.CallOptions; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project_id: request.projectId || '', + }); this.initialize(); return this.innerApiCalls.rollback(request, options, callback); } @@ -765,6 +800,13 @@ export class DatastoreClient { options = optionsOrCallback as gax.CallOptions; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project_id: request.projectId || '', + }); this.initialize(); return this.innerApiCalls.allocateIds(request, options, callback); } @@ -844,6 +886,13 @@ export class DatastoreClient { options = optionsOrCallback as gax.CallOptions; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project_id: request.projectId || '', + }); this.initialize(); return this.innerApiCalls.reserveIds(request, options, callback); } diff --git a/synth.metadata b/synth.metadata index b42fc1906..32722ed4f 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-datastore.git", - "sha": "2a7e034e60f54100c5773d2d4dbe4dec6a721689" + "sha": "68790d26d69f48d780930f90be6758f7431f61c9" } }, { diff --git a/test/gapic_datastore_v1.ts b/test/gapic_datastore_v1.ts index de651a658..d65de4a3d 100644 --- a/test/gapic_datastore_v1.ts +++ b/test/gapic_datastore_v1.ts @@ -141,7 +141,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.LookupRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.LookupResponse() ); @@ -164,7 +172,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.LookupRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.LookupResponse() ); @@ -204,7 +220,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.LookupRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedError = new Error('expected'); client.innerApiCalls.lookup = stubSimpleCall(undefined, expectedError); await assert.rejects(async () => { @@ -228,7 +252,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.RunQueryRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.RunQueryResponse() ); @@ -251,7 +283,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.RunQueryRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.RunQueryResponse() ); @@ -291,7 +331,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.RunQueryRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedError = new Error('expected'); client.innerApiCalls.runQuery = stubSimpleCall(undefined, expectedError); await assert.rejects(async () => { @@ -315,7 +363,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.BeginTransactionRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.BeginTransactionResponse() ); @@ -338,7 +394,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.BeginTransactionRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.BeginTransactionResponse() ); @@ -378,7 +442,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.BeginTransactionRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedError = new Error('expected'); client.innerApiCalls.beginTransaction = stubSimpleCall( undefined, @@ -405,7 +477,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.CommitRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.CommitResponse() ); @@ -428,7 +508,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.CommitRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.CommitResponse() ); @@ -468,7 +556,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.CommitRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedError = new Error('expected'); client.innerApiCalls.commit = stubSimpleCall(undefined, expectedError); await assert.rejects(async () => { @@ -492,7 +588,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.RollbackRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.RollbackResponse() ); @@ -515,7 +619,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.RollbackRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.RollbackResponse() ); @@ -555,7 +667,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.RollbackRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedError = new Error('expected'); client.innerApiCalls.rollback = stubSimpleCall(undefined, expectedError); await assert.rejects(async () => { @@ -579,7 +699,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.AllocateIdsRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.AllocateIdsResponse() ); @@ -602,7 +730,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.AllocateIdsRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.AllocateIdsResponse() ); @@ -642,7 +778,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.AllocateIdsRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedError = new Error('expected'); client.innerApiCalls.allocateIds = stubSimpleCall( undefined, @@ -669,7 +813,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.ReserveIdsRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.ReserveIdsResponse() ); @@ -692,7 +844,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.ReserveIdsRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedResponse = generateSampleMessage( new protos.google.datastore.v1.ReserveIdsResponse() ); @@ -732,7 +892,15 @@ describe('v1.DatastoreClient', () => { const request = generateSampleMessage( new protos.google.datastore.v1.ReserveIdsRequest() ); - const expectedOptions = {}; + request.projectId = ''; + const expectedHeaderRequestParams = 'project_id='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; const expectedError = new Error('expected'); client.innerApiCalls.reserveIds = stubSimpleCall( undefined,