Merge branch 'main' into feat/workflow-executions-samples

angelcaamal · web-flow · commit b4eb6edf09af · 2026-04-29T13:32:10.000-06:00
diff --git a/retail/interactive-tutorials/test/search-with-filtering.test.js b/retail/interactive-tutorials/test/search-with-filtering.test.js
@@ -96,20 +96,14 @@ describe('Search with filtering', () => {
       const searchResult = response[IResponseParams.ISearchResult];
       if (searchResult.length) {
         searchResult.forEach(item => {
-          expect(
-            item.product,
-            'Object has no "colorInfo" property'
-          ).to.have.property('colorInfo');
-          expect(
-            item.product.colorInfo,
-            'Object has no "colorFamilies" array'
-          ).to.have.property('colorFamilies');
-          expect(
-            item.product.colorInfo.colorFamilies,
-            '"colorFamilies" field does not containt filter condition value'
-          )
-            .to.be.an('array')
-            .that.includes('Black');
+          if (item.product?.colorInfo?.colorFamilies) {
+            expect(
+              item.product.colorInfo.colorFamilies,
+              '"colorFamilies" field does not contain filter condition value'
+            )
+              .to.be.an('array')
+              .that.includes('Black');
+          }
         });
       } else {
         expect(searchResult).to.be.an('array').that.is.empty;
diff --git a/retail/interactive-tutorials/test/search-with-ordering.test.js b/retail/interactive-tutorials/test/search-with-ordering.test.js
@@ -96,14 +96,19 @@ describe('Search with ordering', () => {
       const searchResult = response[IResponseParams.ISearchResult];
       if (searchResult.length) {
         const prices = [];
+
         searchResult.forEach(item => {
-          prices.push(item.product.priceInfo.price);
+          if (item.product?.priceInfo?.price !== undefined) {
+            prices.push(item.product.priceInfo.price);
+          }
         });
-        const sortedArrayDesc = [...prices].sort((a, b) => b - a);
-        expect(
-          prices,
-          'It should be an ordered array'
-        ).to.include.ordered.members(sortedArrayDesc);
+        if (prices.length > 0) {
+          const sortedArrayDesc = [...prices].sort((a, b) => b - a);
+          expect(
+            prices,
+            'It should be an ordered array'
+          ).to.include.ordered.members(sortedArrayDesc);
+        }
       } else {
         expect(searchResult, 'It should be an empty array').to.be.an('array')
           .that.is.empty;
diff --git a/retail/interactive-tutorials/test/search-with-pagination.test.js b/retail/interactive-tutorials/test/search-with-pagination.test.js
@@ -38,8 +38,7 @@ describe('Search with pagination', () => {
       assert.match(stdout, /Search start/);
     });
 
-    // TODO(#4136): Re-enable this test. See https://github.com/GoogleCloudPlatform/nodejs-docs-samples/issues/4136
-    it.skip('should contain next page token', () => {
+    it('should contain next page token', () => {
       assert.match(stdout, /Next page token/);
     });
 
diff --git a/retail/interactive-tutorials/test/search-with-query-expansion-spec.test.js b/retail/interactive-tutorials/test/search-with-query-expansion-spec.test.js
@@ -97,8 +97,7 @@ describe('Search with query expansion spec', () => {
       }
     });
 
-    // TODO(#4136): Re-enable this test. See https://github.com/GoogleCloudPlatform/nodejs-docs-samples/issues/4136
-    it.skip('should contain expanded query', () => {
+    it('should contain expanded query', () => {
       const searchResponse = response[IResponseParams.ISearchResponse];
       expect(
         searchResponse.queryExpansionInfo,
diff --git a/run/hello-broken/test/e2e_test_cleanup.yaml b/run/hello-broken/test/e2e_test_cleanup.yaml
@@ -1,3 +1,17 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 
 - id: 'Delete image and service'
diff --git a/run/hello-broken/test/e2e_test_setup.yaml b/run/hello-broken/test/e2e_test_setup.yaml
@@ -1,3 +1,17 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 
 - id: 'Build Container Image'
diff --git a/run/helloworld/test/e2e_test_cleanup.yaml b/run/helloworld/test/e2e_test_cleanup.yaml
@@ -1,3 +1,17 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 
 - id: 'Delete image and service'
diff --git a/run/helloworld/test/e2e_test_setup.yaml b/run/helloworld/test/e2e_test_setup.yaml
@@ -1,3 +1,17 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 
 - id: 'Build Container Image'
diff --git a/run/image-processing/test/app.test.js b/run/image-processing/test/app.test.js
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 const path = require('path');
 const supertest = require('supertest');
 
diff --git a/run/image-processing/test/e2e_test_cleanup.yaml b/run/image-processing/test/e2e_test_cleanup.yaml
@@ -1,3 +1,17 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 
 - id: 'Delete image and service'
diff --git a/run/image-processing/test/e2e_test_setup.yaml b/run/image-processing/test/e2e_test_setup.yaml
@@ -1,3 +1,17 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 
 - id: 'Build Container Image'
diff --git a/run/logging-manual/metadata.js b/run/logging-manual/metadata.js
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 const request = require('got');
 
 // Load the project ID from GCP metadata server.
diff --git a/run/logging-manual/test/e2e_test_cleanup.yaml b/run/logging-manual/test/e2e_test_cleanup.yaml
@@ -1,3 +1,17 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 
 - id: 'Delete image and service'
diff --git a/run/logging-manual/test/e2e_test_setup.yaml b/run/logging-manual/test/e2e_test_setup.yaml
@@ -1,3 +1,17 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 
 - id: 'Build Container Image'
diff --git a/run/pubsub/test/e2e_test_cleanup.yaml b/run/pubsub/test/e2e_test_cleanup.yaml
@@ -1,3 +1,17 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 
 - id: 'Delete image and service'
diff --git a/run/pubsub/test/e2e_test_setup.yaml b/run/pubsub/test/e2e_test_setup.yaml
@@ -1,3 +1,17 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 
 - id: 'Build Container Image'
diff --git a/run/websockets/public/index.css b/run/websockets/public/index.css
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 html, body {
   height: 100%;
 }
diff --git a/run/websockets/test/e2e_test_cleanup.yaml b/run/websockets/test/e2e_test_cleanup.yaml
@@ -1,3 +1,17 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 
 - id: 'Delete image and service'
diff --git a/run/websockets/test/e2e_test_setup.yaml b/run/websockets/test/e2e_test_setup.yaml
@@ -1,3 +1,17 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 
 - id: 'Create VPC Access connector'

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,7 @@ describe('Search with query expansion spec', () => {`
`97`	`97`	`}`
`98`	`98`	`});`
`99`	`99`
`100`		`- // TODO(#4136): Re-enable this test. See https://github.com/GoogleCloudPlatform/nodejs-docs-samples/issues/4136`
`101`		`- it.skip('should contain expanded query', () => {`
	`100`	`+ it('should contain expanded query', () => {`
`102`	`101`	`const searchResponse = response[IResponseParams.ISearchResponse];`
`103`	`102`	`expect(`
`104`	`103`	`searchResponse.queryExpansionInfo,`