healthcare API: update hl7v2, datasets, and DICOM samples from v1beta1 to v1 (GoogleCloudPlatform#1732)

noerog · fhinkel · web-flow · commit 71b335ff544c · 2020-04-21T15:36:31.000-04:00
Co-authored-by: F. Hinkelmann &lt;franziska.hinkelmann@gmail.com&gt;
diff --git a/healthcare/datasets/createDataset.js b/healthcare/datasets/createDataset.js
@@ -23,7 +23,7 @@ const main = (
 ) => {
   // [START healthcare_create_dataset]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const createDataset = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/datasets/deidentifyDataset.js b/healthcare/datasets/deidentifyDataset.js
@@ -25,7 +25,7 @@ const main = (
 ) => {
   // [START healthcare_dicom_keeplist_deidentify_dataset]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const deidentifyDataset = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/datasets/deleteDataset.js b/healthcare/datasets/deleteDataset.js
@@ -23,7 +23,7 @@ const main = (
 ) => {
   // [START healthcare_delete_dataset]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const deleteDataset = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/datasets/getDataset.js b/healthcare/datasets/getDataset.js
@@ -23,7 +23,7 @@ const main = (
 ) => {
   // [START healthcare_get_dataset]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const getDataset = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/datasets/getDatasetIamPolicy.js b/healthcare/datasets/getDatasetIamPolicy.js
@@ -23,7 +23,7 @@ const main = (
 ) => {
   // [START healthcare_dataset_get_iam_policy]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const getDatasetIamPolicy = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/datasets/listDatasets.js b/healthcare/datasets/listDatasets.js
@@ -22,7 +22,7 @@ const main = (
 ) => {
   // [START healthcare_list_datasets]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const listDatasets = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/datasets/package.json b/healthcare/datasets/package.json
@@ -15,7 +15,7 @@
     "mocha": "^7.0.0"
   },
   "dependencies": {
-    "googleapis": "^48.0.0",
+    "googleapis": "^49.0.0",
     "uuid": "^7.0.0",
     "yargs": "^15.0.0"
   },
diff --git a/healthcare/datasets/patchDataset.js b/healthcare/datasets/patchDataset.js
@@ -24,7 +24,7 @@ const main = (
 ) => {
   // [START healthcare_patch_dataset]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const patchDataset = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/datasets/setDatasetIamPolicy.js b/healthcare/datasets/setDatasetIamPolicy.js
@@ -25,7 +25,7 @@ const main = (
 ) => {
   // [START healthcare_dataset_set_iam_policy]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const setDatasetIamPolicy = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/datasets/system-test/datasets.test.js b/healthcare/datasets/system-test/datasets.test.js
@@ -19,7 +19,6 @@ const assert = require('assert');
 const uuid = require('uuid');
 const {execSync} = require('child_process');
 
-const cwd = path.join(__dirname, '..');
 const projectId = process.env.GCLOUD_PROJECT;
 const datasetId = `dataset-${uuid.v4()}`.replace(/-/gi, '_');
 const destinationDatasetId = `destination-${uuid.v4()}`.replace(/-/gi, '_');
@@ -39,25 +38,22 @@ before(() => {
 after(() => {
   try {
     execSync(
-      `node deleteDataset.js ${projectId} ${cloudRegion} ${destinationDatasetId}`,
-      cwd
+      `node deleteDataset.js ${projectId} ${cloudRegion} ${destinationDatasetId}`
     );
     // eslint-disable-next-line no-empty
   } catch (err) {} // Ignore error
 });
 
 it('should create a dataset', () => {
   const output = execSync(
-    `node createDataset.js ${projectId} ${cloudRegion} ${datasetId}`,
-    cwd
+    `node createDataset.js ${projectId} ${cloudRegion} ${datasetId}`
   );
-  assert.strictEqual(output, `Created dataset: ${datasetId}`);
+  assert.ok(output.includes('Created dataset'));
 });
 
 it('should get a dataset', () => {
   const output = execSync(
     `node getDataset.js ${projectId} ${cloudRegion} ${datasetId}`,
-    cwd
   );
   assert.ok(output.includes('name'));
 });
@@ -66,30 +62,24 @@ it('should patch a dataset', () => {
   const timeZone = 'GMT';
   const output = execSync(
     `node patchDataset.js ${projectId} ${cloudRegion} ${datasetId} ${timeZone}`,
-    cwd
   );
-  assert.strictEqual(
-    output,
-    `Dataset ${datasetId} patched with time zone ${timeZone}`
+  assert.ok(
+    output.includes('patched with time zone')
   );
 });
 
 it('should list datasets', () => {
-  const output = execSync(
-    `node listDatasets.js ${projectId} ${cloudRegion}`,
-    cwd
-  );
+  const output = execSync(`node listDatasets.js ${projectId} ${cloudRegion}`, {
+  });
   assert.ok(output.includes('datasets'));
 });
 
 it('should de-identify data in a dataset and write to a new dataset', () => {
   const output = execSync(
     `node deidentifyDataset.js ${projectId} ${cloudRegion} ${datasetId} ${destinationDatasetId} ${keeplistTags}`,
-    cwd
   );
-  assert.strictEqual(
-    output,
-    `De-identified data written from dataset ${datasetId} to dataset ${destinationDatasetId}`
+  assert.ok(
+    output.includes('De-identified data written')
   );
 });
 
@@ -99,7 +89,6 @@ it('should create and get a dataset IAM policy', () => {
 
   let output = execSync(
     `node setDatasetIamPolicy.js ${projectId} ${cloudRegion} ${datasetId} ${localMember} ${localRole}`,
-    cwd
   );
   assert.ok(output.includes, 'ETAG');
 
@@ -112,7 +101,6 @@ it('should create and get a dataset IAM policy', () => {
 it('should delete a dataset', () => {
   const output = execSync(
     `node deleteDataset.js ${projectId} ${cloudRegion} ${datasetId}`,
-    cwd
   );
-  assert.strictEqual(output, `Deleted dataset: ${datasetId}`);
+  assert.ok(output.includes('Deleted dataset'));
 });
diff --git a/healthcare/dicom/createDicomStore.js b/healthcare/dicom/createDicomStore.js
@@ -24,7 +24,7 @@ const main = (
 ) => {
   // [START healthcare_create_dicom_store]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const createDicomStore = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/dicom/deleteDicomStore.js b/healthcare/dicom/deleteDicomStore.js
@@ -24,7 +24,7 @@ const main = (
 ) => {
   // [START healthcare_delete_dicom_store]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const deleteDicomStore = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/dicom/dicomWebDeleteStudy.js b/healthcare/dicom/dicomWebDeleteStudy.js
@@ -25,7 +25,7 @@ const main = (
 ) => {
   // [START healthcare_dicomweb_delete_study]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const dicomWebDeleteStudy = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/dicom/dicomWebRetrieveInstance.js b/healthcare/dicom/dicomWebRetrieveInstance.js
@@ -27,7 +27,7 @@ const main = (
 ) => {
   // [START healthcare_dicomweb_retrieve_instance]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
   const fs = require('fs');
   const util = require('util');
   const writeFile = util.promisify(fs.writeFile);
diff --git a/healthcare/dicom/dicomWebRetrieveRendered.js b/healthcare/dicom/dicomWebRetrieveRendered.js
@@ -27,7 +27,7 @@ const main = (
 ) => {
   // [START healthcare_dicomweb_retrieve_rendered]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
   const fs = require('fs');
   const util = require('util');
   const writeFile = util.promisify(fs.writeFile);
diff --git a/healthcare/dicom/dicomWebRetrieveStudy.js b/healthcare/dicom/dicomWebRetrieveStudy.js
@@ -25,7 +25,7 @@ const main = (
 ) => {
   // [START healthcare_dicomweb_retrieve_study]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
   const fs = require('fs');
   const util = require('util');
   const writeFile = util.promisify(fs.writeFile);
diff --git a/healthcare/dicom/dicomWebSearchForInstances.js b/healthcare/dicom/dicomWebSearchForInstances.js
@@ -24,7 +24,7 @@ const main = (
 ) => {
   // [START healthcare_dicomweb_search_instances]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const dicomWebSearchForInstances = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/dicom/dicomWebSearchStudies.js b/healthcare/dicom/dicomWebSearchStudies.js
@@ -24,7 +24,7 @@ const main = (
 ) => {
   // [START healthcare_dicomweb_search_studies]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const dicomWebSearchStudies = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/dicom/dicomWebStoreInstance.js b/healthcare/dicom/dicomWebStoreInstance.js
@@ -25,7 +25,7 @@ const main = (
 ) => {
   // [START healthcare_dicomweb_store_instance]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
   const fs = require('fs');
   const binaryData = fs.createReadStream(dcmFile);
 
diff --git a/healthcare/dicom/exportDicomInstanceGcs.js b/healthcare/dicom/exportDicomInstanceGcs.js
@@ -25,7 +25,7 @@ const main = (
 ) => {
   // [START healthcare_export_dicom_instance_gcs]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const exportDicomInstanceGcs = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/dicom/getDicomStore.js b/healthcare/dicom/getDicomStore.js
@@ -24,7 +24,7 @@ const main = (
 ) => {
   // [START healthcare_get_dicom_store]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const getDicomStore = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/dicom/getDicomStoreIamPolicy.js b/healthcare/dicom/getDicomStoreIamPolicy.js
@@ -24,7 +24,7 @@ const main = (
 ) => {
   // [START healthcare_dicom_store_get_iam_policy]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const getDicomStoreIamPolicy = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/dicom/importDicomInstance.js b/healthcare/dicom/importDicomInstance.js
@@ -25,7 +25,7 @@ const main = (
 ) => {
   // [START healthcare_import_dicom_instance]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
   const sleep = require('../sleep');
 
   const importDicomInstance = async () => {
diff --git a/healthcare/dicom/listDicomStores.js b/healthcare/dicom/listDicomStores.js
@@ -23,7 +23,7 @@ const main = (
 ) => {
   // [START healthcare_list_dicom_stores]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const listDicomStores = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/dicom/package.json b/healthcare/dicom/package.json
@@ -17,7 +17,7 @@
     "mocha": "^7.0.0"
   },
   "dependencies": {
-    "googleapis": "^48.0.0",
+    "googleapis": "^49.0.0",
     "uuid": "^7.0.0",
     "yargs": "^15.0.0",
     "gtoken": "^5.0.0",
diff --git a/healthcare/dicom/patchDicomStore.js b/healthcare/dicom/patchDicomStore.js
@@ -25,7 +25,7 @@ const main = (
 ) => {
   // [START healthcare_patch_dicom_store]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const patchDicomStore = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/dicom/setDicomStoreIamPolicy.js b/healthcare/dicom/setDicomStoreIamPolicy.js
@@ -26,7 +26,7 @@ const main = (
 ) => {
   // [START healthcare_dicom_store_set_iam_policy]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const setDicomStoreIamPolicy = async () => {
     const auth = await google.auth.getClient({
diff --git a/healthcare/dicom/system-test/dicom_stores.test.js b/healthcare/dicom/system-test/dicom_stores.test.js
diff --git a/healthcare/dicom/system-test/dicomweb.test.js b/healthcare/dicom/system-test/dicomweb.test.js
