Skip to content

Commit cc54e98

Browse files
feat: [Many APIs] support GOOGLE_CLOUD_UNIVERSE_DOMAIN environment variable (#5185)
* feat: support GOOGLE_CLOUD_UNIVERSE_DOMAIN environment variable Use gapic-generator-typescript v4.5.0. PiperOrigin-RevId: 619286536 Source-Link: googleapis/googleapis@f8dae41 Source-Link: googleapis/googleapis-gen@a5fdd28 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFpLWdlbmVyYXRpdmVsYW5ndWFnZS8uT3dsQm90LnlhbWwiLCJoIjoiYTVmZGQyOGE1MGNiOWY0YWRmZmZjNTk5ZWUxMDczYjhjOGQ3MTUxYiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFuYWx5dGljcy1hZG1pbi8uT3dsQm90LnlhbWwiLCJoIjoiYTVmZGQyOGE1MGNiOWY0YWRmZmZjNTk5ZWUxMDczYjhjOGQ3MTUxYiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFuYWx5dGljcy1kYXRhLy5Pd2xCb3QueWFtbCIsImgiOiJhNWZkZDI4YTUwY2I5ZjRhZGZmZmM1OTllZTEwNzNiOGM4ZDcxNTFiIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1hcGlrZXlzLy5Pd2xCb3QueWFtbCIsImgiOiJhNWZkZDI4YTUwY2I5ZjRhZGZmZmM1OTllZTEwNzNiOGM4ZDcxNTFiIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1jbG91ZHF1b3Rhcy8uT3dsQm90LnlhbWwiLCJoIjoiYTVmZGQyOGE1MGNiOWY0YWRmZmZjNTk5ZWUxMDczYjhjOGQ3MTUxYiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1zZXJ2aWNlY29udHJvbC8uT3dsQm90LnlhbWwiLCJoIjoiYTVmZGQyOGE1MGNiOWY0YWRmZmZjNTk5ZWUxMDczYjhjOGQ3MTUxYiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1zZXJ2aWNlbWFuYWdlbWVudC8uT3dsQm90LnlhbWwiLCJoIjoiYTVmZGQyOGE1MGNiOWY0YWRmZmZjNTk5ZWUxMDczYjhjOGQ3MTUxYiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1zZXJ2aWNldXNhZ2UvLk93bEJvdC55YW1sIiwiaCI6ImE1ZmRkMjhhNTBjYjlmNGFkZmZmYzU5OWVlMTA3M2I4YzhkNzE1MWIifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwcGVuZ2luZS8uT3dsQm90LnlhbWwiLCJoIjoiYTVmZGQyOGE1MGNiOWY0YWRmZmZjNTk5ZWUxMDczYjhjOGQ3MTUxYiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwcHMtbWVldC8uT3dsQm90LnlhbWwiLCJoIjoiYTVmZGQyOGE1MGNiOWY0YWRmZmZjNTk5ZWUxMDczYjhjOGQ3MTUxYiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFyZWExMjAtdGFibGVzLy5Pd2xCb3QueWFtbCIsImgiOiJhNWZkZDI4YTUwY2I5ZjRhZGZmZmM1OTllZTEwNzNiOGM4ZDcxNTFiIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNoYXQvLk93bEJvdC55YW1sIiwiaCI6ImE1ZmRkMjhhNTBjYjlmNGFkZmZmYzU5OWVlMTA3M2I4YzhkNzE1MWIifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFjY2Vzc2FwcHJvdmFsLy5Pd2xCb3QueWFtbCIsImgiOiJhNWZkZDI4YTUwY2I5ZjRhZGZmZmM1OTllZTEwNzNiOGM4ZDcxNTFiIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFkdmlzb3J5bm90aWZpY2F0aW9ucy8uT3dsQm90LnlhbWwiLCJoIjoiYTVmZGQyOGE1MGNiOWY0YWRmZmZjNTk5ZWUxMDczYjhjOGQ3MTUxYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: update package name for google-apps/meet --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Sofia Leon <[email protected]>
1 parent 800153a commit cc54e98

78 files changed

Lines changed: 48176 additions & 12012 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-analytics-admin/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-analytics-admin/protos/protos.js

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

packages/google-analytics-admin/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-analytics-admin/src/v1alpha/analytics_admin_service_client.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,15 @@ export class AnalyticsAdminServiceClient {
120120
'Please set either universe_domain or universeDomain, but not both.'
121121
);
122122
}
123+
const universeDomainEnvVar =
124+
typeof process === 'object' && typeof process.env === 'object'
125+
? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']
126+
: undefined;
123127
this._universeDomain =
124-
opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com';
128+
opts?.universeDomain ??
129+
opts?.universe_domain ??
130+
universeDomainEnvVar ??
131+
'googleapis.com';
125132
this._servicePath = 'analyticsadmin.' + this._universeDomain;
126133
const servicePath =
127134
opts?.servicePath || opts?.apiEndpoint || this._servicePath;
@@ -173,7 +180,7 @@ export class AnalyticsAdminServiceClient {
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}`);
@@ -650,7 +657,7 @@ export class AnalyticsAdminServiceClient {
650657
*/
651658
static get servicePath() {
652659
if (
653-
typeof process !== undefined &&
660+
typeof process === 'object' &&
654661
typeof process.emitWarning === 'function'
655662
) {
656663
process.emitWarning(
@@ -668,7 +675,7 @@ export class AnalyticsAdminServiceClient {
668675
*/
669676
static get apiEndpoint() {
670677
if (
671-
typeof process !== undefined &&
678+
typeof process === 'object' &&
672679
typeof process.emitWarning === 'function'
673680
) {
674681
process.emitWarning(

packages/google-analytics-admin/src/v1beta/analytics_admin_service_client.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,15 @@ export class AnalyticsAdminServiceClient {
120120
'Please set either universe_domain or universeDomain, but not both.'
121121
);
122122
}
123+
const universeDomainEnvVar =
124+
typeof process === 'object' && typeof process.env === 'object'
125+
? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']
126+
: undefined;
123127
this._universeDomain =
124-
opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com';
128+
opts?.universeDomain ??
129+
opts?.universe_domain ??
130+
universeDomainEnvVar ??
131+
'googleapis.com';
125132
this._servicePath = 'analyticsadmin.' + this._universeDomain;
126133
const servicePath =
127134
opts?.servicePath || opts?.apiEndpoint || this._servicePath;
@@ -173,7 +180,7 @@ export class AnalyticsAdminServiceClient {
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}`);
@@ -429,7 +436,7 @@ export class AnalyticsAdminServiceClient {
429436
*/
430437
static get servicePath() {
431438
if (
432-
typeof process !== undefined &&
439+
typeof process === 'object' &&
433440
typeof process.emitWarning === 'function'
434441
) {
435442
process.emitWarning(
@@ -447,7 +454,7 @@ export class AnalyticsAdminServiceClient {
447454
*/
448455
static get apiEndpoint() {
449456
if (
450-
typeof process !== undefined &&
457+
typeof process === 'object' &&
451458
typeof process.emitWarning === 'function'
452459
) {
453460
process.emitWarning(

0 commit comments

Comments
 (0)