diff --git a/batch/create/create_batch_custom_network.js b/batch/create/create_batch_custom_network.js new file mode 100644 index 0000000000..a866d10d91 --- /dev/null +++ b/batch/create/create_batch_custom_network.js @@ -0,0 +1,134 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * https://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. + */ + +'use strict'; + +async function main() { + // [START batch_create_custom_network] + // Imports the Batch library + const batchLib = require('@google-cloud/batch'); + const batch = batchLib.protos.google.cloud.batch.v1; + + // Instantiates a client + const batchClient = new batchLib.v1.BatchServiceClient(); + + /** + * TODO(developer): Update these variables before running the sample. + */ + // Project ID or project number of the Google Cloud project you want to use. + const projectId = await batchClient.getProjectId(); + // Name of the region you want to use to run the job. Regions that are + // available for Batch are listed on: https://cloud.google.com/batch/docs/get-started#locations + const region = 'europe-central2'; + // The name of the job that will be created. + // It needs to be unique for each project and region pair. + const jobName = 'example-job'; + // The name of a VPC network in the current project or a Shared VPC network that is hosted by + // or shared with the current project. + const network = 'global/networks/test-network'; + // The name of a subnetwork that is part of the VPC network and is located + // in the same region as the VMs for the job. + const subnetwork = `regions/${region}/subnetworks/subnet`; + + // Define what will be done as part of the job. + const runnable = new batch.Runnable({ + script: new batch.Runnable.Script({ + commands: ['-c', 'echo Hello world! This is task ${BATCH_TASK_INDEX}.'], + }), + }); + + // Specify what resources are requested by each task. + const computeResource = new batch.ComputeResource({ + // In milliseconds per cpu-second. This means the task requires 50% of a single CPUs. + cpuMilli: 500, + // In MiB. + memoryMib: 16, + }); + + const task = new batch.TaskSpec({ + runnables: [runnable], + computeResource, + maxRetryCount: 2, + maxRunDuration: {seconds: 3600}, + }); + + // Tasks are grouped inside a job using TaskGroups. + const group = new batch.TaskGroup({ + taskCount: 3, + taskSpec: task, + }); + + // Specify VPC network and a subnet for Allocation Policy + const networkPolicy = new batch.AllocationPolicy.NetworkPolicy({ + networkInterfaces: [ + new batch.AllocationPolicy.NetworkInterface({ + // Set the network name + network, + // Set the subnetwork name + subnetwork, + // Blocks external access for all VMs + noExternalIpAddress: true, + }), + ], + }); + + // Policies are used to define on what kind of virtual machines the tasks will run on. + // In this case, we tell the system to use "e2-standard-4" machine type. + // Read more about machine types here: https://cloud.google.com/compute/docs/machine-types + const instancePolicy = new batch.AllocationPolicy.InstancePolicy({ + machineType: 'e2-standard-4', + }); + + const allocationPolicy = new batch.AllocationPolicy.InstancePolicyOrTemplate({ + policy: instancePolicy, + network: networkPolicy, + }); + + const job = new batch.Job({ + name: jobName, + taskGroups: [group], + labels: {env: 'testing', type: 'script'}, + allocationPolicy, + // We use Cloud Logging as it's an option available out of the box + logsPolicy: new batch.LogsPolicy({ + destination: batch.LogsPolicy.Destination.CLOUD_LOGGING, + }), + }); + + // The job's parent is the project and region in which the job will run + const parent = `projects/${projectId}/locations/${region}`; + + async function callCreateBatchCustomNetwork() { + // Construct request + const request = { + parent, + jobId: jobName, + job, + }; + + // Run request + const [response] = await batchClient.createJob(request); + console.log(JSON.stringify(response)); + } + + await callCreateBatchCustomNetwork(); + // [END batch_create_custom_network] +} + +main().catch(err => { + console.error(err.message); + process.exitCode = 1; +}); diff --git a/batch/test/advanced_creation.test.js b/batch/test/advanced_creation.test.js index 875f47274a..d7075263bb 100644 --- a/batch/test/advanced_creation.test.js +++ b/batch/test/advanced_creation.test.js @@ -18,14 +18,9 @@ const path = require('path'); const cp = require('child_process'); const {describe, it, before} = require('mocha'); const {BatchServiceClient} = require('@google-cloud/batch').v1; -const batchClient = new BatchServiceClient(); const {Storage} = require('@google-cloud/storage'); -const storage = new Storage(); const {ProjectsClient} = require('@google-cloud/resource-manager').v3; -const resourcemanagerClient = new ProjectsClient(); const compute = require('@google-cloud/compute'); -const instanceTemplatesClient = new compute.InstanceTemplatesClient(); - // get a short ID for this test run that only contains characters that are valid in UUID // (a plain UUID won't do because we want the "test-job-js" prefix and that would exceed the length limit) const {customAlphabet} = require('nanoid'); @@ -36,6 +31,11 @@ const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); const cwd = path.join(__dirname, '..'); +const batchClient = new BatchServiceClient(); +const storage = new Storage(); +const resourcemanagerClient = new ProjectsClient(); +const instanceTemplatesClient = new compute.InstanceTemplatesClient(); + describe('Create jobs with container, template and bucket', () => { let projectId; let bucketName; diff --git a/batch/test/batchClient_operations.js b/batch/test/batchClient_operations.js deleted file mode 100644 index 84342be856..0000000000 --- a/batch/test/batchClient_operations.js +++ /dev/null @@ -1,30 +0,0 @@ -// 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. -// You may obtain a copy of the License at -// -// https://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. - -'use strict'; - -async function deleteJob(batchClient, projectId, region, jobId) { - const request = { - name: `projects/${projectId}/locations/${region}/jobs/${jobId}`, - }; - try { - await batchClient.deleteJob(request); - } catch (err) { - console.error('Deleting job failed: ', err); - } -} - -module.exports = { - deleteJob, -}; diff --git a/batch/test/create_batch_custom_events.test.js b/batch/test/create_batch_custom_events.test.js index 3a5463042d..dc0ba14a41 100644 --- a/batch/test/create_batch_custom_events.test.js +++ b/batch/test/create_batch_custom_events.test.js @@ -17,18 +17,18 @@ 'use strict'; const path = require('path'); -const assert = require('assert'); +const assert = require('node:assert/strict'); const {describe, it} = require('mocha'); -const cp = require('child_process'); -const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); const cwd = path.join(__dirname, '..'); const {BatchServiceClient} = require('@google-cloud/batch').v1; -const {deleteJob} = require('./batchClient_operations'); -const batchClient = new BatchServiceClient(); + +const cp = require('child_process'); +const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); describe('Create batch custom events job', async () => { const jobName = 'batch-custom-events-job'; const region = 'europe-central2'; + const batchClient = new BatchServiceClient(); let projectId; before(async () => { @@ -36,7 +36,9 @@ describe('Create batch custom events job', async () => { }); after(async () => { - await deleteJob(batchClient, projectId, region, jobName); + await batchClient.deleteJob({ + name: `projects/${projectId}/locations/${region}/jobs/${jobName}`, + }); }); it('should create a new job with custom events', () => { diff --git a/batch/test/create_batch_custom_network.test.js b/batch/test/create_batch_custom_network.test.js new file mode 100644 index 0000000000..54449b09e0 --- /dev/null +++ b/batch/test/create_batch_custom_network.test.js @@ -0,0 +1,63 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * https://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. + */ + +'use strict'; + +const path = require('path'); +const assert = require('node:assert/strict'); +const {describe, it} = require('mocha'); +const cp = require('child_process'); +const {BatchServiceClient} = require('@google-cloud/batch').v1; + +const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); +const cwd = path.join(__dirname, '..'); + +describe('Create batch custom network', async () => { + const jobName = 'example-job'; + const region = 'europe-central2'; + const batchClient = new BatchServiceClient(); + let projectId; + + before(async () => { + projectId = await batchClient.getProjectId(); + }); + + after(async () => { + await batchClient.deleteJob({ + name: `projects/${projectId}/locations/${region}/jobs/${jobName}`, + }); + }); + + it('should create a new job with custom network', async () => { + const expectedNetwork = { + networkInterfaces: [ + { + network: 'global/networks/test-network', + noExternalIpAddress: true, + subnetwork: `regions/${region}/subnetworks/subnet`, + }, + ], + }; + + const response = JSON.parse( + execSync('node ./create/create_batch_custom_network.js', { + cwd, + }) + ); + + assert.deepEqual(response.allocationPolicy.network, expectedNetwork); + }); +}); diff --git a/batch/test/create_batch_labels_allocation.test.js b/batch/test/create_batch_labels_allocation.test.js index 262f647549..cf1a9f4714 100644 --- a/batch/test/create_batch_labels_allocation.test.js +++ b/batch/test/create_batch_labels_allocation.test.js @@ -17,18 +17,18 @@ 'use strict'; const path = require('path'); -const assert = require('assert'); +const assert = require('node:assert/strict'); const {describe, it} = require('mocha'); const cp = require('child_process'); +const {BatchServiceClient} = require('@google-cloud/batch').v1; + const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); const cwd = path.join(__dirname, '..'); -const {BatchServiceClient} = require('@google-cloud/batch').v1; -const {deleteJob} = require('./batchClient_operations'); -const batchClient = new BatchServiceClient(); describe('Create batch labels allocation', async () => { const jobName = 'batch-labels-allocation-job'; const region = 'europe-central2'; + const batchClient = new BatchServiceClient(); let projectId; before(async () => { @@ -36,7 +36,9 @@ describe('Create batch labels allocation', async () => { }); after(async () => { - await deleteJob(batchClient, projectId, region, jobName); + await batchClient.deleteJob({ + name: `projects/${projectId}/locations/${region}/jobs/${jobName}`, + }); }); it('should create a new job with allocation policy labels', async () => { diff --git a/batch/test/create_batch_labels_job.test.js b/batch/test/create_batch_labels_job.test.js index 1777973ec1..ff7bb900fb 100644 --- a/batch/test/create_batch_labels_job.test.js +++ b/batch/test/create_batch_labels_job.test.js @@ -17,18 +17,18 @@ 'use strict'; const path = require('path'); -const assert = require('assert'); +const assert = require('node:assert/strict'); const {describe, it} = require('mocha'); const cp = require('child_process'); +const {BatchServiceClient} = require('@google-cloud/batch').v1; + const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); const cwd = path.join(__dirname, '..'); -const {BatchServiceClient} = require('@google-cloud/batch').v1; -const {deleteJob} = require('./batchClient_operations'); -const batchClient = new BatchServiceClient(); describe('Create batch labels for job', async () => { const jobName = 'batch-labels-job'; const region = 'europe-central2'; + const batchClient = new BatchServiceClient(); let projectId; before(async () => { @@ -36,7 +36,9 @@ describe('Create batch labels for job', async () => { }); after(async () => { - await deleteJob(batchClient, projectId, region, jobName); + await batchClient.deleteJob({ + name: `projects/${projectId}/locations/${region}/jobs/${jobName}`, + }); }); it('should create a new job with labels', async () => { diff --git a/batch/test/create_batch_labels_runnable.test.js b/batch/test/create_batch_labels_runnable.test.js index aeffd9a3a7..5a4c79234c 100644 --- a/batch/test/create_batch_labels_runnable.test.js +++ b/batch/test/create_batch_labels_runnable.test.js @@ -20,15 +20,15 @@ const path = require('path'); const assert = require('assert'); const {describe, it} = require('mocha'); const cp = require('child_process'); +const {BatchServiceClient} = require('@google-cloud/batch').v1; + const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); const cwd = path.join(__dirname, '..'); -const {BatchServiceClient} = require('@google-cloud/batch').v1; -const {deleteJob} = require('./batchClient_operations'); -const batchClient = new BatchServiceClient(); describe('Create batch labels runnable', async () => { const jobName = 'example-job'; const region = 'us-central1'; + const batchClient = new BatchServiceClient(); let projectId; before(async () => { @@ -36,7 +36,9 @@ describe('Create batch labels runnable', async () => { }); after(async () => { - await deleteJob(batchClient, projectId, region, jobName); + await batchClient.deleteJob({ + name: `projects/${projectId}/locations/${region}/jobs/${jobName}`, + }); }); it('should create a new job with labels for runnables', async () => { diff --git a/batch/test/create_batch_notifications.test.js b/batch/test/create_batch_notifications.test.js index 164d110d74..ea85682d6f 100644 --- a/batch/test/create_batch_notifications.test.js +++ b/batch/test/create_batch_notifications.test.js @@ -17,30 +17,19 @@ 'use strict'; const path = require('path'); -const assert = require('assert'); +const assert = require('node:assert/strict'); const {describe, it} = require('mocha'); const cp = require('child_process'); -const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); -const cwd = path.join(__dirname, '..'); const {BatchServiceClient} = require('@google-cloud/batch').v1; -const batchClient = new BatchServiceClient(); -async function deleteJob(projectId, region, jobId) { - const request = { - name: `projects/${projectId}/locations/${region}/jobs/${jobId}`, - }; - try { - await batchClient.deleteJob(request); - } catch (err) { - console.error('Error deleting job:', err); - } -} +const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); +const cwd = path.join(__dirname, '..'); describe('Create batch notifications', async () => { const jobName = 'job-name-batch-notifications'; const region = 'europe-central2'; const topicId = 'topic-id'; - + const batchClient = new BatchServiceClient(); let projectId; before(async () => { @@ -48,7 +37,9 @@ describe('Create batch notifications', async () => { }); after(async () => { - await deleteJob(projectId, region, jobName); + await batchClient.deleteJob({ + name: `projects/${projectId}/locations/${region}/jobs/${jobName}`, + }); }); it('should create a new job with batch notifications', async () => { diff --git a/batch/test/create_batch_using_service_account.test.js b/batch/test/create_batch_using_service_account.test.js index e0d2cebffb..8d27822cc0 100644 --- a/batch/test/create_batch_using_service_account.test.js +++ b/batch/test/create_batch_using_service_account.test.js @@ -17,18 +17,17 @@ 'use strict'; const path = require('path'); -const assert = require('assert'); +const assert = require('node:assert/strict'); const {describe, it} = require('mocha'); const cp = require('child_process'); -const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); -const cwd = path.join(__dirname, '..'); const {BatchServiceClient} = require('@google-cloud/batch').v1; const {ProjectsClient} = require('@google-cloud/resource-manager').v3; -const {deleteJob} = require('./batchClient_operations'); -const batchClient = new BatchServiceClient(); -const resourceManagerClient = new ProjectsClient(); + +const cwd = path.join(__dirname, '..'); +const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); async function getProjectNumber(projectId) { + const resourceManagerClient = new ProjectsClient(); // Construct request const request = { name: `projects/${projectId}`, @@ -42,6 +41,7 @@ async function getProjectNumber(projectId) { describe('Create batch job using service account', async () => { const jobName = 'batch-service-account-job'; const region = 'europe-central2'; + const batchClient = new BatchServiceClient(); let projectId, serviceAccountEmail; before(async () => { @@ -50,7 +50,9 @@ describe('Create batch job using service account', async () => { }); afterEach(async () => { - await deleteJob(batchClient, projectId, region, jobName); + await batchClient.deleteJob({ + name: `projects/${projectId}/locations/${region}/jobs/${jobName}`, + }); }); it('should create a new job using serviceAccount', async () => { diff --git a/batch/test/create_gpu_job.test.js b/batch/test/create_gpu_job.test.js index 58c076d017..634916c9bb 100644 --- a/batch/test/create_gpu_job.test.js +++ b/batch/test/create_gpu_job.test.js @@ -17,28 +17,18 @@ 'use strict'; const path = require('path'); -const assert = require('assert'); +const assert = require('node:assert/strict'); const {describe, it} = require('mocha'); const cp = require('child_process'); -const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); -const cwd = path.join(__dirname, '..'); const {BatchServiceClient} = require('@google-cloud/batch').v1; -const batchClient = new BatchServiceClient(); -async function deleteJob(projectId, region, jobId) { - const request = { - name: `projects/${projectId}/locations/${region}/jobs/${jobId}`, - }; - try { - await batchClient.deleteJob(request); - } catch (err) { - console.error('Error deleting job:', err); - } -} +const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); +const cwd = path.join(__dirname, '..'); describe('Create batch GPU job', async () => { const jobName = 'batch-gpu-job'; const region = 'europe-central2'; + const batchClient = new BatchServiceClient(); let projectId; before(async () => { @@ -46,7 +36,9 @@ describe('Create batch GPU job', async () => { }); after(async () => { - await deleteJob(projectId, region, jobName); + await batchClient.deleteJob({ + name: `projects/${projectId}/locations/${region}/jobs/${jobName}`, + }); }); it('should create a new job with GPU', async () => { diff --git a/batch/test/create_gpu_job_n1.test.js b/batch/test/create_gpu_job_n1.test.js index a26ea8b7ab..f0c52b9021 100644 --- a/batch/test/create_gpu_job_n1.test.js +++ b/batch/test/create_gpu_job_n1.test.js @@ -17,28 +17,18 @@ 'use strict'; const path = require('path'); -const assert = require('assert'); +const assert = require('node:assert/strict'); const {describe, it} = require('mocha'); const cp = require('child_process'); -const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); -const cwd = path.join(__dirname, '..'); const {BatchServiceClient} = require('@google-cloud/batch').v1; -const batchClient = new BatchServiceClient(); -async function deleteJob(projectId, region, jobId) { - const request = { - name: `projects/${projectId}/locations/${region}/jobs/${jobId}`, - }; - try { - await batchClient.deleteJob(request); - } catch (err) { - console.error('Error deleting job:', err); - } -} +const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); +const cwd = path.join(__dirname, '..'); describe('Create batch GPU job on N1', async () => { const jobName = 'batch-gpu-job-n1'; const region = 'europe-central2'; + const batchClient = new BatchServiceClient(); let projectId; before(async () => { @@ -46,7 +36,9 @@ describe('Create batch GPU job on N1', async () => { }); after(async () => { - await deleteJob(projectId, region, jobName); + await batchClient.deleteJob({ + name: `projects/${projectId}/locations/${region}/jobs/${jobName}`, + }); }); it('should create a new job with GPU on N1', async () => { diff --git a/batch/test/create_local_ssd_job.test.js b/batch/test/create_local_ssd_job.test.js index 773f6ffa7e..f2396dff56 100644 --- a/batch/test/create_local_ssd_job.test.js +++ b/batch/test/create_local_ssd_job.test.js @@ -17,29 +17,18 @@ 'use strict'; const path = require('path'); -const assert = require('assert'); +const assert = require('node:assert/strict'); const {describe, it} = require('mocha'); const cp = require('child_process'); -const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); -const cwd = path.join(__dirname, '..'); const {BatchServiceClient} = require('@google-cloud/batch').v1; -const batchClient = new BatchServiceClient(); -async function deleteJob(projectId, region, jobId) { - const request = { - name: `projects/${projectId}/locations/${region}/jobs/${jobId}`, - }; - try { - await batchClient.deleteJob(request); - } catch (err) { - console.error('Error deleting job:', err); - } -} +const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); +const cwd = path.join(__dirname, '..'); describe('Create batch local ssd job', async () => { const jobName = 'batch-local-ssd-job'; const region = 'europe-central2'; - + const batchClient = new BatchServiceClient(); let projectId; before(async () => { @@ -47,7 +36,9 @@ describe('Create batch local ssd job', async () => { }); after(async () => { - await deleteJob(projectId, region, jobName); + await batchClient.deleteJob({ + name: `projects/${projectId}/locations/${region}/jobs/${jobName}`, + }); }); it('should create a new job with local ssd', async () => { diff --git a/batch/test/create_nfs_job.test.js b/batch/test/create_nfs_job.test.js index f463da5020..ff73d979d5 100644 --- a/batch/test/create_nfs_job.test.js +++ b/batch/test/create_nfs_job.test.js @@ -17,19 +17,18 @@ 'use strict'; const path = require('path'); -const assert = require('assert'); +const assert = require('node:assert/strict'); const {describe, it} = require('mocha'); const cp = require('child_process'); +const {BatchServiceClient} = require('@google-cloud/batch').v1; + const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); const cwd = path.join(__dirname, '..'); -const {BatchServiceClient} = require('@google-cloud/batch').v1; -const {deleteJob} = require('./batchClient_operations'); -const batchClient = new BatchServiceClient(); describe('Create batch NFS job', async () => { const jobName = 'batch-nfs-job'; const region = 'europe-central2'; - + const batchClient = new BatchServiceClient(); let projectId; before(async () => { @@ -37,7 +36,9 @@ describe('Create batch NFS job', async () => { }); after(async () => { - await deleteJob(batchClient, projectId, region, jobName); + await batchClient.deleteJob({ + name: `projects/${projectId}/locations/${region}/jobs/${jobName}`, + }); }); it('should create a new job with NFS', async () => { diff --git a/batch/test/create_persistent_disk_job.test.js b/batch/test/create_persistent_disk_job.test.js index e373e95ed6..9228273a6b 100644 --- a/batch/test/create_persistent_disk_job.test.js +++ b/batch/test/create_persistent_disk_job.test.js @@ -17,29 +17,18 @@ 'use strict'; const path = require('path'); -const assert = require('assert'); +const assert = require('node:assert/strict'); const {describe, it} = require('mocha'); const cp = require('child_process'); -const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); -const cwd = path.join(__dirname, '..'); const {BatchServiceClient} = require('@google-cloud/batch').v1; -const batchClient = new BatchServiceClient(); -async function deleteJob(projectId, region, jobId) { - const request = { - name: `projects/${projectId}/locations/${region}/jobs/${jobId}`, - }; - try { - await batchClient.deleteJob(request); - } catch (err) { - console.error('Error deleting job:', err); - } -} +const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); +const cwd = path.join(__dirname, '..'); describe('Create batch job with persistent disk', async () => { const jobName = 'batch-create-persistent-disk-job'; const region = 'europe-central2'; - + const batchClient = new BatchServiceClient(); let projectId; before(async () => { @@ -47,7 +36,9 @@ describe('Create batch job with persistent disk', async () => { }); after(async () => { - await deleteJob(projectId, region, jobName); + await batchClient.deleteJob({ + name: `projects/${projectId}/locations/${region}/jobs/${jobName}`, + }); }); it('should create a new job with persistent disk', async () => { diff --git a/batch/test/create_using_secret_manager.test.js b/batch/test/create_using_secret_manager.test.js index 6a963dd174..fbe45f15e6 100644 --- a/batch/test/create_using_secret_manager.test.js +++ b/batch/test/create_using_secret_manager.test.js @@ -17,19 +17,18 @@ 'use strict'; const path = require('path'); -const assert = require('assert'); +const assert = require('node:assert/strict'); const {describe, it} = require('mocha'); const cp = require('child_process'); +const {BatchServiceClient} = require('@google-cloud/batch').v1; + const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'}); const cwd = path.join(__dirname, '..'); -const {BatchServiceClient} = require('@google-cloud/batch').v1; -const {deleteJob} = require('./batchClient_operations'); -const batchClient = new BatchServiceClient(); describe('Create batch using secret manager', async () => { const jobName = 'batch-job-secret-manager'; const region = 'europe-central2'; - + const batchClient = new BatchServiceClient(); let projectId; before(async () => { @@ -37,7 +36,9 @@ describe('Create batch using secret manager', async () => { }); after(async () => { - await deleteJob(batchClient, projectId, region, jobName); + await batchClient.deleteJob({ + name: `projects/${projectId}/locations/${region}/jobs/${jobName}`, + }); }); it('should create a new job using secret manager', async () => {