Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions bigtable/docs/snippets.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
INSTANCE_ID = "snippet-tests" + UNIQUE_SUFFIX
CLUSTER_ID = "clus-1-" + UNIQUE_SUFFIX
APP_PROFILE_ID = "app-prof" + UNIQUE_SUFFIX
TABLE_ID = "tabl-1" + UNIQUE_SUFFIX
ROUTING_POLICY_TYPE = enums.RoutingPolicyType.ANY
LOCATION_ID = "us-central1-f"
ALT_LOCATION_ID = "us-central1-a"
Expand Down Expand Up @@ -72,6 +73,7 @@ class Config(object):

CLIENT = None
INSTANCE = None
TABLE = None


def setup_module():
Expand All @@ -88,6 +90,8 @@ def setup_module():
operation = Config.INSTANCE.create(clusters=[cluster])
# We want to make sure the operation completes.
operation.result(timeout=100)
Config.TABLE = Config.INSTANCE.table(TABLE_ID)
Config.TABLE.create()


def teardown_module():
Expand Down Expand Up @@ -413,14 +417,6 @@ def test_bigtable_create_table():


def test_bigtable_list_tables():
from google.cloud.bigtable import Client
from google.cloud.bigtable import column_family

client = Client(admin=True)
instance = client.instance(INSTANCE_ID)
table = instance.table("to_list")
max_versions_rule = column_family.MaxVersionsGCRule(2)
table.create(column_families={"cf1": max_versions_rule})

# [START bigtable_list_tables]
from google.cloud.bigtable import Client
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, not sure why this duplicate import was there before, in the first place.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, not sure why this duplicate import was there before, in the first place.

These are snippets which are included in doc string of actual functions, so for example codes we need to have imports for users to understand.

Expand All @@ -430,11 +426,9 @@ def test_bigtable_list_tables():
tables_list = instance.list_tables()
# [END bigtable_list_tables]

# Check if returned list has expected table
table_names = [table.name for table in tables_list]
try:
assert table.name in table_names
finally:
retry_429(table.delete)()
assert Config.TABLE.name in table_names


def test_bigtable_delete_cluster():
Expand Down Expand Up @@ -471,9 +465,10 @@ def test_bigtable_delete_instance():

client = Client(admin=True)

instance = client.instance("inst-my-123", instance_type=PRODUCTION, labels=LABELS)
instance_id = "snipt-inst-del" + UNIQUE_SUFFIX
instance = client.instance(instance_id, instance_type=PRODUCTION, labels=LABELS)
cluster = instance.cluster(
"clus-my-123",
"clus-to-delete" + UNIQUE_SUFFIX,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some nit-picking, but I'd use somewhat more informative names, such as "snippet-instance", "cluster-to-delete" etc.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This instance is created for only 'instance delete' test, hence the names.
Already tried naming that, but got string length error.

from_value = <_Rendezvous of RPC that terminated with: status = StatusCode.INVALID_ARGUMENT details = "Error in field 'clusters' ...lection clusters : Length should be between [6,30], but found 31 'cluster-to-delete-1564545637619'","grpc_status":3}" ???
E google.api_core.exceptions.InvalidArgument: 400 Error in field 'clusters' : Cluster Id : Invalid id for collection clusters : Length should be between [6,30], but found 31 'cluster-to-delete-1564545637619'

location_id=ALT_LOCATION_ID,
serve_nodes=1,
default_storage_type=STORAGE_TYPE,
Expand All @@ -491,7 +486,6 @@ def test_bigtable_delete_instance():

client = Client(admin=True)

instance_id = "inst-my-123"
instance_to_delete = client.instance(instance_id)
instance_to_delete.delete()
# [END bigtable_delete_instance]
Expand Down