testing, stylistic update

Author: telpirion

bigquery/cloud-client/grantAccessToDataset.js

@@ -14,60 +14,43 @@
 
 'use strict';
 
-/**
- * Grants access to a BigQuery dataset for a specified entity.
- *
- * @param {string} datasetId ID of the dataset to grant access to.
- * @param {string} entityId ID of the entity to grant access to.
- * @param {string} role Role to grant.
- * @returns {Promise<Array>} Array of access entries.
- */
-async function grantAccessToDataset(datasetId, entityId, role) {
+async function main(datasetId, entityId, role) {
   // [START bigquery_grant_access_to_dataset]
-  const {BigQuery} = require('@google-cloud/bigquery');
-
-  // Define enum for HTTP codes.
-  const HTTP_STATUS = {
-    PRECONDITION_FAILED: 412,
-  };
 
-  // TODO(developer): Update and un-comment below lines.
+  /**
+   * TODO(developer): Update and un-comment below lines.
+   */
 
-  // ID of the dataset to revoke access to.
-  // datasetId = "my_project_id.my_dataset_name";
+  // const datasetId = "my_project_id.my_dataset_name";
 
   // ID of the user or group from whom you are adding access.
-  // Alternatively, the JSON REST API representation of the entity,
-  // such as a view's table reference.
-  // entityId = "[email protected]";
+  // const entityId = "[email protected]";
 
   // One of the "Basic roles for datasets" described here:
   // https://cloud.google.com/bigquery/docs/access-control-basic-roles#dataset-basic-roles
-  // role = "READER";
+  // const role = "READER";
+
+  const {BigQuery} = require('@google-cloud/bigquery');
+
+  // Instantiate a client.
+  const client = new BigQuery();
 
   // Type of entity you are granting access to.
   // Find allowed allowed entity type names here:
   // https://cloud.google.com/bigquery/docs/reference/rest/v2/datasets#resource:-dataset
-  // In this case, we're using groupByEmail
   const entityType = 'groupByEmail';
 
-  // Instantiate a client.
-  const client = new BigQuery();
-
-  try {
-    // Get a reference to the dataset.
+  async function grantAccessToDataset() {
     const [dataset] = await client.dataset(datasetId).get();
 
     // The 'access entries' array is immutable. Create a copy for modifications.
-    const entries = Array.isArray(dataset.metadata.access)
-      ? [...dataset.metadata.access]
-      : [];
+    const entries = [...dataset.metadata.access];
 
     // Append an AccessEntry to grant the role to a dataset.
     // Find more details about the AccessEntry object in the BigQuery documentation:
     // https://cloud.google.com/python/docs/reference/bigquery/latest/google.cloud.bigquery.dataset.AccessEntry
     entries.push({
-      role: role,
+      role,
       [entityType]: entityId,
     });
 
@@ -83,29 +66,14 @@ async function grantAccessToDataset(datasetId, entityId, role) {
     // https://cloud.google.com/nodejs/docs/reference/bigquery/latest
 
     // Update just the 'access entries' property of the dataset.
-    const [updatedDataset] = await client
-      .dataset(datasetId)
-      .setMetadata(metadata);
+    await client.dataset(datasetId).setMetadata(metadata);
 
-    // Show a success message.
     console.log(
-      `Role '${role}' granted for entity '${entityId}' in dataset '${datasetId}'.`
+      `Role '${role}' granted for entity '${entityId}' in '${datasetId}'.`
     );
-
-    return updatedDataset.access;
-  } catch (error) {
-    if (error.code === HTTP_STATUS.PRECONDITION_FAILED) {
-      console.error(
-        `Dataset '${datasetId}' was modified remotely before this update. ` +
-          'Fetch the latest version and retry.'
-      );
-    } else {
-      throw error;
-    }
   }
   // [END bigquery_grant_access_to_dataset]
+  await grantAccessToDataset();
 }
 
-module.exports = {
-  grantAccessToDataset,
-};
+exports.grantAccessToDataset = main;

bigquery/cloud-client/grantAccessToTableOrView.js

@@ -14,82 +14,58 @@
 
 'use strict';
 
-/**
- * Grants access to a BigQuery table or view for a specified principal.
- *
- * @param {string} projectId Google Cloud Platform project ID.
- * @param {string} datasetId Dataset where the table or view is.
- * @param {string} resourceName Table or view name to get the access policy.
- * @param {string} principalId The principal requesting access to the table or view.
- * @param {string} role Role to assign to the member.
- * @returns {Promise<object[]>} The updated policy bindings.
- */
-async function grantAccessToTableOrView(
-  projectId,
-  datasetId,
-  resourceName,
-  principalId,
-  role
-) {
+async function main(projectId, datasetId, tableId, principalId, role) {
   // [START bigquery_grant_access_to_table_or_view]
-  const {BigQuery} = require('@google-cloud/bigquery');
-
-  // TODO(developer): Update and un-comment below lines.
-
-  // Google Cloud Platform project.
-  // projectId = "my_project_id"
-
-  // Dataset where the table or view is.
-  // datasetId = "my_dataset_id"
-
-  // Table or view name to get the access policy.
-  // resourceName = "my_table_id"
 
-  // The principal requesting access to the table or view.
-  // Find more details about principal identifiers here:
-  // https://cloud.google.com/iam/docs/principal-identifiers
-  // principalId = "user:[email protected]"
+  /**
+   * TODO(developer): Update and un-comment below lines
+   */
+  // const projectId = "YOUR_PROJECT_ID";
+  // const datasetId = "YOUR_DATASET_ID";
+  // const tableId = "YOUR_TABLE_ID";
+  // const principalId = "YOUR_PRINCIPAL_ID";
+  // const role = "YOUR_ROLE";
 
-  // Role to assign to the member.
-  // role = "roles/bigquery.dataViewer"
+  const {BigQuery} = require('@google-cloud/bigquery');
 
   // Instantiate a client.
   const client = new BigQuery();
 
-  // Get a reference to the dataset by datasetId.
-  const dataset = client.dataset(datasetId);
-  // Get a reference to the table by tableName.
-  const table = dataset.table(resourceName);
-
-  // Get the IAM access policy for the table or view.
-  const [policy] = await table.getIamPolicy();
-
-  // Initialize bindings array.
-  if (!policy.bindings) {
-    policy.bindings = [];
+  async function grantAccessToTableOrView() {
+    const dataset = client.dataset(datasetId);
+    const table = dataset.table(tableId);
+
+    // Get the IAM access policy for the table or view.
+    const [policy] = await table.getIamPolicy();
+
+    // Initialize bindings array.
+    if (!policy.bindings) {
+      policy.bindings = [];
+    }
+
+    // To grant access to a table or view
+    // add bindings to the Table or View policy.
+    //
+    // Find more details about Policy and Binding objects here:
+    // https://cloud.google.com/security-command-center/docs/reference/rest/Shared.Types/Policy
+    // https://cloud.google.com/security-command-center/docs/reference/rest/Shared.Types/Binding
+    const binding = {
+      role,
+      members: [principalId],
+    };
+    policy.bindings.push(binding);
+
+    // Set the IAM access policy with updated bindings.
+    await table.setIamPolicy(policy);
+
+    // Show a success message.
+    console.log(
+      `Role '${role}' granted for principal '${principalId}' on resource '${datasetId}.${tableId}'.`
+    );
   }
 
-  // To grant access to a table or view
-  // add bindings to the Table or View policy.
-  //
-  // Find more details about Policy and Binding objects here:
-  // https://cloud.google.com/security-command-center/docs/reference/rest/Shared.Types/Policy
-  // https://cloud.google.com/security-command-center/docs/reference/rest/Shared.Types/Binding
-  const binding = {
-    role: role,
-    members: [principalId],
-  };
-  policy.bindings.push(binding);
-
-  // Set the IAM access policy with updated bindings.
-  const [updatedPolicy] = await table.setIamPolicy(policy);
-
-  // Show a success message.
-  console.log(
-    `Role '${role}' granted for principal '${principalId}' on resource '${datasetId}.${resourceName}'.`
-  );
+  await grantAccessToTableOrView();
   // [END bigquery_grant_access_to_table_or_view]
-  return updatedPolicy.bindings;
 }
 
-module.exports = {grantAccessToTableOrView};
+exports.grantAccessToTableOrView = main;