fix(bigquery): Update samples and tests according to PR comments

Author: hivanalejandro

bigquery/cloud-client/grantAccessToTableOrView.js

@@ -40,10 +40,10 @@ async function grantAccessToTableOrView(
   // projectId = "my_project_id"
 
   // Dataset where the table or view is.
-  // datasetId = "my_dataset"
+  // datasetId = "my_dataset_id"
 
   // Table or view name to get the access policy.
-  // resourceName = "my_table"
+  // resourceName = "my_table_id"
 
   // The principal requesting access to the table or view.
   // Find more details about principal identifiers here:
@@ -88,7 +88,6 @@ async function grantAccessToTableOrView(
     `Role '${role}' granted for principal '${principalId}' on resource '${datasetId}.${resourceName}'.`
   );
   // [END bigquery_grant_access_to_table_or_view]
-
   return updatedPolicy.bindings;
 }
 

bigquery/cloud-client/revokeDatasetAccess.js

@@ -36,7 +36,7 @@ async function revokeDatasetAccess(datasetId, entityId) {
   // TODO (developer): Update and un-comment below lines.
 
   // ID of the dataset to revoke access to.
-  // datasetId = "your-project.your_dataset"
+  // datasetId = "my_project.my_dataset"
 
   // ID of the user or group from whom you are revoking access.
   // Alternatively, the JSON REST API representation of the entity,
@@ -57,32 +57,12 @@ async function revokeDatasetAccess(datasetId, entityId) {
   // Filter access entries to exclude entries matching the specified entity_id
   // and assign a new list back to the access list.
   dataset.metadata.access = dataset.metadata.access.filter(entry => {
-    // Check for entity_id (specific match).
-    if (entry.entity_id === entityId) {
-      console.log(
-        `Found matching entity_id: ${entry.entity_id}, removing entry`
-      );
-      return false;
-    }
-
-    // Check for userByEmail field.
-    if (entry.userByEmail === entityId) {
-      console.log(
-        `Found matching userByEmail: ${entry.userByEmail}, removing entry`
-      );
-      return false;
-    }
-
-    // Check for groupByEmail field.
-    if (entry.groupByEmail === entityId) {
-      console.log(
-        `Found matching groupByEmail: ${entry.groupByEmail}, removing entry`
-      );
-      return false;
-    }
-
-    // Keep all other entries.
-    return true;
+    // Return false (remove entry) if any of these fields match entityId
+    return !(
+      entry.entity_id === entityId ||
+      entry.userByEmail === entityId ||
+      entry.groupByEmail === entityId
+    );
   });
 
   // Update will only succeed if the dataset

bigquery/cloud-client/revokeTableOrViewAccess.js

@@ -39,10 +39,10 @@ async function revokeAccessToTableOrView(
   // projectId = "my_project_id"
 
   // Dataset where the table or view is.
-  // datasetId = "my_dataset"
+  // datasetId = "my_dataset_id"
 
   // Table or view name to get the access policy.
-  // resourceName = "my_table"
+  // resourceName = "my_table_id"
 
   // (Optional) Role to remove from the table or view.
   // roleToRemove = "roles/bigquery.dataViewer"

bigquery/cloud-client/test/config.js

@@ -188,26 +188,19 @@ const setupBeforeAll = async () => {
 const cleanupResources = async () => {
   console.log('=== Cleaning up test resources ===');
 
-  if (sharedClient) {
+  if (sharedClient && sharedDataset) {
     try {
-      // Check if resources exist before attempting to delete
-      if (sharedDataset) {
-        try {
-          console.log(
-            `Deleting dataset: ${DATASET_ID} and all contained tables/views`
-          );
-          await sharedClient.dataset(DATASET_ID).delete({force: true});
-          console.log(`Successfully deleted dataset: ${DATASET_ID}`);
-        } catch (err) {
-          if (err.code !== HTTP_STATUS.NOT_FOUND) {
-            console.error(`Error deleting dataset: ${err.message}`);
-          } else {
-            console.log(`Dataset ${DATASET_ID} already deleted or not found`);
-          }
-        }
-      }
+      console.log(
+        `Deleting dataset: ${DATASET_ID} and all contained tables/views`
+      );
+      await sharedClient.dataset(DATASET_ID).delete({force: true});
+      console.log(`Successfully deleted dataset: ${DATASET_ID}`);
     } catch (err) {
-      console.error(`Cleanup error: ${err.message}`);
+      if (err.code !== HTTP_STATUS.NOT_FOUND) {
+        console.error(`Error deleting dataset: ${err.message}`);
+      } else {
+        console.log(`Dataset ${DATASET_ID} already deleted or not found`);
+      }
     }
   }
 

bigquery/cloud-client/test/viewTableOrViewAccessPolicy.test.js

@@ -43,20 +43,20 @@ describe('viewTableOrViewAccessPolicy', () => {
       table.id
     );
 
-    // Verificar que la política existe
+    // Verify that the policy exists
     assert.ok(policy, 'Policy should be defined');
 
-    // Verificar que bindings existe y es un array
+    // Verify that bindings exists and is an array
     assert.ok(Array.isArray(policy.bindings), 'Bindings should be an array');
 
-    // En una política nueva, bindings debería estar vacío
+    // In a new policy, bindings should be empty
     assert.strictEqual(
       policy.bindings.length,
       0,
       'Bindings list should be empty'
     );
 
-    // Verificar que etag existe, pero no validar su valor exacto
+    // Verify that etag exists, but do not validate its exact value
     assert.ok(policy.etag, 'Etag should be defined');
   });
 
@@ -71,20 +71,20 @@ describe('viewTableOrViewAccessPolicy', () => {
       view.id
     );
 
-    // Verificar que la política existe
+    // Verify that the policy exists
     assert.ok(policy, 'Policy should be defined');
 
-    // Verificar que bindings existe y es un array
+    // Verify that bindings exists and is an array
     assert.ok(Array.isArray(policy.bindings), 'Bindings should be an array');
 
-    // En una política nueva, bindings debería estar vacío
+    // In a new policy, bindings should be empty
     assert.strictEqual(
       policy.bindings.length,
       0,
       'Bindings list should be empty'
     );
 
-    // Verificar que etag existe, pero no validar su valor exacto
+    // Verify that etag exists, but do not validate its exact value
     assert.ok(policy.etag, 'Etag should be defined');
   });
 });

bigquery/cloud-client/viewDatasetAccessPolicy.js

@@ -29,7 +29,7 @@ function viewDatasetAccessPolicy(datasetId) {
 
   // TODO (developer): Update and un-comment below lines.
   // Dataset from which to get the access policy
-  // datasetId = "my_dataset";
+  // datasetId = "my_dataset_id";
 
   // Get a reference to the dataset.
   const dataset = bigquery.dataset(datasetId);

bigquery/cloud-client/viewTableOrViewAccessPolicy.js

@@ -33,7 +33,7 @@ async function viewTableOrViewAccessPolicy(projectId, datasetId, resourceName) {
   // Dataset where the table or view is.
   // datasetId = "my_dataset_id";
   // Table or view name to get the access policy.
-  // resourceName = "my_table_name";
+  // resourceName = "my_table_name_id";
 
   // Instantiate a client.
   const client = new BigQuery();