Merge remote-tracking branch 'mi-fork/fix-fhir-delete-resource' into feat/fhir-batch-1-resources

Author: angelcaamal

healthcare/fhir/deleteFhirResource.js

@@ -29,6 +29,7 @@ const main = (
     auth: new google.auth.GoogleAuth({
       scopes: ['https://www.googleapis.com/auth/cloud-platform'],
     }),
+    responseType: 'json',
   });
 
   const deleteFhirResource = async () => {
@@ -46,10 +47,14 @@ const main = (
     // fails, the server returns a 200 OK HTTP status code. To check that the
     // resource was successfully deleted, search for or get the resource and
     // see if it exists.
-    await healthcare.projects.locations.datasets.fhirStores.fhir.delete(
-      request
-    );
-    console.log('Deleted FHIR resource');
+    try {
+      await healthcare.projects.locations.datasets.fhirStores.fhir.delete(
+        request
+      );
+      console.log(`Deleted FHIR resource: ${resourceId}`);
+    } catch (error) {
+      console.error('Error deleting FHIR resource:', error.message || error);
+    }
   };
 
   deleteFhirResource();

healthcare/fhir/system-test/fhir_resources.test.js

@@ -181,7 +181,10 @@ it('should delete a FHIR resource', () => {
     `node deleteFhirResource.js ${projectId} ${cloudRegion} ${datasetId} ${fhirStoreId} ${resourceType} ${resourceId}`,
     {cwd}
   );
-  assert.strictEqual(new RegExp('Deleted FHIR resource').test(output), true);
+  assert.strictEqual(
+    new RegExp(`Deleted FHIR resource: ${resourceId}`).test(output),
+    true
+  );
 
   // Clean up
   execSync(