Merge branch 'renovate-3546' of github.com:googlecloudplatform/nodejs-docs-samples into renovate-3546

glasnt · glasnt · commit 115b41841a84 · 2023-11-09T16:03:05.000-08:00
diff --git a/.github/workflows/utils/ci-secrets.yaml.njk b/.github/workflows/utils/ci-secrets.yaml.njk
@@ -43,7 +43,7 @@ jobs:
       run:
         working-directory: '{{ path }}'
     steps:
-    - uses: actions/checkout@v3.5.3
+    - uses: actions/checkout@v4.1.0
       with:
         ref: ${% raw %}{{github.event.pull_request.head.sha}}{% endraw %}
     - uses: 'google-github-actions/auth@v1.1.1'
@@ -59,7 +59,7 @@ jobs:
           # TODO: Update secrets
           secret_key_1:nodejs-docs-samples-tests/secret-1
           secret_key_2:nodejs-docs-samples-tests/secret-2
-    - uses: actions/setup-node@v3.6.0
+    - uses: actions/setup-node@v3.8.0
       with:
         node-version: 16
     - name: Get npm cache directory
diff --git a/batch/create/create_script_job_with_template.js b/batch/create/create_script_job_with_template.js
@@ -89,7 +89,7 @@ function main(projectId, region, jobName, templateLink) {
   // Read more about machine types here: https://cloud.google.com/compute/docs/machine-types
   const allocationPolicy = new batch.AllocationPolicy();
   const instances = new batch.AllocationPolicy.InstancePolicyOrTemplate();
-  instances.templateLink = templateLink;
+  instances.instanceTemplate = templateLink;
   allocationPolicy.instances = [instances];
 
   const job = new batch.Job();
diff --git a/batch/test/advanced_creation.js b/batch/test/advanced_creation.js
@@ -176,7 +176,7 @@ function sleep(ms) {
 async function projectIdToNumber(projectId) {
   // Construct request
   const request = {
-    name: projectId,
+    name: `projects/${projectId}`,
   };
 
   // Run request
@@ -193,7 +193,7 @@ async function projectIdToNumber(projectId) {
  * @param {string} templateName - Name of the new template to create.
  */
 async function createTemplate(projectId, templateName) {
-  const projectNumber = projectIdToNumber(projectId);
+  const projectNumber = await projectIdToNumber(projectId);
   const serviceAccountAddress = `${projectNumber}-compute@developer.gserviceaccount.com`;
 
   const [response] = await instanceTemplatesClient.insert({
diff --git a/run/README.md b/run/README.md
@@ -125,7 +125,7 @@ testing.
 gcloud builds submit --tag gcr.io/${GOOGLE_CLOUD_PROJECT}/${SAMPLE}
 gcloud run deploy ${SAMPLE} \
   # Needed for Manual Logging sample.
-  --set-env-var GOOGLE_CLOUD_PROJECT=${GOOGLE_CLOUD_PROJECT} \
+  --set-env-vars GOOGLE_CLOUD_PROJECT=${GOOGLE_CLOUD_PROJECT} \
   --image gcr.io/${GOOGLE_CLOUD_PROJECT}/${SAMPLE}
 ```
 
