Merge branch 'main' into owl-bot-copy-packages-google-cloud-modelarmor

Author: shivanee-p

.github/CODEOWNERS

@@ -15,3 +15,4 @@
 /handwritten/bigquery-storage @googleapis/bigquery-team
 /handwritten/pubsub @googleapis/pubsub-team
 /handwritten/bigtable @googleapis/bigtable-team
+/core/packages/google-auth-library-nodejs @googleapis/aion-team

core/generator/gapic-generator-typescript/package-lock.json

@@ -56,7 +56,7 @@
     "long": "^5.3.2",
     "object-hash": "^3.0.0",
     "proto3-json-serializer": "^3.0.3",
-    "protobufjs": "^7.5.4",
+    "protobufjs": "^7.5.5",
     "protobufjs-cli": "^1.2.0",
     "yargs": "^17.7.2"
   },

core/generator/gapic-generator-typescript/package.json

@@ -3196,7 +3196,7 @@ protobufjs-cli@^1.2.0:
     tmp "^0.2.1"
     uglify-js "^3.7.7"
 
-protobufjs@7.5.4, protobufjs@^7.2.5, protobufjs@^7.4.0, protobufjs@^7.5.3, protobufjs@^7.5.4:
+protobufjs@7.5.4:
   version "7.5.4"
   resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.4.tgz"
   integrity sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg==
@@ -3214,6 +3214,24 @@ protobufjs@7.5.4, protobufjs@^7.2.5, protobufjs@^7.4.0, protobufjs@^7.5.3, proto
     "@types/node" ">=13.7.0"
     long "^5.0.0"
 
+protobufjs@^7.2.5, protobufjs@^7.4.0, protobufjs@^7.5.3, protobufjs@^7.5.5:
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.5.tgz#b7089ca4410374c75150baf277353ef76db69f96"
+  integrity sha512-3wY1AxV+VBNW8Yypfd1yQY9pXnqTAN+KwQxL8iYm3/BjKYMNg4i0owhEe26PWDOMaIrzeeF98Lqd5NGz4omiIg==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/node" ">=13.7.0"
+    long "^5.0.0"
+
 punycode.js@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz"

core/generator/gapic-generator-typescript/pnpm-lock.yaml

@@ -48,7 +48,7 @@
     "@types/extend": "^3.0.4",
     "@types/mocha": "^10.0.10",
     "@types/node": "^22.13.14",
-    "@types/sinon": "^17.0.4",
+    "@types/sinon": "^21.0.0",
     "@types/uuid": "^10.0.0",
     "avsc": "^5.7.9",
     "c8": "^10.1.3",

core/generator/gapic-generator-typescript/yarn.lock

@@ -52,7 +52,7 @@
     "extend": "^3.0.2",
     "google-gax": "^5.0.2-rc.1",
     "is": "^3.3.0",
-    "protobufjs": "7.4.0",
+    "protobufjs": "^7.5.5",
     "split-array-stream": "^2.0.0",
     "stream-events": "^1.0.5"
   },

handwritten/bigquery-storage/package.json

@@ -1302,6 +1302,14 @@ export namespace entity {
         path.join(__dirname, '..', 'protos', 'app_engine_key.proto'),
       );
       loadedRoot.resolveAll();
+
+      // Ensure all types are initialized and setup correctly.
+      // In newer versions of protobufjs, this ensures group support
+      // is preserved for legacy keys.
+      for (const typeName of ['Reference', 'Path', 'Element']) {
+        loadedRoot.lookupType(typeName).setup();
+      }
+
       return loadedRoot.nested;
     }
 

handwritten/datastore/package.json

@@ -1800,6 +1800,10 @@ describe('entity', () => {
         const key = urlSafeKey.legacyDecode(encodedKey);
         assert.strictEqual(key.namespace, 'NS');
         assert.deepStrictEqual(key.path, ['Task', 'sampletask1']);
+        assert.strictEqual(
+          urlSafeKey.legacyEncode(PROJECT_ID, key, LOCATION_PREFIX),
+          encodedKey,
+        );
       });
 
       it('should decode key with single path element string type', () => {
@@ -1808,6 +1812,10 @@ describe('entity', () => {
         const key = urlSafeKey.legacyDecode(encodedKey);
         assert.strictEqual(key.namespace, undefined);
         assert.deepStrictEqual(key.path, ['Task', 'sampletask1']);
+        assert.strictEqual(
+          urlSafeKey.legacyEncode(PROJECT_ID, key),
+          encodedKey,
+        );
       });
 
       it('should decode key with single path element long int type', () => {
@@ -1816,6 +1824,10 @@ describe('entity', () => {
         const key = urlSafeKey.legacyDecode(encodedKey);
         assert.strictEqual(key.namespace, undefined);
         assert.deepStrictEqual(key.path, ['Task', '5754248394440704']);
+        assert.strictEqual(
+          urlSafeKey.legacyEncode(PROJECT_ID, key, LOCATION_PREFIX),
+          encodedKey,
+        );
       });
 
       it('should decode key with parent path', () => {
@@ -1831,6 +1843,69 @@ describe('entity', () => {
         ]);
         assert.strictEqual(key.parent!.name, 'sampletask1');
         assert.deepStrictEqual(key.parent!.path, ['Task', 'sampletask1']);
+        assert.strictEqual(
+          urlSafeKey.legacyEncode(PROJECT_ID, key, LOCATION_PREFIX),
+          encodedKey,
+        );
+      });
+
+      describe('should ensure that decode inverses encode and decoding is correct', () => {
+        const TEST_PROJECT = 'test-project';
+        const testCases = [
+          {name: 'numeric ID', path: ['Kind', '123']},
+          {name: 'string name with spaces', path: ['Kind', 'name with spaces']},
+          {name: 'special characters', path: ['Kind', 'special!@#$%^&*()']},
+          {
+            name: '3-level parent',
+            path: ['Grandparent', '1', 'Parent', 'p1', 'Child', '2'],
+          },
+          {
+            name: 'namespace and numeric ID',
+            path: ['Kind', '456'],
+            namespace: 'MyNS',
+          },
+          {
+            name: 'namespace and parent',
+            path: ['Parent', '1', 'Child', 'c1'],
+            namespace: 'MyNS',
+          },
+          {
+            name: 'long integer ID as string',
+            path: ['Kind', '9223372036854775807'],
+          },
+          {name: 'kind with hyphens', path: ['My-Kind', '1']},
+          {
+            name: 'different kinds in path',
+            path: ['User', 'user1', 'Post', '100', 'Comment', 'c1'],
+          },
+          {
+            name: 'same kinds in path',
+            path: ['Node', '1', 'Node', '2', 'Node', '3'],
+          },
+        ];
+
+        testCases.forEach(tc => {
+          it(`should decode and re-encode ${tc.name} correctly`, () => {
+            const key = new testEntity.Key({
+              path: tc.path,
+              namespace: tc.namespace,
+            });
+            const encoded = urlSafeKey.legacyEncode(
+              TEST_PROJECT,
+              key,
+              LOCATION_PREFIX,
+            );
+            const decoded = urlSafeKey.legacyDecode(encoded);
+            assert.strictEqual(decoded.namespace, tc.namespace);
+            assert.deepStrictEqual(decoded.path, tc.path);
+            const reEncoded = urlSafeKey.legacyEncode(
+              TEST_PROJECT,
+              decoded,
+              LOCATION_PREFIX,
+            );
+            assert.strictEqual(reEncoded, encoded);
+          });
+        });
       });
     });
   });

handwritten/datastore/src/entity.ts

@@ -11,7 +11,8 @@
   "author": "Google LLC",
   "main": "build/src/index.js",
   "files": [
-    "build/src"
+    "build/src",
+    "build/protos"
   ],
   "homepage": "https://github.com/googleapis/google-cloud-node/tree/main/packages/google-ads-admanager",
   "keywords": [