Skip to content

Commit 64b5a75

Browse files
feat: [Many APIs] add several fields to manage state of database encryption update (#5189)
* feat: add several fields to manage state of database encryption update PiperOrigin-RevId: 619289281 Source-Link: googleapis/googleapis@3a7c334 Source-Link: googleapis/googleapis-gen@6a8c733 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdrZW11bHRpY2xvdWQvLk93bEJvdC55YW1sIiwiaCI6IjZhOGM3MzMwNjJkODMzZDExYzUyNDVlZGE1MGY1MTA4ZTBlNTUzMjQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdzdWl0ZWFkZG9ucy8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWlhcC8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWlkcy8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWlvdC8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWttcy1pbnZlbnRvcnkvLk93bEJvdC55YW1sIiwiaCI6IjZhOGM3MzMwNjJkODMzZDExYzUyNDVlZGE1MGY1MTA4ZTBlNTUzMjQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWttcy8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWxhbmd1YWdlLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWxpZmVzY2llbmNlcy8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1hbmFnZWRpZGVudGl0aWVzLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1lZGlhdHJhbnNsYXRpb24vLk93bEJvdC55YW1sIiwiaCI6IjZhOGM3MzMwNjJkODMzZDExYzUyNDVlZGE1MGY1MTA4ZTBlNTUzMjQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1lbWNhY2hlLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1ldGFzdG9yZS8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1pZ3JhdGlvbmNlbnRlci8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW5ldGFwcC8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW5ldHdvcmtjb25uZWN0aXZpdHkvLk93bEJvdC55YW1sIiwiaCI6IjZhOGM3MzMwNjJkODMzZDExYzUyNDVlZGE1MGY1MTA4ZTBlNTUzMjQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW5ldHdvcmttYW5hZ2VtZW50Ly5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW5ldHdvcmtzZWN1cml0eS8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW5ldHdvcmtzZXJ2aWNlcy8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW5vdGVib29rcy8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 1952fbe commit 64b5a75

File tree

141 files changed

+70751
-4623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+70751
-4623
lines changed

packages/google-cloud-gkemulticloud/protos/protos.d.ts

+770-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/google-cloud-gkemulticloud/protos/protos.js

+2,853-159
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/google-cloud-gkemulticloud/protos/protos.json

+349-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/google-cloud-gkemulticloud/src/v1/attached_clusters_client.ts

+11-4
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,15 @@ export class AttachedClustersClient {
124124
'Please set either universe_domain or universeDomain, but not both.'
125125
);
126126
}
127+
const universeDomainEnvVar =
128+
typeof process === 'object' && typeof process.env === 'object'
129+
? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']
130+
: undefined;
127131
this._universeDomain =
128-
opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com';
132+
opts?.universeDomain ??
133+
opts?.universe_domain ??
134+
universeDomainEnvVar ??
135+
'googleapis.com';
129136
this._servicePath = 'gkemulticloud.' + this._universeDomain;
130137
const servicePath =
131138
opts?.servicePath || opts?.apiEndpoint || this._servicePath;
@@ -174,7 +181,7 @@ export class AttachedClustersClient {
174181

175182
// Determine the client header string.
176183
const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`];
177-
if (typeof process !== 'undefined' && 'versions' in process) {
184+
if (typeof process === 'object' && 'versions' in process) {
178185
clientHeader.push(`gl-node/${process.versions.node}`);
179186
} else {
180187
clientHeader.push(`gl-web/${this._gaxModule.version}`);
@@ -428,7 +435,7 @@ export class AttachedClustersClient {
428435
*/
429436
static get servicePath() {
430437
if (
431-
typeof process !== undefined &&
438+
typeof process === 'object' &&
432439
typeof process.emitWarning === 'function'
433440
) {
434441
process.emitWarning(
@@ -446,7 +453,7 @@ export class AttachedClustersClient {
446453
*/
447454
static get apiEndpoint() {
448455
if (
449-
typeof process !== undefined &&
456+
typeof process === 'object' &&
450457
typeof process.emitWarning === 'function'
451458
) {
452459
process.emitWarning(

packages/google-cloud-gkemulticloud/src/v1/aws_clusters_client.ts

+11-4
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,15 @@ export class AwsClustersClient {
123123
'Please set either universe_domain or universeDomain, but not both.'
124124
);
125125
}
126+
const universeDomainEnvVar =
127+
typeof process === 'object' && typeof process.env === 'object'
128+
? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']
129+
: undefined;
126130
this._universeDomain =
127-
opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com';
131+
opts?.universeDomain ??
132+
opts?.universe_domain ??
133+
universeDomainEnvVar ??
134+
'googleapis.com';
128135
this._servicePath = 'gkemulticloud.' + this._universeDomain;
129136
const servicePath =
130137
opts?.servicePath || opts?.apiEndpoint || this._servicePath;
@@ -173,7 +180,7 @@ export class AwsClustersClient {
173180

174181
// Determine the client header string.
175182
const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`];
176-
if (typeof process !== 'undefined' && 'versions' in process) {
183+
if (typeof process === 'object' && 'versions' in process) {
177184
clientHeader.push(`gl-node/${process.versions.node}`);
178185
} else {
179186
clientHeader.push(`gl-web/${this._gaxModule.version}`);
@@ -468,7 +475,7 @@ export class AwsClustersClient {
468475
*/
469476
static get servicePath() {
470477
if (
471-
typeof process !== undefined &&
478+
typeof process === 'object' &&
472479
typeof process.emitWarning === 'function'
473480
) {
474481
process.emitWarning(
@@ -486,7 +493,7 @@ export class AwsClustersClient {
486493
*/
487494
static get apiEndpoint() {
488495
if (
489-
typeof process !== undefined &&
496+
typeof process === 'object' &&
490497
typeof process.emitWarning === 'function'
491498
) {
492499
process.emitWarning(

packages/google-cloud-gkemulticloud/src/v1/azure_clusters_client.ts

+11-4
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,15 @@ export class AzureClustersClient {
123123
'Please set either universe_domain or universeDomain, but not both.'
124124
);
125125
}
126+
const universeDomainEnvVar =
127+
typeof process === 'object' && typeof process.env === 'object'
128+
? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']
129+
: undefined;
126130
this._universeDomain =
127-
opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com';
131+
opts?.universeDomain ??
132+
opts?.universe_domain ??
133+
universeDomainEnvVar ??
134+
'googleapis.com';
128135
this._servicePath = 'gkemulticloud.' + this._universeDomain;
129136
const servicePath =
130137
opts?.servicePath || opts?.apiEndpoint || this._servicePath;
@@ -173,7 +180,7 @@ export class AzureClustersClient {
173180

174181
// Determine the client header string.
175182
const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`];
176-
if (typeof process !== 'undefined' && 'versions' in process) {
183+
if (typeof process === 'object' && 'versions' in process) {
177184
clientHeader.push(`gl-node/${process.versions.node}`);
178185
} else {
179186
clientHeader.push(`gl-web/${this._gaxModule.version}`);
@@ -483,7 +490,7 @@ export class AzureClustersClient {
483490
*/
484491
static get servicePath() {
485492
if (
486-
typeof process !== undefined &&
493+
typeof process === 'object' &&
487494
typeof process.emitWarning === 'function'
488495
) {
489496
process.emitWarning(
@@ -501,7 +508,7 @@ export class AzureClustersClient {
501508
*/
502509
static get apiEndpoint() {
503510
if (
504-
typeof process !== undefined &&
511+
typeof process === 'object' &&
505512
typeof process.emitWarning === 'function'
506513
) {
507514
process.emitWarning(

packages/google-cloud-gkemulticloud/test/gapic_attached_clusters_v1.ts

+48-13
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ describe('v1.AttachedClustersClient', () => {
174174
});
175175

176176
if (
177-
typeof process !== 'undefined' &&
177+
typeof process === 'object' &&
178178
typeof process.emitWarning === 'function'
179179
) {
180180
it('throws DeprecationWarning if static servicePath is used', () => {
@@ -210,6 +210,41 @@ describe('v1.AttachedClustersClient', () => {
210210
const servicePath = client.apiEndpoint;
211211
assert.strictEqual(servicePath, 'gkemulticloud.example.com');
212212
});
213+
214+
if (typeof process === 'object' && 'env' in process) {
215+
describe('GOOGLE_CLOUD_UNIVERSE_DOMAIN environment variable', () => {
216+
it('sets apiEndpoint from environment variable', () => {
217+
const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
218+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com';
219+
const client = new attachedclustersModule.v1.AttachedClustersClient();
220+
const servicePath = client.apiEndpoint;
221+
assert.strictEqual(servicePath, 'gkemulticloud.example.com');
222+
if (saved) {
223+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved;
224+
} else {
225+
delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
226+
}
227+
});
228+
229+
it('value configured in code has priority over environment variable', () => {
230+
const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
231+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com';
232+
const client = new attachedclustersModule.v1.AttachedClustersClient({
233+
universeDomain: 'configured.example.com',
234+
});
235+
const servicePath = client.apiEndpoint;
236+
assert.strictEqual(
237+
servicePath,
238+
'gkemulticloud.configured.example.com'
239+
);
240+
if (saved) {
241+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved;
242+
} else {
243+
delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
244+
}
245+
});
246+
});
247+
}
213248
it('does not allow setting both universeDomain and universe_domain', () => {
214249
assert.throws(() => {
215250
new attachedclustersModule.v1.AttachedClustersClient({
@@ -1823,9 +1858,9 @@ describe('v1.AttachedClustersClient', () => {
18231858
assert(
18241859
(client.descriptors.page.listAttachedClusters.createStream as SinonStub)
18251860
.getCall(0)
1826-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
1827-
expectedHeaderRequestParams
1828-
)
1861+
.args[2].otherArgs.headers[
1862+
'x-goog-request-params'
1863+
].includes(expectedHeaderRequestParams)
18291864
);
18301865
});
18311866

@@ -1873,9 +1908,9 @@ describe('v1.AttachedClustersClient', () => {
18731908
assert(
18741909
(client.descriptors.page.listAttachedClusters.createStream as SinonStub)
18751910
.getCall(0)
1876-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
1877-
expectedHeaderRequestParams
1878-
)
1911+
.args[2].otherArgs.headers[
1912+
'x-goog-request-params'
1913+
].includes(expectedHeaderRequestParams)
18791914
);
18801915
});
18811916

@@ -1923,9 +1958,9 @@ describe('v1.AttachedClustersClient', () => {
19231958
assert(
19241959
(client.descriptors.page.listAttachedClusters.asyncIterate as SinonStub)
19251960
.getCall(0)
1926-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
1927-
expectedHeaderRequestParams
1928-
)
1961+
.args[2].otherArgs.headers[
1962+
'x-goog-request-params'
1963+
].includes(expectedHeaderRequestParams)
19291964
);
19301965
});
19311966

@@ -1964,9 +1999,9 @@ describe('v1.AttachedClustersClient', () => {
19641999
assert(
19652000
(client.descriptors.page.listAttachedClusters.asyncIterate as SinonStub)
19662001
.getCall(0)
1967-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
1968-
expectedHeaderRequestParams
1969-
)
2002+
.args[2].otherArgs.headers[
2003+
'x-goog-request-params'
2004+
].includes(expectedHeaderRequestParams)
19702005
);
19712006
});
19722007
});

packages/google-cloud-gkemulticloud/test/gapic_aws_clusters_v1.ts

+60-25
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ describe('v1.AwsClustersClient', () => {
174174
});
175175

176176
if (
177-
typeof process !== 'undefined' &&
177+
typeof process === 'object' &&
178178
typeof process.emitWarning === 'function'
179179
) {
180180
it('throws DeprecationWarning if static servicePath is used', () => {
@@ -208,6 +208,41 @@ describe('v1.AwsClustersClient', () => {
208208
const servicePath = client.apiEndpoint;
209209
assert.strictEqual(servicePath, 'gkemulticloud.example.com');
210210
});
211+
212+
if (typeof process === 'object' && 'env' in process) {
213+
describe('GOOGLE_CLOUD_UNIVERSE_DOMAIN environment variable', () => {
214+
it('sets apiEndpoint from environment variable', () => {
215+
const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
216+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com';
217+
const client = new awsclustersModule.v1.AwsClustersClient();
218+
const servicePath = client.apiEndpoint;
219+
assert.strictEqual(servicePath, 'gkemulticloud.example.com');
220+
if (saved) {
221+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved;
222+
} else {
223+
delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
224+
}
225+
});
226+
227+
it('value configured in code has priority over environment variable', () => {
228+
const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
229+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com';
230+
const client = new awsclustersModule.v1.AwsClustersClient({
231+
universeDomain: 'configured.example.com',
232+
});
233+
const servicePath = client.apiEndpoint;
234+
assert.strictEqual(
235+
servicePath,
236+
'gkemulticloud.configured.example.com'
237+
);
238+
if (saved) {
239+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved;
240+
} else {
241+
delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
242+
}
243+
});
244+
});
245+
}
211246
it('does not allow setting both universeDomain and universe_domain', () => {
212247
assert.throws(() => {
213248
new awsclustersModule.v1.AwsClustersClient({
@@ -2779,9 +2814,9 @@ describe('v1.AwsClustersClient', () => {
27792814
assert(
27802815
(client.descriptors.page.listAwsClusters.createStream as SinonStub)
27812816
.getCall(0)
2782-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2783-
expectedHeaderRequestParams
2784-
)
2817+
.args[2].otherArgs.headers[
2818+
'x-goog-request-params'
2819+
].includes(expectedHeaderRequestParams)
27852820
);
27862821
});
27872822

@@ -2828,9 +2863,9 @@ describe('v1.AwsClustersClient', () => {
28282863
assert(
28292864
(client.descriptors.page.listAwsClusters.createStream as SinonStub)
28302865
.getCall(0)
2831-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2832-
expectedHeaderRequestParams
2833-
)
2866+
.args[2].otherArgs.headers[
2867+
'x-goog-request-params'
2868+
].includes(expectedHeaderRequestParams)
28342869
);
28352870
});
28362871

@@ -2877,9 +2912,9 @@ describe('v1.AwsClustersClient', () => {
28772912
assert(
28782913
(client.descriptors.page.listAwsClusters.asyncIterate as SinonStub)
28792914
.getCall(0)
2880-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2881-
expectedHeaderRequestParams
2882-
)
2915+
.args[2].otherArgs.headers[
2916+
'x-goog-request-params'
2917+
].includes(expectedHeaderRequestParams)
28832918
);
28842919
});
28852920

@@ -2918,9 +2953,9 @@ describe('v1.AwsClustersClient', () => {
29182953
assert(
29192954
(client.descriptors.page.listAwsClusters.asyncIterate as SinonStub)
29202955
.getCall(0)
2921-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2922-
expectedHeaderRequestParams
2923-
)
2956+
.args[2].otherArgs.headers[
2957+
'x-goog-request-params'
2958+
].includes(expectedHeaderRequestParams)
29242959
);
29252960
});
29262961
});
@@ -3106,9 +3141,9 @@ describe('v1.AwsClustersClient', () => {
31063141
assert(
31073142
(client.descriptors.page.listAwsNodePools.createStream as SinonStub)
31083143
.getCall(0)
3109-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
3110-
expectedHeaderRequestParams
3111-
)
3144+
.args[2].otherArgs.headers[
3145+
'x-goog-request-params'
3146+
].includes(expectedHeaderRequestParams)
31123147
);
31133148
});
31143149

@@ -3156,9 +3191,9 @@ describe('v1.AwsClustersClient', () => {
31563191
assert(
31573192
(client.descriptors.page.listAwsNodePools.createStream as SinonStub)
31583193
.getCall(0)
3159-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
3160-
expectedHeaderRequestParams
3161-
)
3194+
.args[2].otherArgs.headers[
3195+
'x-goog-request-params'
3196+
].includes(expectedHeaderRequestParams)
31623197
);
31633198
});
31643199

@@ -3205,9 +3240,9 @@ describe('v1.AwsClustersClient', () => {
32053240
assert(
32063241
(client.descriptors.page.listAwsNodePools.asyncIterate as SinonStub)
32073242
.getCall(0)
3208-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
3209-
expectedHeaderRequestParams
3210-
)
3243+
.args[2].otherArgs.headers[
3244+
'x-goog-request-params'
3245+
].includes(expectedHeaderRequestParams)
32113246
);
32123247
});
32133248

@@ -3246,9 +3281,9 @@ describe('v1.AwsClustersClient', () => {
32463281
assert(
32473282
(client.descriptors.page.listAwsNodePools.asyncIterate as SinonStub)
32483283
.getCall(0)
3249-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
3250-
expectedHeaderRequestParams
3251-
)
3284+
.args[2].otherArgs.headers[
3285+
'x-goog-request-params'
3286+
].includes(expectedHeaderRequestParams)
32523287
);
32533288
});
32543289
});

0 commit comments

Comments
 (0)