@google-cloud/containeranalysis 5.1.1 → 5.3.0

package/build/src/index.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

package/build/src/v1/container_analysis_client.d.ts

@@ -26,6 +26,8 @@ export declare class ContainerAnalysisClient {
     private _gaxGrpc;
     private _protos;
     private _defaults;
+    private _universeDomain;
+    private _servicePath;
     auth: gax.GoogleAuth;
     descriptors: Descriptors;
     warn: (code: string, message: string, warnType?: string) => void;
@@ -94,15 +96,22 @@ export declare class ContainerAnalysisClient {
     }>;
     /**
      * 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(): string;
     /**
-     * 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(): string;
+    /**
+     * 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.
      * @returns {number} The default port for this service.

package/build/src/v1/container_analysis_client.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -85,7 +85,7 @@ class ContainerAnalysisClient {
      *     ```
      */
     constructor(opts, gaxInstance) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         this._terminated = false;
         this.descriptors = {
             page: {},
@@ -95,16 +95,24 @@ class ContainerAnalysisClient {
         };
         // Ensure that options include all the required fields.
         const staticMembers = this.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 = 'containeranalysis.' + 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);
         // Request numeric enum values if REST transport is used.
         opts.numericEnums = true;
         // 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;
         }
         // Load google-gax module synchronously if needed
@@ -122,9 +130,9 @@ class ContainerAnalysisClient {
         // Set useJWTAccessWithScope on the auth object.
         this.auth.useJWTAccessWithScope = true;
         // 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;
         }
         // Determine the client header string.
@@ -212,19 +220,38 @@ class ContainerAnalysisClient {
     }
     /**
      * 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 'containeranalysis.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 'containeranalysis.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.
      * @returns {number} The default port for this service.

package/build/src/v1beta1/container_analysis_v1_beta1_client.d.ts

@@ -26,6 +26,8 @@ export declare class ContainerAnalysisV1Beta1Client {
     private _gaxGrpc;
     private _protos;
     private _defaults;
+    private _universeDomain;
+    private _servicePath;
     auth: gax.GoogleAuth;
     descriptors: Descriptors;
     warn: (code: string, message: string, warnType?: string) => void;
@@ -91,15 +93,22 @@ export declare class ContainerAnalysisV1Beta1Client {
     }>;
     /**
      * 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(): string;
     /**
-     * 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(): string;
+    /**
+     * 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.
      * @returns {number} The default port for this service.

package/build/src/v1beta1/container_analysis_v1_beta1_client.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ class ContainerAnalysisV1Beta1Client {
      *     ```
      */
     constructor(opts, gaxInstance) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         this._terminated = false;
         this.descriptors = {
             page: {},
@@ -95,16 +95,24 @@ class ContainerAnalysisV1Beta1Client {
         // Ensure that options include all the required fields.
         const staticMembers = this
             .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 = 'containeranalysis.' + 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);
         // Request numeric enum values if REST transport is used.
         opts.numericEnums = true;
         // 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;
         }
         // Load google-gax module synchronously if needed
@@ -122,9 +130,9 @@ class ContainerAnalysisV1Beta1Client {
         // Set useJWTAccessWithScope on the auth object.
         this.auth.useJWTAccessWithScope = true;
         // 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;
         }
         // Determine the client header string.
@@ -205,19 +213,38 @@ class ContainerAnalysisV1Beta1Client {
     }
     /**
      * 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 'containeranalysis.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 'containeranalysis.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.
      * @returns {number} The default port for this service.

package/build/src/v1beta1/grafeas_v1_beta1_client.d.ts

@@ -29,6 +29,8 @@ export declare class GrafeasV1Beta1Client {
     private _gaxGrpc;
     private _protos;
     private _defaults;
+    private _universeDomain;
+    private _servicePath;
     auth: gax.GoogleAuth;
     descriptors: Descriptors;
     warn: (code: string, message: string, warnType?: string) => void;
@@ -94,15 +96,22 @@ export declare class GrafeasV1Beta1Client {
     }>;
     /**
      * 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(): string;
     /**
-     * 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(): string;
+    /**
+     * 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.
      * @returns {number} The default port for this service.

package/build/src/v1beta1/grafeas_v1_beta1_client.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -85,7 +85,7 @@ class GrafeasV1Beta1Client {
      *     ```
      */
     constructor(opts, gaxInstance) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         this._terminated = false;
         this.descriptors = {
             page: {},
@@ -95,16 +95,24 @@ class GrafeasV1Beta1Client {
         };
         // Ensure that options include all the required fields.
         const staticMembers = this.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 = 'containeranalysis.' + 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);
         // Request numeric enum values if REST transport is used.
         opts.numericEnums = true;
         // 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;
         }
         // Load google-gax module synchronously if needed
@@ -122,9 +130,9 @@ class GrafeasV1Beta1Client {
         // Set useJWTAccessWithScope on the auth object.
         this.auth.useJWTAccessWithScope = true;
         // 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;
         }
         // Determine the client header string.
@@ -222,19 +230,38 @@ class GrafeasV1Beta1Client {
     }
     /**
      * 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 'containeranalysis.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 'containeranalysis.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.
      * @returns {number} The default port for this service.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google-cloud/containeranalysis",
-  "version": "5.1.1",
+  "version": "5.3.0",
   "description": "Containeranalysis client for Node.js",
   "repository": {
     "type": "git",
@@ -39,7 +39,7 @@
     "docs-test": "linkinator docs",
     "fix": "gts fix",
     "lint": "gts check",
-    "prepare": "npm run compile-protos && npm run compile",
+    "prepare": "npm run compile",
     "prelint": "cd samples; npm link ../; npm i",
     "postpack": "minifyProtoJson",
     "samples-test": "cd samples/ && npm link ../ && npm i && npm test",
@@ -53,9 +53,9 @@
   "devDependencies": {
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.4.5",
-    "@types/sinon": "^10.0.13",
-    "c8": "^8.0.1",
-    "gapic-tools": "^0.1.8",
+    "@types/sinon": "^17.0.0",
+    "c8": "^9.0.0",
+    "gapic-tools": "^0.4.0",
     "gts": "^5.0.0",
     "jsdoc": "^4.0.0",
     "jsdoc-fresh": "^3.0.0",
@@ -63,8 +63,8 @@
     "linkinator": "4.1.2",
     "long": "^5.2.3",
     "mocha": "^10.2.0",
-    "pack-n-play": "^1.0.0-2",
-    "sinon": "^15.0.1",
+    "pack-n-play": "^2.0.0",
+    "sinon": "^17.0.0",
     "typescript": "^5.1.6"
   },
   "engines": {