@google-cloud/managed-identities
Advanced tools
Comparing version 3.0.1 to 3.1.0
"use strict"; | ||
// Copyright 2023 Google LLC | ||
// Copyright 2024 Google LLC | ||
// | ||
@@ -4,0 +4,0 @@ // Licensed under the Apache License, Version 2.0 (the "License"); |
"use strict"; | ||
// Copyright 2023 Google LLC | ||
// Copyright 2024 Google LLC | ||
// | ||
@@ -4,0 +4,0 @@ // Licensed under the Apache License, Version 2.0 (the "License"); |
@@ -50,2 +50,4 @@ /// <reference types="node" /> | ||
private _defaults; | ||
private _universeDomain; | ||
private _servicePath; | ||
auth: gax.GoogleAuth; | ||
@@ -120,2 +122,3 @@ descriptors: Descriptors; | ||
* The DNS address for this API service. | ||
* @deprecated Use the apiEndpoint method of the client instance. | ||
* @returns {string} The DNS address for this service. | ||
@@ -125,4 +128,4 @@ */ | ||
/** | ||
* The DNS address for this API service - same as servicePath(), | ||
* exists for compatibility reasons. | ||
* The DNS address for this API service - same as servicePath. | ||
* @deprecated Use the apiEndpoint method of the client instance. | ||
* @returns {string} The DNS address for this service. | ||
@@ -132,2 +135,8 @@ */ | ||
/** | ||
* The DNS address for this API service. | ||
* @returns {string} The DNS address for this service. | ||
*/ | ||
get apiEndpoint(): string; | ||
get universeDomain(): string; | ||
/** | ||
* The port for this API service. | ||
@@ -134,0 +143,0 @@ * @returns {number} The default port for this service. |
"use strict"; | ||
// Copyright 2023 Google LLC | ||
// Copyright 2024 Google LLC | ||
// | ||
@@ -106,3 +106,3 @@ // Licensed under the Apache License, Version 2.0 (the "License"); | ||
constructor(opts, gaxInstance) { | ||
var _a, _b; | ||
var _a, _b, _c, _d; | ||
this._terminated = false; | ||
@@ -118,7 +118,15 @@ this.descriptors = { | ||
.constructor; | ||
const servicePath = (opts === null || opts === void 0 ? void 0 : opts.servicePath) || (opts === null || opts === void 0 ? void 0 : opts.apiEndpoint) || staticMembers.servicePath; | ||
if ((opts === null || opts === void 0 ? void 0 : opts.universe_domain) && | ||
(opts === null || opts === void 0 ? void 0 : opts.universeDomain) && | ||
(opts === null || opts === void 0 ? void 0 : opts.universe_domain) !== (opts === null || opts === void 0 ? void 0 : opts.universeDomain)) { | ||
throw new Error('Please set either universe_domain or universeDomain, but not both.'); | ||
} | ||
this._universeDomain = | ||
(_b = (_a = opts === null || opts === void 0 ? void 0 : opts.universeDomain) !== null && _a !== void 0 ? _a : opts === null || opts === void 0 ? void 0 : opts.universe_domain) !== null && _b !== void 0 ? _b : 'googleapis.com'; | ||
this._servicePath = 'managedidentities.' + this._universeDomain; | ||
const servicePath = (opts === null || opts === void 0 ? void 0 : opts.servicePath) || (opts === null || opts === void 0 ? void 0 : opts.apiEndpoint) || this._servicePath; | ||
this._providedCustomServicePath = !!((opts === null || opts === void 0 ? void 0 : opts.servicePath) || (opts === null || opts === void 0 ? void 0 : opts.apiEndpoint)); | ||
const port = (opts === null || opts === void 0 ? void 0 : opts.port) || staticMembers.port; | ||
const clientConfig = (_a = opts === null || opts === void 0 ? void 0 : opts.clientConfig) !== null && _a !== void 0 ? _a : {}; | ||
const fallback = (_b = opts === null || opts === void 0 ? void 0 : opts.fallback) !== null && _b !== void 0 ? _b : (typeof window !== 'undefined' && typeof (window === null || window === void 0 ? void 0 : window.fetch) === 'function'); | ||
const clientConfig = (_c = opts === null || opts === void 0 ? void 0 : opts.clientConfig) !== null && _c !== void 0 ? _c : {}; | ||
const fallback = (_d = opts === null || opts === void 0 ? void 0 : opts.fallback) !== null && _d !== void 0 ? _d : (typeof window !== 'undefined' && typeof (window === null || window === void 0 ? void 0 : window.fetch) === 'function'); | ||
opts = Object.assign({ servicePath, port, clientConfig, fallback }, opts); | ||
@@ -128,3 +136,3 @@ // Request numeric enum values if REST transport is used. | ||
// If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. | ||
if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { | ||
if (servicePath !== this._servicePath && !('scopes' in opts)) { | ||
opts['scopes'] = staticMembers.scopes; | ||
@@ -147,5 +155,5 @@ } | ||
// Set defaultServicePath on the auth object. | ||
this.auth.defaultServicePath = staticMembers.servicePath; | ||
this.auth.defaultServicePath = this._servicePath; | ||
// Set the default scopes in auth client if needed. | ||
if (servicePath === staticMembers.servicePath) { | ||
if (servicePath === this._servicePath) { | ||
this.auth.defaultScopes = staticMembers.scopes; | ||
@@ -358,16 +366,35 @@ } | ||
* The DNS address for this API service. | ||
* @deprecated Use the apiEndpoint method of the client instance. | ||
* @returns {string} The DNS address for this service. | ||
*/ | ||
static get servicePath() { | ||
if (typeof process !== undefined && | ||
typeof process.emitWarning === 'function') { | ||
process.emitWarning('Static servicePath is deprecated, please use the instance method instead.', 'DeprecationWarning'); | ||
} | ||
return 'managedidentities.googleapis.com'; | ||
} | ||
/** | ||
* The DNS address for this API service - same as servicePath(), | ||
* exists for compatibility reasons. | ||
* The DNS address for this API service - same as servicePath. | ||
* @deprecated Use the apiEndpoint method of the client instance. | ||
* @returns {string} The DNS address for this service. | ||
*/ | ||
static get apiEndpoint() { | ||
if (typeof process !== undefined && | ||
typeof process.emitWarning === 'function') { | ||
process.emitWarning('Static apiEndpoint is deprecated, please use the instance method instead.', 'DeprecationWarning'); | ||
} | ||
return 'managedidentities.googleapis.com'; | ||
} | ||
/** | ||
* The DNS address for this API service. | ||
* @returns {string} The DNS address for this service. | ||
*/ | ||
get apiEndpoint() { | ||
return this._servicePath; | ||
} | ||
get universeDomain() { | ||
return this._universeDomain; | ||
} | ||
/** | ||
* The port for this API service. | ||
@@ -374,0 +401,0 @@ * @returns {number} The default port for this service. |
"use strict"; | ||
// Copyright 2023 Google LLC | ||
// Copyright 2024 Google LLC | ||
// | ||
@@ -4,0 +4,0 @@ // Licensed under the Apache License, Version 2.0 (the "License"); |
@@ -18,2 +18,4 @@ /// <reference types="node" /> | ||
private _defaults; | ||
private _universeDomain; | ||
private _servicePath; | ||
auth: gax.GoogleAuth; | ||
@@ -88,2 +90,3 @@ descriptors: Descriptors; | ||
* The DNS address for this API service. | ||
* @deprecated Use the apiEndpoint method of the client instance. | ||
* @returns {string} The DNS address for this service. | ||
@@ -93,4 +96,4 @@ */ | ||
/** | ||
* The DNS address for this API service - same as servicePath(), | ||
* exists for compatibility reasons. | ||
* The DNS address for this API service - same as servicePath. | ||
* @deprecated Use the apiEndpoint method of the client instance. | ||
* @returns {string} The DNS address for this service. | ||
@@ -100,2 +103,8 @@ */ | ||
/** | ||
* The DNS address for this API service. | ||
* @returns {string} The DNS address for this service. | ||
*/ | ||
get apiEndpoint(): string; | ||
get universeDomain(): string; | ||
/** | ||
* The port for this API service. | ||
@@ -102,0 +111,0 @@ * @returns {number} The default port for this service. |
"use strict"; | ||
// Copyright 2023 Google LLC | ||
// Copyright 2024 Google LLC | ||
// | ||
@@ -74,3 +74,3 @@ // Licensed under the Apache License, Version 2.0 (the "License"); | ||
constructor(opts, gaxInstance) { | ||
var _a, _b; | ||
var _a, _b, _c, _d; | ||
this._terminated = false; | ||
@@ -86,7 +86,15 @@ this.descriptors = { | ||
.constructor; | ||
const servicePath = (opts === null || opts === void 0 ? void 0 : opts.servicePath) || (opts === null || opts === void 0 ? void 0 : opts.apiEndpoint) || staticMembers.servicePath; | ||
if ((opts === null || opts === void 0 ? void 0 : opts.universe_domain) && | ||
(opts === null || opts === void 0 ? void 0 : opts.universeDomain) && | ||
(opts === null || opts === void 0 ? void 0 : opts.universe_domain) !== (opts === null || opts === void 0 ? void 0 : opts.universeDomain)) { | ||
throw new Error('Please set either universe_domain or universeDomain, but not both.'); | ||
} | ||
this._universeDomain = | ||
(_b = (_a = opts === null || opts === void 0 ? void 0 : opts.universeDomain) !== null && _a !== void 0 ? _a : opts === null || opts === void 0 ? void 0 : opts.universe_domain) !== null && _b !== void 0 ? _b : 'googleapis.com'; | ||
this._servicePath = 'managedidentities.' + this._universeDomain; | ||
const servicePath = (opts === null || opts === void 0 ? void 0 : opts.servicePath) || (opts === null || opts === void 0 ? void 0 : opts.apiEndpoint) || this._servicePath; | ||
this._providedCustomServicePath = !!((opts === null || opts === void 0 ? void 0 : opts.servicePath) || (opts === null || opts === void 0 ? void 0 : opts.apiEndpoint)); | ||
const port = (opts === null || opts === void 0 ? void 0 : opts.port) || staticMembers.port; | ||
const clientConfig = (_a = opts === null || opts === void 0 ? void 0 : opts.clientConfig) !== null && _a !== void 0 ? _a : {}; | ||
const fallback = (_b = opts === null || opts === void 0 ? void 0 : opts.fallback) !== null && _b !== void 0 ? _b : (typeof window !== 'undefined' && typeof (window === null || window === void 0 ? void 0 : window.fetch) === 'function'); | ||
const clientConfig = (_c = opts === null || opts === void 0 ? void 0 : opts.clientConfig) !== null && _c !== void 0 ? _c : {}; | ||
const fallback = (_d = opts === null || opts === void 0 ? void 0 : opts.fallback) !== null && _d !== void 0 ? _d : (typeof window !== 'undefined' && typeof (window === null || window === void 0 ? void 0 : window.fetch) === 'function'); | ||
opts = Object.assign({ servicePath, port, clientConfig, fallback }, opts); | ||
@@ -96,3 +104,3 @@ // Request numeric enum values if REST transport is used. | ||
// If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. | ||
if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { | ||
if (servicePath !== this._servicePath && !('scopes' in opts)) { | ||
opts['scopes'] = staticMembers.scopes; | ||
@@ -115,5 +123,5 @@ } | ||
// Set defaultServicePath on the auth object. | ||
this.auth.defaultServicePath = staticMembers.servicePath; | ||
this.auth.defaultServicePath = this._servicePath; | ||
// Set the default scopes in auth client if needed. | ||
if (servicePath === staticMembers.servicePath) { | ||
if (servicePath === this._servicePath) { | ||
this.auth.defaultScopes = staticMembers.scopes; | ||
@@ -326,16 +334,35 @@ } | ||
* The DNS address for this API service. | ||
* @deprecated Use the apiEndpoint method of the client instance. | ||
* @returns {string} The DNS address for this service. | ||
*/ | ||
static get servicePath() { | ||
if (typeof process !== undefined && | ||
typeof process.emitWarning === 'function') { | ||
process.emitWarning('Static servicePath is deprecated, please use the instance method instead.', 'DeprecationWarning'); | ||
} | ||
return 'managedidentities.googleapis.com'; | ||
} | ||
/** | ||
* The DNS address for this API service - same as servicePath(), | ||
* exists for compatibility reasons. | ||
* The DNS address for this API service - same as servicePath. | ||
* @deprecated Use the apiEndpoint method of the client instance. | ||
* @returns {string} The DNS address for this service. | ||
*/ | ||
static get apiEndpoint() { | ||
if (typeof process !== undefined && | ||
typeof process.emitWarning === 'function') { | ||
process.emitWarning('Static apiEndpoint is deprecated, please use the instance method instead.', 'DeprecationWarning'); | ||
} | ||
return 'managedidentities.googleapis.com'; | ||
} | ||
/** | ||
* The DNS address for this API service. | ||
* @returns {string} The DNS address for this service. | ||
*/ | ||
get apiEndpoint() { | ||
return this._servicePath; | ||
} | ||
get universeDomain() { | ||
return this._universeDomain; | ||
} | ||
/** | ||
* The port for this API service. | ||
@@ -342,0 +369,0 @@ * @returns {number} The default port for this service. |
# Changelog | ||
## [3.1.0](https://github.com/googleapis/google-cloud-node/compare/managed-identities-v3.0.1...managed-identities-v3.1.0) (2024-02-09) | ||
### Features | ||
* Trusted Private Cloud support, use the universeDomain parameter ([#5025](https://github.com/googleapis/google-cloud-node/issues/5025)) ([7244cab](https://github.com/googleapis/google-cloud-node/commit/7244cab107973bef57c5ea84ae77c51718126822)) | ||
## [3.0.1](https://github.com/googleapis/google-cloud-node/compare/managed-identities-v3.0.0...managed-identities-v3.0.1) (2023-09-06) | ||
@@ -4,0 +11,0 @@ |
{ | ||
"name": "@google-cloud/managed-identities", | ||
"version": "3.0.1", | ||
"version": "3.1.0", | ||
"description": "Managedidentities client for Node.js", | ||
@@ -40,3 +40,3 @@ "repository": { | ||
"lint": "gts check", | ||
"prepare": "npm run compile-protos && npm run compile", | ||
"prepare": "npm run compile", | ||
"prelint": "cd samples; npm link ../; npm i", | ||
@@ -54,5 +54,5 @@ "postpack": "minifyProtoJson", | ||
"@types/node": "^20.4.5", | ||
"@types/sinon": "^10.0.0", | ||
"@types/sinon": "^17.0.0", | ||
"c8": "^8.0.1", | ||
"gapic-tools": "^0.1.8", | ||
"gapic-tools": "^0.3.0", | ||
"gts": "^5.0.0", | ||
@@ -65,4 +65,4 @@ "jsdoc": "^4.0.0", | ||
"mocha": "^9.2.2", | ||
"pack-n-play": "^1.0.0-2", | ||
"sinon": "^15.0.0", | ||
"pack-n-play": "^2.0.0", | ||
"sinon": "^17.0.0", | ||
"typescript": "^5.1.6" | ||
@@ -69,0 +69,0 @@ }, |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
2541120
42295