Skip to content

Commit 333b409

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: [Many APIs] add several fields to manage state of database encryption update (#5193)
* 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: eyJwIjoicGFja2FnZXMvZ29vZ2xlLW1hcHMtcGxhY2VzLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLW1hcHMtcm91dGluZy8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLW1vbml0b3JpbmctZGFzaGJvYXJkLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXByaXZhY3ktZGxwLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXNob3BwaW5nLWNzcy8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXNob3BwaW5nLW1lcmNoYW50LWludmVudG9yaWVzLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXNob3BwaW5nLW1lcmNoYW50LXF1b3RhLy5Pd2xCb3QueWFtbCIsImgiOiI2YThjNzMzMDYyZDgzM2QxMWM1MjQ1ZWRhNTBmNTEwOGUwZTU1MzI0In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXNob3BwaW5nLW1lcmNoYW50LXJlcG9ydHMvLk93bEJvdC55YW1sIiwiaCI6IjZhOGM3MzMwNjJkODMzZDExYzUyNDVlZGE1MGY1MTA4ZTBlNTUzMjQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXN0b3JhZ2V0cmFuc2Zlci8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ3JhZmVhcy8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 * 🦉 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 a944d07 commit 333b409

42 files changed

Lines changed: 25044 additions & 1881 deletions

Some content is hidden

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

‎packages/google-maps-places/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-maps-places/protos/protos.js‎

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

‎packages/google-maps-places/protos/protos.json‎

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

‎packages/google-maps-places/src/v1/places_client.ts‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,15 @@ export class PlacesClient {
122122
'Please set either universe_domain or universeDomain, but not both.'
123123
);
124124
}
125+
const universeDomainEnvVar =
126+
typeof process === 'object' && typeof process.env === 'object'
127+
? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']
128+
: undefined;
125129
this._universeDomain =
126-
opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com';
130+
opts?.universeDomain ??
131+
opts?.universe_domain ??
132+
universeDomainEnvVar ??
133+
'googleapis.com';
127134
this._servicePath = 'places.' + this._universeDomain;
128135
const servicePath =
129136
opts?.servicePath || opts?.apiEndpoint || this._servicePath;
@@ -175,7 +182,7 @@ export class PlacesClient {
175182

176183
// Determine the client header string.
177184
const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`];
178-
if (typeof process !== 'undefined' && 'versions' in process) {
185+
if (typeof process === 'object' && 'versions' in process) {
179186
clientHeader.push(`gl-node/${process.versions.node}`);
180187
} else {
181188
clientHeader.push(`gl-web/${this._gaxModule.version}`);
@@ -299,7 +306,7 @@ export class PlacesClient {
299306
*/
300307
static get servicePath() {
301308
if (
302-
typeof process !== undefined &&
309+
typeof process === 'object' &&
303310
typeof process.emitWarning === 'function'
304311
) {
305312
process.emitWarning(
@@ -317,7 +324,7 @@ export class PlacesClient {
317324
*/
318325
static get apiEndpoint() {
319326
if (
320-
typeof process !== undefined &&
327+
typeof process === 'object' &&
321328
typeof process.emitWarning === 'function'
322329
) {
323330
process.emitWarning(

‎packages/google-maps-places/test/gapic_places_v1.ts‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ describe('v1.PlacesClient', () => {
7979
});
8080

8181
if (
82-
typeof process !== 'undefined' &&
82+
typeof process === 'object' &&
8383
typeof process.emitWarning === 'function'
8484
) {
8585
it('throws DeprecationWarning if static servicePath is used', () => {
@@ -113,6 +113,38 @@ describe('v1.PlacesClient', () => {
113113
const servicePath = client.apiEndpoint;
114114
assert.strictEqual(servicePath, 'places.example.com');
115115
});
116+
117+
if (typeof process === 'object' && 'env' in process) {
118+
describe('GOOGLE_CLOUD_UNIVERSE_DOMAIN environment variable', () => {
119+
it('sets apiEndpoint from environment variable', () => {
120+
const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
121+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com';
122+
const client = new placesModule.v1.PlacesClient();
123+
const servicePath = client.apiEndpoint;
124+
assert.strictEqual(servicePath, 'places.example.com');
125+
if (saved) {
126+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved;
127+
} else {
128+
delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
129+
}
130+
});
131+
132+
it('value configured in code has priority over environment variable', () => {
133+
const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
134+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com';
135+
const client = new placesModule.v1.PlacesClient({
136+
universeDomain: 'configured.example.com',
137+
});
138+
const servicePath = client.apiEndpoint;
139+
assert.strictEqual(servicePath, 'places.configured.example.com');
140+
if (saved) {
141+
process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved;
142+
} else {
143+
delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'];
144+
}
145+
});
146+
});
147+
}
116148
it('does not allow setting both universeDomain and universe_domain', () => {
117149
assert.throws(() => {
118150
new placesModule.v1.PlacesClient({

0 commit comments

Comments
 (0)