Skip to content

Commit f97e761

Browse files
bshafferbshaffer
authored
chore: upgrade bigtable samples to new surface (#1897)
1 parent 2522245 commit f97e761

38 files changed

+346
-160
lines changed

‎bigtable/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"google/cloud-bigtable": "^1.3.1"
3+
"google/cloud-bigtable": "^1.30"
44
},
55
"autoload-dev": {
66
"psr-4": {

‎bigtable/src/create_app_profile.php‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@
2424
namespace Google\Cloud\Samples\Bigtable;
2525

2626
// [START bigtable_create_app_profile]
27-
use Google\Cloud\Bigtable\Admin\V2\BigtableInstanceAdminClient;
27+
use Google\ApiCore\ApiException;
2828
use Google\Cloud\Bigtable\Admin\V2\AppProfile;
2929
use Google\Cloud\Bigtable\Admin\V2\AppProfile\SingleClusterRouting;
30-
use Google\ApiCore\ApiException;
30+
use Google\Cloud\Bigtable\Admin\V2\Client\BigtableInstanceAdminClient;
31+
use Google\Cloud\Bigtable\Admin\V2\CreateAppProfileRequest;
3132

3233
/**
3334
* Create an App Profile
@@ -68,7 +69,11 @@ function create_app_profile(
6869
printf('Creating a new AppProfile %s' . PHP_EOL, $appProfileId);
6970

7071
try {
71-
$newAppProfile = $instanceAdminClient->createAppProfile($instanceName, $appProfileId, $appProfile);
72+
$createAppProfileRequest = (new CreateAppProfileRequest())
73+
->setParent($instanceName)
74+
->setAppProfileId($appProfileId)
75+
->setAppProfile($appProfile);
76+
$newAppProfile = $instanceAdminClient->createAppProfile($createAppProfileRequest);
7277
} catch (ApiException $e) {
7378
if ($e->getStatus() === 'ALREADY_EXISTS') {
7479
printf('AppProfile %s already exists.', $appProfileId);

‎bigtable/src/create_cluster.php‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,14 @@
2424
namespace Google\Cloud\Samples\Bigtable;
2525

2626
// [START bigtable_create_cluster]
27-
use Google\Cloud\Bigtable\Admin\V2\BigtableInstanceAdminClient;
27+
use Google\ApiCore\ApiException;
28+
use Google\Cloud\Bigtable\Admin\V2\Client\BigtableInstanceAdminClient;
2829
use Google\Cloud\Bigtable\Admin\V2\Cluster;
30+
use Google\Cloud\Bigtable\Admin\V2\CreateClusterRequest;
31+
use Google\Cloud\Bigtable\Admin\V2\GetClusterRequest;
32+
use Google\Cloud\Bigtable\Admin\V2\GetInstanceRequest;
33+
use Google\Cloud\Bigtable\Admin\V2\ListClustersRequest;
2934
use Google\Cloud\Bigtable\Admin\V2\StorageType;
30-
use Google\ApiCore\ApiException;
3135

3236
/**
3337
* Create a cluster in an existing Bigtable instance
@@ -50,7 +54,9 @@ function create_cluster(
5054

5155
printf('Adding Cluster to Instance %s' . PHP_EOL, $instanceId);
5256
try {
53-
$instanceAdminClient->getInstance($instanceName);
57+
$getInstanceRequest = (new GetInstanceRequest())
58+
->setName($instanceName);
59+
$instanceAdminClient->getInstance($getInstanceRequest);
5460
} catch (ApiException $e) {
5561
if ($e->getStatus() === 'NOT_FOUND') {
5662
printf('Instance %s does not exists.' . PHP_EOL, $instanceId);
@@ -63,8 +69,10 @@ function create_cluster(
6369

6470
$storage_type = StorageType::SSD;
6571
$serve_nodes = 3;
72+
$listClustersRequest = (new ListClustersRequest())
73+
->setParent($instanceName);
6674

67-
$clustersBefore = $instanceAdminClient->listClusters($instanceName)->getClusters();
75+
$clustersBefore = $instanceAdminClient->listClusters($listClustersRequest)->getClusters();
6876
$clusters = $clustersBefore->getIterator();
6977
foreach ($clusters as $cluster) {
7078
print($cluster->getName() . PHP_EOL);
@@ -80,11 +88,17 @@ function create_cluster(
8088
)
8189
);
8290
try {
83-
$instanceAdminClient->getCluster($clusterName);
91+
$getClusterRequest = (new GetClusterRequest())
92+
->setName($clusterName);
93+
$instanceAdminClient->getCluster($getClusterRequest);
8494
printf('Cluster %s already exists, aborting...', $clusterId);
8595
} catch (ApiException $e) {
8696
if ($e->getStatus() === 'NOT_FOUND') {
87-
$operationResponse = $instanceAdminClient->createCluster($instanceName, $clusterId, $cluster);
97+
$createClusterRequest = (new CreateClusterRequest())
98+
->setParent($instanceName)
99+
->setClusterId($clusterId)
100+
->setCluster($cluster);
101+
$operationResponse = $instanceAdminClient->createCluster($createClusterRequest);
88102

89103
$operationResponse->pollUntilComplete();
90104
if ($operationResponse->operationSucceeded()) {

‎bigtable/src/create_cluster_autoscale_config.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@
2626
// [START bigtable_api_cluster_create_autoscaling]
2727
use Google\Cloud\Bigtable\Admin\V2\AutoscalingLimits;
2828
use Google\Cloud\Bigtable\Admin\V2\AutoscalingTargets;
29-
use Google\Cloud\Bigtable\Admin\V2\BigtableInstanceAdminClient;
29+
use Google\Cloud\Bigtable\Admin\V2\Client\BigtableInstanceAdminClient;
3030
use Google\Cloud\Bigtable\Admin\V2\Cluster;
3131
use Google\Cloud\Bigtable\Admin\V2\Cluster\ClusterAutoscalingConfig;
3232
use Google\Cloud\Bigtable\Admin\V2\Cluster\ClusterConfig;
33+
use Google\Cloud\Bigtable\Admin\V2\CreateClusterRequest;
3334
use Google\Cloud\Bigtable\Admin\V2\StorageType;
3435

3536
/**
@@ -79,7 +80,11 @@ function create_cluster_autoscale_config(
7980
)
8081
);
8182
$cluster->setClusterConfig($clusterConfig);
82-
$operationResponse = $instanceAdminClient->createCluster($instanceName, $clusterId, $cluster);
83+
$createClusterRequest = (new CreateClusterRequest())
84+
->setParent($instanceName)
85+
->setClusterId($clusterId)
86+
->setCluster($cluster);
87+
$operationResponse = $instanceAdminClient->createCluster($createClusterRequest);
8388

8489
$operationResponse->pollUntilComplete();
8590
if ($operationResponse->operationSucceeded()) {

‎bigtable/src/create_dev_instance.php‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@
2424
namespace Google\Cloud\Samples\Bigtable;
2525

2626
// [START bigtable_create_dev_instance]
27-
use Google\Cloud\Bigtable\Admin\V2\BigtableInstanceAdminClient;
28-
use Google\Cloud\Bigtable\Admin\V2\Instance;
27+
use Google\ApiCore\ApiException;
28+
use Google\Cloud\Bigtable\Admin\V2\Client\BigtableInstanceAdminClient;
2929
use Google\Cloud\Bigtable\Admin\V2\Cluster;
30-
use Google\Cloud\Bigtable\Admin\V2\StorageType;
30+
use Google\Cloud\Bigtable\Admin\V2\CreateInstanceRequest;
31+
use Google\Cloud\Bigtable\Admin\V2\GetInstanceRequest;
32+
use Google\Cloud\Bigtable\Admin\V2\Instance;
3133
use Google\Cloud\Bigtable\Admin\V2\Instance\Type as InstanceType;
32-
use Google\ApiCore\ApiException;
34+
use Google\Cloud\Bigtable\Admin\V2\StorageType;
3335

3436
/**
3537
* Create a development Bigtable instance
@@ -77,17 +79,19 @@ function create_dev_instance(
7779
];
7880
// Create development instance with given options
7981
try {
80-
$instanceAdminClient->getInstance($instanceName);
82+
$getInstanceRequest = (new GetInstanceRequest())
83+
->setName($instanceName);
84+
$instanceAdminClient->getInstance($getInstanceRequest);
8185
printf('Instance %s already exists.' . PHP_EOL, $instanceId);
8286
} catch (ApiException $e) {
8387
if ($e->getStatus() === 'NOT_FOUND') {
8488
printf('Creating a development Instance: %s' . PHP_EOL, $instanceId);
85-
$operationResponse = $instanceAdminClient->createInstance(
86-
$projectName,
87-
$instanceId,
88-
$instance,
89-
$clusters
90-
);
89+
$createInstanceRequest = (new CreateInstanceRequest())
90+
->setParent($projectName)
91+
->setInstanceId($instanceId)
92+
->setInstance($instance)
93+
->setClusters($clusters);
94+
$operationResponse = $instanceAdminClient->createInstance($createInstanceRequest);
9195
$operationResponse->pollUntilComplete();
9296
if (!$operationResponse->operationSucceeded()) {
9397
print('Error: ' . $operationResponse->getError()->getMessage());

‎bigtable/src/create_family_gc_intersection.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424
namespace Google\Cloud\Samples\Bigtable;
2525

2626
// [START bigtable_create_family_gc_intersection]
27-
use Google\Cloud\Bigtable\Admin\V2\GcRule\Intersection as GcRuleIntersection;
28-
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
29-
use Google\Cloud\Bigtable\Admin\V2\BigtableTableAdminClient;
27+
use Google\Cloud\Bigtable\Admin\V2\Client\BigtableTableAdminClient;
3028
use Google\Cloud\Bigtable\Admin\V2\ColumnFamily;
3129
use Google\Cloud\Bigtable\Admin\V2\GcRule;
30+
use Google\Cloud\Bigtable\Admin\V2\GcRule\Intersection as GcRuleIntersection;
31+
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest;
32+
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
3233
use Google\Protobuf\Duration;
3334

3435
/**
@@ -65,7 +66,10 @@ function create_family_gc_intersection(
6566
$columnModification = new Modification();
6667
$columnModification->setId('cf4');
6768
$columnModification->setCreate($columnFamily4);
68-
$tableAdminClient->modifyColumnFamilies($tableName, [$columnModification]);
69+
$modifyColumnFamiliesRequest = (new ModifyColumnFamiliesRequest())
70+
->setName($tableName)
71+
->setModifications([$columnModification]);
72+
$tableAdminClient->modifyColumnFamilies($modifyColumnFamiliesRequest);
6973

7074
print('Created column family cf4 with Union GC rule' . PHP_EOL);
7175
}

‎bigtable/src/create_family_gc_max_age.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@
2424
namespace Google\Cloud\Samples\Bigtable;
2525

2626
// [START bigtable_create_family_gc_max_age]
27-
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
28-
use Google\Cloud\Bigtable\Admin\V2\BigtableTableAdminClient;
27+
use Google\Cloud\Bigtable\Admin\V2\Client\BigtableTableAdminClient;
2928
use Google\Cloud\Bigtable\Admin\V2\ColumnFamily;
3029
use Google\Cloud\Bigtable\Admin\V2\GcRule;
30+
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest;
31+
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
3132
use Google\Protobuf\Duration;
3233

3334
/**
@@ -59,7 +60,10 @@ function create_family_gc_max_age(
5960
$columnModification = new Modification();
6061
$columnModification->setId('cf1');
6162
$columnModification->setCreate($columnFamily1);
62-
$tableAdminClient->modifyColumnFamilies($tableName, [$columnModification]);
63+
$modifyColumnFamiliesRequest = (new ModifyColumnFamiliesRequest())
64+
->setName($tableName)
65+
->setModifications([$columnModification]);
66+
$tableAdminClient->modifyColumnFamilies($modifyColumnFamiliesRequest);
6367
print('Created column family cf1 with MaxAge GC Rule.' . PHP_EOL);
6468
}
6569
// [END bigtable_create_family_gc_max_age]

‎bigtable/src/create_family_gc_max_versions.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@
2424
namespace Google\Cloud\Samples\Bigtable;
2525

2626
// [START bigtable_create_family_gc_max_versions]
27-
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
28-
use Google\Cloud\Bigtable\Admin\V2\BigtableTableAdminClient;
27+
use Google\Cloud\Bigtable\Admin\V2\Client\BigtableTableAdminClient;
2928
use Google\Cloud\Bigtable\Admin\V2\ColumnFamily;
3029
use Google\Cloud\Bigtable\Admin\V2\GcRule;
30+
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest;
31+
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
3132

3233
/**
3334
* Create a new column family with a max versions GC rule
@@ -53,7 +54,10 @@ function create_family_gc_max_versions(
5354
$columnModification = new Modification();
5455
$columnModification->setId('cf2');
5556
$columnModification->setCreate($columnFamily2);
56-
$tableAdminClient->modifyColumnFamilies($tableName, [$columnModification]);
57+
$modifyColumnFamiliesRequest = (new ModifyColumnFamiliesRequest())
58+
->setName($tableName)
59+
->setModifications([$columnModification]);
60+
$tableAdminClient->modifyColumnFamilies($modifyColumnFamiliesRequest);
5761

5862
print('Created column family cf2 with Max Versions GC Rule.' . PHP_EOL);
5963
}

‎bigtable/src/create_family_gc_nested.php‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@
2424
namespace Google\Cloud\Samples\Bigtable;
2525

2626
// [START bigtable_create_family_gc_nested]
27-
use Google\Cloud\Bigtable\Admin\V2\GcRule\Intersection as GcRuleIntersection;
28-
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
29-
use Google\Cloud\Bigtable\Admin\V2\GcRule\Union as GcRuleUnion;
30-
use Google\Cloud\Bigtable\Admin\V2\BigtableTableAdminClient;
27+
use Google\Cloud\Bigtable\Admin\V2\Client\BigtableTableAdminClient;
3128
use Google\Cloud\Bigtable\Admin\V2\ColumnFamily;
3229
use Google\Cloud\Bigtable\Admin\V2\GcRule;
30+
use Google\Cloud\Bigtable\Admin\V2\GcRule\Intersection as GcRuleIntersection;
31+
use Google\Cloud\Bigtable\Admin\V2\GcRule\Union as GcRuleUnion;
32+
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest;
33+
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
3334
use Google\Protobuf\Duration;
3435

3536
/**
@@ -81,7 +82,10 @@ function create_family_gc_nested(
8182
$columnModification = new Modification();
8283
$columnModification->setId('cf5');
8384
$columnModification->setCreate($columnFamily5);
84-
$tableAdminClient->modifyColumnFamilies($tableName, [$columnModification]);
85+
$modifyColumnFamiliesRequest = (new ModifyColumnFamiliesRequest())
86+
->setName($tableName)
87+
->setModifications([$columnModification]);
88+
$tableAdminClient->modifyColumnFamilies($modifyColumnFamiliesRequest);
8589

8690
print('Created column family cf5 with a Nested GC rule.' . PHP_EOL);
8791
}

‎bigtable/src/create_family_gc_union.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424
namespace Google\Cloud\Samples\Bigtable;
2525

2626
// [START bigtable_create_family_gc_union]
27-
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
28-
use Google\Cloud\Bigtable\Admin\V2\GcRule\Union as GcRuleUnion;
29-
use Google\Cloud\Bigtable\Admin\V2\BigtableTableAdminClient;
27+
use Google\Cloud\Bigtable\Admin\V2\Client\BigtableTableAdminClient;
3028
use Google\Cloud\Bigtable\Admin\V2\ColumnFamily;
3129
use Google\Cloud\Bigtable\Admin\V2\GcRule;
30+
use Google\Cloud\Bigtable\Admin\V2\GcRule\Union as GcRuleUnion;
31+
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest;
32+
use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
3233
use Google\Protobuf\Duration;
3334

3435
/**
@@ -69,7 +70,10 @@ function create_family_gc_union(
6970
$columnModification = new Modification();
7071
$columnModification->setId('cf3');
7172
$columnModification->setCreate($columnFamily3);
72-
$tableAdminClient->modifyColumnFamilies($tableName, [$columnModification]);
73+
$modifyColumnFamiliesRequest = (new ModifyColumnFamiliesRequest())
74+
->setName($tableName)
75+
->setModifications([$columnModification]);
76+
$tableAdminClient->modifyColumnFamilies($modifyColumnFamiliesRequest);
7377

7478
print('Created column family cf3 with Union GC rule.' . PHP_EOL);
7579
}

0 commit comments

Comments
 (0)