Delete batchClient_operations

Author: Joanna Grycz

batch/test/batchClient_operations.js

@@ -21,7 +21,6 @@ const assert = require('node:assert/strict');
 const {describe, it} = require('mocha');
 const cwd = path.join(__dirname, '..');
 const {BatchServiceClient} = require('@google-cloud/batch').v1;
-const {deleteJob} = require('./batchClient_operations');
 
 const cp = require('child_process');
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
@@ -37,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', () => {

batch/test/create_batch_custom_events.test.js

@@ -21,7 +21,6 @@ const assert = require('node:assert/strict');
 const {describe, it} = require('mocha');
 const cp = require('child_process');
 const {BatchServiceClient} = require('@google-cloud/batch').v1;
-const {deleteJob} = require('./batchClient_operations');
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
@@ -37,7 +36,9 @@ describe('Create batch custom network', 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 network', async () => {

batch/test/create_batch_custom_network.test.js

@@ -21,7 +21,6 @@ const assert = require('node:assert/strict');
 const {describe, it} = require('mocha');
 const cp = require('child_process');
 const {BatchServiceClient} = require('@google-cloud/batch').v1;
-const {deleteJob} = require('./batchClient_operations');
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
@@ -37,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 () => {

batch/test/create_batch_labels_allocation.test.js

@@ -21,7 +21,6 @@ const assert = require('node:assert/strict');
 const {describe, it} = require('mocha');
 const cp = require('child_process');
 const {BatchServiceClient} = require('@google-cloud/batch').v1;
-const {deleteJob} = require('./batchClient_operations');
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
@@ -37,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 () => {

batch/test/create_batch_labels_job.test.js

@@ -21,7 +21,6 @@ const assert = require('assert');
 const {describe, it} = require('mocha');
 const cp = require('child_process');
 const {BatchServiceClient} = require('@google-cloud/batch').v1;
-const {deleteJob} = require('./batchClient_operations');
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
@@ -37,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 () => {

batch/test/create_batch_labels_runnable.test.js

@@ -21,7 +21,6 @@ const assert = require('node:assert/strict');
 const {describe, it} = require('mocha');
 const cp = require('child_process');
 const {BatchServiceClient} = require('@google-cloud/batch').v1;
-const {deleteJob} = require('./batchClient_operations');
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
@@ -38,7 +37,9 @@ describe('Create batch notifications', 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 batch notifications', async () => {

batch/test/create_batch_notifications.test.js

@@ -22,7 +22,6 @@ const {describe, it} = require('mocha');
 const cp = require('child_process');
 const {BatchServiceClient} = require('@google-cloud/batch').v1;
 const {ProjectsClient} = require('@google-cloud/resource-manager').v3;
-const {deleteJob} = require('./batchClient_operations');
 
 const cwd = path.join(__dirname, '..');
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
@@ -51,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 () => {

batch/test/create_batch_using_service_account.test.js

@@ -21,7 +21,6 @@ const assert = require('node:assert/strict');
 const {describe, it} = require('mocha');
 const cp = require('child_process');
 const {BatchServiceClient} = require('@google-cloud/batch').v1;
-const {deleteJob} = require('./batchClient_operations');
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
@@ -37,7 +36,9 @@ describe('Create batch GPU 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 GPU', async () => {

batch/test/create_gpu_job.test.js

@@ -21,7 +21,6 @@ const assert = require('node:assert/strict');
 const {describe, it} = require('mocha');
 const cp = require('child_process');
 const {BatchServiceClient} = require('@google-cloud/batch').v1;
-const {deleteJob} = require('./batchClient_operations');
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
@@ -37,7 +36,9 @@ describe('Create batch GPU job on N1', 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 GPU on N1', async () => {

batch/test/create_gpu_job_n1.test.js

@@ -21,7 +21,6 @@ const assert = require('node:assert/strict');
 const {describe, it} = require('mocha');
 const cp = require('child_process');
 const {BatchServiceClient} = require('@google-cloud/batch').v1;
-const {deleteJob} = require('./batchClient_operations');
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
@@ -37,7 +36,9 @@ describe('Create batch local ssd 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 local ssd', async () => {

batch/test/create_local_ssd_job.test.js

@@ -21,7 +21,6 @@ const assert = require('node:assert/strict');
 const {describe, it} = require('mocha');
 const cp = require('child_process');
 const {BatchServiceClient} = require('@google-cloud/batch').v1;
-const {deleteJob} = require('./batchClient_operations');
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
@@ -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 () => {

batch/test/create_nfs_job.test.js

@@ -21,7 +21,6 @@ const assert = require('node:assert/strict');
 const {describe, it} = require('mocha');
 const cp = require('child_process');
 const {BatchServiceClient} = require('@google-cloud/batch').v1;
-const {deleteJob} = require('./batchClient_operations');
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
@@ -37,7 +36,9 @@ describe('Create batch job with persistent disk', 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 persistent disk', async () => {

batch/test/create_persistent_disk_job.test.js

@@ -21,7 +21,6 @@ const assert = require('node:assert/strict');
 const {describe, it} = require('mocha');
 const cp = require('child_process');
 const {BatchServiceClient} = require('@google-cloud/batch').v1;
-const {deleteJob} = require('./batchClient_operations');
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
@@ -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 () => {