diff --git a/samples/api-reference-doc-snippets/app-profile.js b/samples/api-reference-doc-snippets/app-profile.js index ba129a18b..907899531 100644 --- a/samples/api-reference-doc-snippets/app-profile.js +++ b/samples/api-reference-doc-snippets/app-profile.js @@ -50,6 +50,7 @@ const snippets = { const request = { name: `projects/${projectId}/instances/${instanceId}/appProfiles/${appProfileId}`, + // ignoreWarnings: true, // uncomment this line to ignore warnings }; instanceAdminClient diff --git a/samples/api-reference-doc-snippets/backups.create.js b/samples/api-reference-doc-snippets/backups.create.js index de21133dc..9cc1dd5fe 100644 --- a/samples/api-reference-doc-snippets/backups.create.js +++ b/samples/api-reference-doc-snippets/backups.create.js @@ -32,12 +32,19 @@ async function main( // const backupId = 'YOUR_BACKUP_ID'; const projectId = await tableAdminClient.getProjectId(); + const seconds = Math.floor( + new Date(Date.now() + 7 * 60 * 60 * 1000).getTime() / 1000, + // 7 hours from now + ); const request = { parent: `projects/${projectId}/instances/${instanceId}/clusters/${clusterId}`, backupId: backupId, backup: { sourceTable: `projects/${projectId}/instances/${instanceId}/tables/${tableId}`, - expireTime: new Date(Date.now() + 7 * 60 * 60 * 1000), // 7 hours from now + expireTime: { + seconds, + nanos: 0, + }, }, }; diff --git a/samples/api-reference-doc-snippets/backups.update.js b/samples/api-reference-doc-snippets/backups.update.js index bc0ee80ad..617062a2c 100644 --- a/samples/api-reference-doc-snippets/backups.update.js +++ b/samples/api-reference-doc-snippets/backups.update.js @@ -30,10 +30,17 @@ async function main( // const backupId = 'YOUR_BACKUP_ID'; const projectId = await tableAdminClient.getProjectId(); + const seconds = Math.floor( + new Date(Date.now() + 7 * 60 * 60 * 1000).getTime() / 1000, + // 7 hours from now + ); const request = { backup: { name: `projects/${projectId}/instances/${instanceId}/clusters/${clusterId}/backups/${backupId}`, - expireTime: new Date(Date.now() + 24 * 60 * 60 * 1000), // 24 hours + expireTime: { + seconds, + nanos: 0, + }, }, updateMask: { paths: ['expire_time'], diff --git a/samples/api-reference-doc-snippets/family.js b/samples/api-reference-doc-snippets/family.js index 91f5a652a..e405fc2cc 100644 --- a/samples/api-reference-doc-snippets/family.js +++ b/samples/api-reference-doc-snippets/family.js @@ -112,8 +112,8 @@ const snippets = { }, setMetadata: async (instanceId, tableId, familyId) => { // [START bigtable_api_set_family_meta] - const {BigtableTableAdminClient, GCRuleMaker} = - require('@google-cloud/bigtable').v2; + const {GCRuleMaker} = require('@google-cloud/bigtable'); + const {BigtableTableAdminClient} = require('@google-cloud/bigtable').v2; const adminClient = new BigtableTableAdminClient(); const projectId = await adminClient.getProjectId(); diff --git a/samples/api-reference-doc-snippets/instance.js b/samples/api-reference-doc-snippets/instance.js index e4cc187f1..1752b9e6c 100644 --- a/samples/api-reference-doc-snippets/instance.js +++ b/samples/api-reference-doc-snippets/instance.js @@ -37,8 +37,10 @@ const snippets = { }; // creates a new Instance - const [newInstance, operation] = + const [operation, newInstance] = await instanceAdminClient.createInstance(options); + await operation.promise(); + console.log(`Created Instance: ${newInstance.name}`); // let operations = result[1]; // let apiResponse = result[2]; // [END bigtable_api_create_instance] diff --git a/samples/api-reference-doc-snippets/table.js b/samples/api-reference-doc-snippets/table.js index 10e70161f..823c05e1d 100644 --- a/samples/api-reference-doc-snippets/table.js +++ b/samples/api-reference-doc-snippets/table.js @@ -468,11 +468,11 @@ const snippets = { let isConsistent = false; while (!isConsistent) { // 2. Check for consistency - const [consistent] = adminClient.checkConsistency({ + const consistent = await adminClient.checkConsistency({ name: `projects/${projectId}/instances/${instanceId}/tables/${tableId}`, consistencyToken: token, }); - isConsistent = consistent; + isConsistent = consistent[0].consistent; if (isConsistent) { console.log('Data is consistent!'); diff --git a/samples/instances.js b/samples/instances.js index 5d317eb1a..2a8b3ab37 100644 --- a/samples/instances.js +++ b/samples/instances.js @@ -60,7 +60,7 @@ async function runInstanceOperations(instanceID, clusterID) { }; // Create production instance with given options - const [prodInstance, operation] = + const [operation, prodInstance] = await instanceAdminClient.createInstance(instanceOptions); await operation.promise(); console.log(`Created Instance: ${prodInstance.name}`); @@ -136,18 +136,17 @@ async function createDevInstance(instanceID, clusterID) { labels: {'dev-label': 'dev-label'}, type: 'DEVELOPMENT', }, - clusters: [ - { - id: clusterID, + clusters: { + [clusterID]: { location: `projects/${projectId}/locations/us-central1-f`, - serveNodes: 1, + // serveNodes: 1 // This cannot be specified for development instances defaultStorageType: 'HDD', }, - ], + }, }; // Create development instance with given options - const [instance, operation] = + const [operation, instance] = await instanceAdminClient.createInstance(options); await operation.promise(); console.log(`Created development instance: ${instance.name}`); @@ -203,7 +202,7 @@ async function addCluster(instanceID, clusterID) { }, }; - const [cluster, operation] = + const [operation, cluster] = await instanceAdminClient.createCluster(clusterOptions); await operation.promise(); console.log(`Cluster created: ${cluster.name}`); diff --git a/src/index.ts b/src/index.ts index fddb52150..8b217c9cb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -39,6 +39,7 @@ import { import {google} from '../protos/protos'; import {ServiceError} from 'google-gax'; import * as v2 from './v2'; +import {GCRuleMaker} from './gc-rule-maker'; import {PassThrough, Duplex} from 'stream'; import grpcGcpModule = require('grpc-gcp'); import {ClusterUtils} from './utils/cluster'; @@ -1138,6 +1139,7 @@ module.exports = Bigtable; module.exports.v2 = v2; module.exports.Bigtable = Bigtable; module.exports.SqlTypes = SqlTypes; +module.exports.GCRuleMaker = GCRuleMaker; export {v2}; export {protos}; @@ -1363,5 +1365,5 @@ export { WaitForReplicationCallback, WaitForReplicationResponse, } from './table'; -export {GCRuleMaker} from './gc-rule-maker'; +export {GCRuleMaker}; export {SqlTypes};