Skip to content

Commit b569fbe

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: [Many APIs] add several fields to manage state of database encryption update (#5190)
* 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: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW9wdGltaXphdGlvbi8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW9yY2hlc3RyYXRpb24tYWlyZmxvdy1zZXJ2aWNlLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW9yZ3BvbGljeS8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW9zY29uZmlnLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW9zbG9naW4vLk93bEJvdC55YW1sIiwiaCI6IjZhOGM3MzMwNjJkODMzZDExYzUyNDVlZGE1MGY1MTA4ZTBlNTUzMjQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXBhcmFsbGVsc3RvcmUvLk93bEJvdC55YW1sIiwiaCI6IjZhOGM3MzMwNjJkODMzZDExYzUyNDVlZGE1MGY1MTA4ZTBlNTUzMjQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXBoaXNoaW5ncHJvdGVjdGlvbi8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXBvbGljeXNpbXVsYXRvci8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXBvbGljeXRyb3VibGVzaG9vdGVyLWlhbS8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXBvbGljeXRyb3VibGVzaG9vdGVyLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXByaXZhdGVjYXRhbG9nLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJhcGlkbWlncmF0aW9uYXNzZXNzbWVudC8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlY2FwdGNoYWVudGVycHJpc2UvLk93bEJvdC55YW1sIiwiaCI6IjZhOGM3MzMwNjJkODMzZDExYzUyNDVlZGE1MGY1MTA4ZTBlNTUzMjQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlY29tbWVuZGVyLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlZGlzLWNsdXN0ZXIvLk93bEJvdC55YW1sIiwiaCI6IjZhOGM3MzMwNjJkODMzZDExYzUyNDVlZGE1MGY1MTA4ZTBlNTUzMjQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlZGlzLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlc291cmNlbWFuYWdlci8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlc291cmNlc2V0dGluZ3MvLk93bEJvdC55YW1sIiwiaCI6IjZhOGM3MzMwNjJkODMzZDExYzUyNDVlZGE1MGY1MTA4ZTBlNTUzMjQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJldGFpbC8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJ1bi8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 * 🦉 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 aec5351 commit b569fbe

195 files changed

Lines changed: 71525 additions & 4345 deletions

File tree

Some content is hidden

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

‎packages/google-cloud-optimization/protos/protos.d.ts‎

Lines changed: 770 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/google-cloud-optimization/protos/protos.js‎

Lines changed: 2860 additions & 166 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/google-cloud-optimization/protos/protos.json‎

Lines changed: 349 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/google-cloud-optimization/src/v1/fleet_routing_client.ts‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,15 @@ export class FleetRoutingClient {
135135
'Please set either universe_domain or universeDomain, but not both.'
136136
);
137137
}
138+
const universeDomainEnvVar =
139+
typeof process === 'object' && typeof process.env === 'object'
140+
? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']
141+
: undefined;
138142
this._universeDomain =
139-
opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com';
143+
opts?.universeDomain ??
144+
opts?.universe_domain ??
145+
universeDomainEnvVar ??
146+
'googleapis.com';
140147
this._servicePath = 'cloudoptimization.' + this._universeDomain;
141148
const servicePath =
142149
opts?.servicePath || opts?.apiEndpoint || this._servicePath;
@@ -188,7 +195,7 @@ export class FleetRoutingClient {
188195

189196
// Determine the client header string.
190197
const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`];
191-
if (typeof process !== 'undefined' && 'versions' in process) {
198+
if (typeof process === 'object' && 'versions' in process) {
192199
clientHeader.push(`gl-node/${process.versions.node}`);
193200
} else {
194201
clientHeader.push(`gl-web/${this._gaxModule.version}`);
@@ -328,7 +335,7 @@ export class FleetRoutingClient {
328335
*/
329336
static get servicePath() {
330337
if (
331-
typeof process !== undefined &&
338+
typeof process === 'object' &&
332339
typeof process.emitWarning === 'function'
333340
) {
334341
process.emitWarning(
@@ -346,7 +353,7 @@ export class FleetRoutingClient {
346353
*/
347354
static get apiEndpoint() {
348355
if (
349-
typeof process !== undefined &&
356+
typeof process === 'object' &&
350357
typeof process.emitWarning === 'function'
351358
) {
352359
process.emitWarning(

‎packages/google-cloud-optimization/test/gapic_fleet_routing_v1.ts‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ describe('v1.FleetRoutingClient', () => {
134134
});
135135

136136
if (
137-
typeof process !== 'undefined' &&
137+
typeof process === 'object' &&
138138
typeof process.emitWarning === 'function'
139139
) {
140140
it('throws DeprecationWarning if static servicePath is used', () => {
@@ -170,6 +170,41 @@ describe('v1.FleetRoutingClient', () => {
170170
const servicePath = client.apiEndpoint;
171171
assert.strictEqual(servicePath, 'cloudoptimization.example.com');
172172
});
173+
174+
if (typeof process === 'object' && 'env' in process) {
175+
describe('GOOGLE_CLOUD_UNIVERSE_DOMAIN environment variable', () => {
176+
it('sets apiEndpoint from environment variable', () => {
177+
const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
178+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com';
179+
const client = new fleetroutingModule.v1.FleetRoutingClient();
180+
const servicePath = client.apiEndpoint;
181+
assert.strictEqual(servicePath, 'cloudoptimization.example.com');
182+
if (saved) {
183+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved;
184+
} else {
185+
delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
186+
}
187+
});
188+
189+
it('value configured in code has priority over environment variable', () => {
190+
const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
191+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com';
192+
const client = new fleetroutingModule.v1.FleetRoutingClient({
193+
universeDomain: 'configured.example.com',
194+
});
195+
const servicePath = client.apiEndpoint;
196+
assert.strictEqual(
197+
servicePath,
198+
'cloudoptimization.configured.example.com'
199+
);
200+
if (saved) {
201+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved;
202+
} else {
203+
delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
204+
}
205+
});
206+
});
207+
}
173208
it('does not allow setting both universeDomain and universe_domain', () => {
174209
assert.throws(() => {
175210
new fleetroutingModule.v1.FleetRoutingClient({

0 commit comments

Comments
 (0)