@google-cloud/dlp 5.1.0 → 5.2.0

package/build/protos/protos.json

@@ -6922,10 +6922,6 @@
                   "rule": "repeated",
                   "type": "ClientLibrarySettings",
                   "id": 109
-                },
-                "protoReferenceDocumentationUri": {
-                  "type": "string",
-                  "id": 110
                 }
               }
             },
@@ -6983,31 +6979,6 @@
                 "common": {
                   "type": "CommonLanguageSettings",
                   "id": 1
-                },
-                "renamedServices": {
-                  "keyType": "string",
-                  "type": "string",
-                  "id": 2
-                },
-                "renamedResources": {
-                  "keyType": "string",
-                  "type": "string",
-                  "id": 3
-                },
-                "ignoredResources": {
-                  "rule": "repeated",
-                  "type": "string",
-                  "id": 4
-                },
-                "forcedNamespaceAliases": {
-                  "rule": "repeated",
-                  "type": "string",
-                  "id": 5
-                },
-                "handwrittenSignatures": {
-                  "rule": "repeated",
-                  "type": "string",
-                  "id": 6
                 }
               }
             },
@@ -7067,10 +7038,7 @@
                 "CLOUD": 1,
                 "ADS": 2,
                 "PHOTOS": 3,
-                "STREET_VIEW": 4,
-                "SHOPPING": 5,
-                "GEO": 6,
-                "GENERATIVE_AI": 7
+                "STREET_VIEW": 4
               }
             },
             "ClientLibraryDestination": {
@@ -7366,25 +7334,6 @@
                   "rule": "repeated",
                   "type": "UninterpretedOption",
                   "id": 999
-                },
-                "declaration": {
-                  "rule": "repeated",
-                  "type": "Declaration",
-                  "id": 2,
-                  "options": {
-                    "retention": "RETENTION_SOURCE"
-                  }
-                },
-                "features": {
-                  "type": "FeatureSet",
-                  "id": 50
-                },
-                "verification": {
-                  "type": "VerificationState",
-                  "id": 3,
-                  "options": {
-                    "default": "UNVERIFIED"
-                  }
                 }
               },
               "extensions": [
@@ -7392,45 +7341,7 @@
                   1000,
                   536870911
                 ]
-              ],
-              "nested": {
-                "Declaration": {
-                  "fields": {
-                    "number": {
-                      "type": "int32",
-                      "id": 1
-                    },
-                    "fullName": {
-                      "type": "string",
-                      "id": 2
-                    },
-                    "type": {
-                      "type": "string",
-                      "id": 3
-                    },
-                    "reserved": {
-                      "type": "bool",
-                      "id": 5
-                    },
-                    "repeated": {
-                      "type": "bool",
-                      "id": 6
-                    }
-                  },
-                  "reserved": [
-                    [
-                      4,
-                      4
-                    ]
-                  ]
-                },
-                "VerificationState": {
-                  "values": {
-                    "DECLARATION": 0,
-                    "UNVERIFIED": 1
-                  }
-                }
-              }
+              ]
             },
             "FieldDescriptorProto": {
               "fields": {
@@ -7743,10 +7654,6 @@
                   "type": "string",
                   "id": 45
                 },
-                "features": {
-                  "type": "FeatureSet",
-                  "id": 50
-                },
                 "uninterpretedOption": {
                   "rule": "repeated",
                   "type": "UninterpretedOption",
@@ -7809,10 +7716,6 @@
                     "deprecated": true
                   }
                 },
-                "features": {
-                  "type": "FeatureSet",
-                  "id": 12
-                },
                 "uninterpretedOption": {
                   "rule": "repeated",
                   "type": "UninterpretedOption",
@@ -7907,22 +7810,9 @@
                   "type": "OptionRetention",
                   "id": 17
                 },
-                "targets": {
-                  "rule": "repeated",
+                "target": {
                   "type": "OptionTargetType",
-                  "id": 19,
-                  "options": {
-                    "packed": false
-                  }
-                },
-                "editionDefaults": {
-                  "rule": "repeated",
-                  "type": "EditionDefault",
-                  "id": 20
-                },
-                "features": {
-                  "type": "FeatureSet",
-                  "id": 21
+                  "id": 18
                 },
                 "uninterpretedOption": {
                   "rule": "repeated",
@@ -7940,10 +7830,6 @@
                 [
                   4,
                   4
-                ],
-                [
-                  18,
-                  18
                 ]
               ],
               "nested": {
@@ -7981,27 +7867,11 @@
                     "TARGET_TYPE_SERVICE": 8,
                     "TARGET_TYPE_METHOD": 9
                   }
-                },
-                "EditionDefault": {
-                  "fields": {
-                    "edition": {
-                      "type": "string",
-                      "id": 1
-                    },
-                    "value": {
-                      "type": "string",
-                      "id": 2
-                    }
-                  }
                 }
               }
             },
             "OneofOptions": {
               "fields": {
-                "features": {
-                  "type": "FeatureSet",
-                  "id": 1
-                },
                 "uninterpretedOption": {
                   "rule": "repeated",
                   "type": "UninterpretedOption",
@@ -8035,10 +7905,6 @@
                     "deprecated": true
                   }
                 },
-                "features": {
-                  "type": "FeatureSet",
-                  "id": 7
-                },
                 "uninterpretedOption": {
                   "rule": "repeated",
                   "type": "UninterpretedOption",
@@ -8067,17 +7933,6 @@
                     "default": false
                   }
                 },
-                "features": {
-                  "type": "FeatureSet",
-                  "id": 2
-                },
-                "debugRedact": {
-                  "type": "bool",
-                  "id": 3,
-                  "options": {
-                    "default": false
-                  }
-                },
                 "uninterpretedOption": {
                   "rule": "repeated",
                   "type": "UninterpretedOption",
@@ -8093,10 +7948,6 @@
             },
             "ServiceOptions": {
               "fields": {
-                "features": {
-                  "type": "FeatureSet",
-                  "id": 34
-                },
                 "deprecated": {
                   "type": "bool",
                   "id": 33,
@@ -8133,10 +7984,6 @@
                     "default": "IDEMPOTENCY_UNKNOWN"
                   }
                 },
-                "features": {
-                  "type": "FeatureSet",
-                  "id": 35
-                },
                 "uninterpretedOption": {
                   "rule": "repeated",
                   "type": "UninterpretedOption",
@@ -8208,137 +8055,6 @@
                 }
               }
             },
-            "FeatureSet": {
-              "fields": {
-                "fieldPresence": {
-                  "type": "FieldPresence",
-                  "id": 1,
-                  "options": {
-                    "retention": "RETENTION_RUNTIME",
-                    "targets": "TARGET_TYPE_FILE",
-                    "edition_defaults.edition": "2023",
-                    "edition_defaults.value": "EXPLICIT"
-                  }
-                },
-                "enumType": {
-                  "type": "EnumType",
-                  "id": 2,
-                  "options": {
-                    "retention": "RETENTION_RUNTIME",
-                    "targets": "TARGET_TYPE_FILE",
-                    "edition_defaults.edition": "2023",
-                    "edition_defaults.value": "OPEN"
-                  }
-                },
-                "repeatedFieldEncoding": {
-                  "type": "RepeatedFieldEncoding",
-                  "id": 3,
-                  "options": {
-                    "retention": "RETENTION_RUNTIME",
-                    "targets": "TARGET_TYPE_FILE",
-                    "edition_defaults.edition": "2023",
-                    "edition_defaults.value": "PACKED"
-                  }
-                },
-                "stringFieldValidation": {
-                  "type": "StringFieldValidation",
-                  "id": 4,
-                  "options": {
-                    "retention": "RETENTION_RUNTIME",
-                    "targets": "TARGET_TYPE_FILE",
-                    "edition_defaults.edition": "2023",
-                    "edition_defaults.value": "MANDATORY"
-                  }
-                },
-                "messageEncoding": {
-                  "type": "MessageEncoding",
-                  "id": 5,
-                  "options": {
-                    "retention": "RETENTION_RUNTIME",
-                    "targets": "TARGET_TYPE_FILE",
-                    "edition_defaults.edition": "2023",
-                    "edition_defaults.value": "LENGTH_PREFIXED"
-                  }
-                },
-                "jsonFormat": {
-                  "type": "JsonFormat",
-                  "id": 6,
-                  "options": {
-                    "retention": "RETENTION_RUNTIME",
-                    "targets": "TARGET_TYPE_FILE",
-                    "edition_defaults.edition": "2023",
-                    "edition_defaults.value": "ALLOW"
-                  }
-                },
-                "rawFeatures": {
-                  "type": "FeatureSet",
-                  "id": 999,
-                  "options": {
-                    "targets": "TARGET_TYPE_UNKNOWN"
-                  }
-                }
-              },
-              "extensions": [
-                [
-                  1000,
-                  1000
-                ],
-                [
-                  1001,
-                  1001
-                ],
-                [
-                  9995,
-                  9999
-                ]
-              ],
-              "nested": {
-                "FieldPresence": {
-                  "values": {
-                    "FIELD_PRESENCE_UNKNOWN": 0,
-                    "EXPLICIT": 1,
-                    "IMPLICIT": 2,
-                    "LEGACY_REQUIRED": 3
-                  }
-                },
-                "EnumType": {
-                  "values": {
-                    "ENUM_TYPE_UNKNOWN": 0,
-                    "OPEN": 1,
-                    "CLOSED": 2
-                  }
-                },
-                "RepeatedFieldEncoding": {
-                  "values": {
-                    "REPEATED_FIELD_ENCODING_UNKNOWN": 0,
-                    "PACKED": 1,
-                    "EXPANDED": 2
-                  }
-                },
-                "StringFieldValidation": {
-                  "values": {
-                    "STRING_FIELD_VALIDATION_UNKNOWN": 0,
-                    "MANDATORY": 1,
-                    "HINT": 2,
-                    "NONE": 3
-                  }
-                },
-                "MessageEncoding": {
-                  "values": {
-                    "MESSAGE_ENCODING_UNKNOWN": 0,
-                    "LENGTH_PREFIXED": 1,
-                    "DELIMITED": 2
-                  }
-                },
-                "JsonFormat": {
-                  "values": {
-                    "JSON_FORMAT_UNKNOWN": 0,
-                    "ALLOW": 1,
-                    "LEGACY_BEST_EFFORT": 2
-                  }
-                }
-              }
-            },
             "SourceCodeInfo": {
               "fields": {
                 "location": {

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/v2/dlp_service_client.d.ts

@@ -24,6 +24,8 @@ export declare class DlpServiceClient {
     private _gaxGrpc;
     private _protos;
     private _defaults;
+    private _universeDomain;
+    private _servicePath;
     auth: gax.GoogleAuth;
     descriptors: Descriptors;
     warn: (code: string, message: string, warnType?: string) => void;
@@ -93,15 +95,22 @@ export declare class DlpServiceClient {
     }>;
     /**
      * 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/v2/dlp_service_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.
@@ -80,7 +80,7 @@ class DlpServiceClient {
      *     ```
      */
     constructor(opts, gaxInstance) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         this._terminated = false;
         this.descriptors = {
             page: {},
@@ -90,16 +90,24 @@ class DlpServiceClient {
         };
         // 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 = 'dlp.' + 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
@@ -117,9 +125,9 @@ class DlpServiceClient {
         // 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;
         }
         this.locationsClient = new this._gaxModule.LocationsClient(this._gaxGrpc, opts);
@@ -272,19 +280,38 @@ class DlpServiceClient {
     }
     /**
      * 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 'dlp.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 'dlp.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/v2/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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@google-cloud/dlp",
   "description": "DLP API client for Node.js",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "license": "Apache-2.0",
   "author": "Google Inc",
   "engines": {
@@ -40,7 +40,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": "^9.0.0",
     "@types/node": "^20.4.5",
-    "@types/sinon": "^10.0.0",
+    "@types/sinon": "^17.0.0",
     "c8": "^8.0.1",
-    "gapic-tools": "^0.2.0",
+    "gapic-tools": "^0.3.0",
     "gts": "^5.0.0",
     "jsdoc": "^4.0.0",
     "jsdoc-fresh": "^3.0.0",