chore: upgrade bigtable samples to new surface

bigtable/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-bigtable": "^1.3.1"
+        "google/cloud-bigtable": "^1.30"
     },
     "autoload-dev": {
         "psr-4": {

bigtable/src/create_app_profile.php

@@ -24,10 +24,11 @@
 namespace Google\Cloud\Samples\Bigtable;
 
 // [START bigtable_create_app_profile]
-use Google\Cloud\Bigtable\Admin\V2\BigtableInstanceAdminClient;
+use Google\ApiCore\ApiException;
 use Google\Cloud\Bigtable\Admin\V2\AppProfile;
 use Google\Cloud\Bigtable\Admin\V2\AppProfile\SingleClusterRouting;
-use Google\ApiCore\ApiException;
+use Google\Cloud\Bigtable\Admin\V2\Client\BigtableInstanceAdminClient;
+use Google\Cloud\Bigtable\Admin\V2\CreateAppProfileRequest;
 
 /**
  * Create an App Profile
@@ -68,7 +69,11 @@ function create_app_profile(
     printf('Creating a new AppProfile %s' . PHP_EOL, $appProfileId);
 
     try {
-        $newAppProfile = $instanceAdminClient->createAppProfile($instanceName, $appProfileId, $appProfile);
+        $createAppProfileRequest = (new CreateAppProfileRequest())
+            ->setParent($instanceName)
+            ->setAppProfileId($appProfileId)
+            ->setAppProfile($appProfile);
+        $newAppProfile = $instanceAdminClient->createAppProfile($createAppProfileRequest);
     } catch (ApiException $e) {
         if ($e->getStatus() === 'ALREADY_EXISTS') {
             printf('AppProfile %s already exists.', $appProfileId);

bigtable/src/create_cluster.php

@@ -24,10 +24,14 @@
 namespace Google\Cloud\Samples\Bigtable;
 
 // [START bigtable_create_cluster]
-use Google\Cloud\Bigtable\Admin\V2\BigtableInstanceAdminClient;
+use Google\ApiCore\ApiException;
+use Google\Cloud\Bigtable\Admin\V2\Client\BigtableInstanceAdminClient;
 use Google\Cloud\Bigtable\Admin\V2\Cluster;
+use Google\Cloud\Bigtable\Admin\V2\CreateClusterRequest;
+use Google\Cloud\Bigtable\Admin\V2\GetClusterRequest;
+use Google\Cloud\Bigtable\Admin\V2\GetInstanceRequest;
+use Google\Cloud\Bigtable\Admin\V2\ListClustersRequest;
 use Google\Cloud\Bigtable\Admin\V2\StorageType;
-use Google\ApiCore\ApiException;
 
 /**
  * Create a cluster in an existing Bigtable instance
@@ -50,7 +54,9 @@ function create_cluster(
 
     printf('Adding Cluster to Instance %s' . PHP_EOL, $instanceId);
     try {
-        $instanceAdminClient->getInstance($instanceName);
+        $getInstanceRequest = (new GetInstanceRequest())
+            ->setName($instanceName);
+        $instanceAdminClient->getInstance($getInstanceRequest);
     } catch (ApiException $e) {
         if ($e->getStatus() === 'NOT_FOUND') {
             printf('Instance %s does not exists.' . PHP_EOL, $instanceId);
@@ -63,8 +69,10 @@ function create_cluster(
 
     $storage_type = StorageType::SSD;
     $serve_nodes = 3;
+    $listClustersRequest = (new ListClustersRequest())
+        ->setParent($instanceName);
 
-    $clustersBefore = $instanceAdminClient->listClusters($instanceName)->getClusters();
+    $clustersBefore = $instanceAdminClient->listClusters($listClustersRequest)->getClusters();
     $clusters = $clustersBefore->getIterator();
     foreach ($clusters as $cluster) {
         print($cluster->getName() . PHP_EOL);
@@ -80,11 +88,17 @@ function create_cluster(
         )
     );
     try {
-        $instanceAdminClient->getCluster($clusterName);
+        $getClusterRequest = (new GetClusterRequest())
+            ->setName($clusterName);
+        $instanceAdminClient->getCluster($getClusterRequest);
         printf('Cluster %s already exists, aborting...', $clusterId);
     } catch (ApiException $e) {
         if ($e->getStatus() === 'NOT_FOUND') {
-            $operationResponse = $instanceAdminClient->createCluster($instanceName, $clusterId, $cluster);
+            $createClusterRequest = (new CreateClusterRequest())
+                ->setParent($instanceName)
+                ->setClusterId($clusterId)
+                ->setCluster($cluster);
+            $operationResponse = $instanceAdminClient->createCluster($createClusterRequest);
 
             $operationResponse->pollUntilComplete();
             if ($operationResponse->operationSucceeded()) {

bigtable/src/create_cluster_autoscale_config.php

@@ -26,10 +26,11 @@
 // [START bigtable_api_cluster_create_autoscaling]
 use Google\Cloud\Bigtable\Admin\V2\AutoscalingLimits;
 use Google\Cloud\Bigtable\Admin\V2\AutoscalingTargets;
-use Google\Cloud\Bigtable\Admin\V2\BigtableInstanceAdminClient;
+use Google\Cloud\Bigtable\Admin\V2\Client\BigtableInstanceAdminClient;
 use Google\Cloud\Bigtable\Admin\V2\Cluster;
 use Google\Cloud\Bigtable\Admin\V2\Cluster\ClusterAutoscalingConfig;
 use Google\Cloud\Bigtable\Admin\V2\Cluster\ClusterConfig;
+use Google\Cloud\Bigtable\Admin\V2\CreateClusterRequest;
 use Google\Cloud\Bigtable\Admin\V2\StorageType;
 
 /**
@@ -79,7 +80,11 @@ function create_cluster_autoscale_config(
         )
     );
     $cluster->setClusterConfig($clusterConfig);
-    $operationResponse = $instanceAdminClient->createCluster($instanceName, $clusterId, $cluster);
+    $createClusterRequest = (new CreateClusterRequest())
+        ->setParent($instanceName)
+        ->setClusterId($clusterId)
+        ->setCluster($cluster);
+    $operationResponse = $instanceAdminClient->createCluster($createClusterRequest);
 
     $operationResponse->pollUntilComplete();
     if ($operationResponse->operationSucceeded()) {

bigtable/src/create_dev_instance.php

@@ -24,12 +24,14 @@
 namespace Google\Cloud\Samples\Bigtable;
 
 // [START bigtable_create_dev_instance]
-use Google\Cloud\Bigtable\Admin\V2\BigtableInstanceAdminClient;
-use Google\Cloud\Bigtable\Admin\V2\Instance;
+use Google\ApiCore\ApiException;
+use Google\Cloud\Bigtable\Admin\V2\Client\BigtableInstanceAdminClient;
 use Google\Cloud\Bigtable\Admin\V2\Cluster;
-use Google\Cloud\Bigtable\Admin\V2\StorageType;
+use Google\Cloud\Bigtable\Admin\V2\CreateInstanceRequest;
+use Google\Cloud\Bigtable\Admin\V2\GetInstanceRequest;
+use Google\Cloud\Bigtable\Admin\V2\Instance;
 use Google\Cloud\Bigtable\Admin\V2\Instance\Type as InstanceType;
-use Google\ApiCore\ApiException;
+use Google\Cloud\Bigtable\Admin\V2\StorageType;
 
 /**
  * Create a development Bigtable instance
@@ -77,17 +79,19 @@ function create_dev_instance(
     ];
     // Create development instance with given options
     try {
-        $instanceAdminClient->getInstance($instanceName);
+        $getInstanceRequest = (new GetInstanceRequest())
+            ->setName($instanceName);
+        $instanceAdminClient->getInstance($getInstanceRequest);
         printf('Instance %s already exists.' . PHP_EOL, $instanceId);
     } catch (ApiException $e) {
         if ($e->getStatus() === 'NOT_FOUND') {
             printf('Creating a development Instance: %s' . PHP_EOL, $instanceId);
-            $operationResponse = $instanceAdminClient->createInstance(
-                $projectName,
-                $instanceId,
-                $instance,
-                $clusters
-            );
+            $createInstanceRequest = (new CreateInstanceRequest())
+                ->setParent($projectName)
+                ->setInstanceId($instanceId)
+                ->setInstance($instance)
+                ->setClusters($clusters);
+            $operationResponse = $instanceAdminClient->createInstance($createInstanceRequest);
             $operationResponse->pollUntilComplete();
             if (!$operationResponse->operationSucceeded()) {
                 print('Error: ' . $operationResponse->getError()->getMessage());

bigtable/src/create_family_gc_intersection.php

@@ -24,11 +24,12 @@
 namespace Google\Cloud\Samples\Bigtable;
 
 // [START bigtable_create_family_gc_intersection]
-use Google\Cloud\Bigtable\Admin\V2\GcRule\Intersection as GcRuleIntersection;
-use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
-use Google\Cloud\Bigtable\Admin\V2\BigtableTableAdminClient;
+use Google\Cloud\Bigtable\Admin\V2\Client\BigtableTableAdminClient;
 use Google\Cloud\Bigtable\Admin\V2\ColumnFamily;
 use Google\Cloud\Bigtable\Admin\V2\GcRule;
+use Google\Cloud\Bigtable\Admin\V2\GcRule\Intersection as GcRuleIntersection;
+use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest;
+use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
 use Google\Protobuf\Duration;
 
 /**
@@ -65,7 +66,10 @@ function create_family_gc_intersection(
     $columnModification = new Modification();
     $columnModification->setId('cf4');
     $columnModification->setCreate($columnFamily4);
-    $tableAdminClient->modifyColumnFamilies($tableName, [$columnModification]);
+    $modifyColumnFamiliesRequest = (new ModifyColumnFamiliesRequest())
+        ->setName($tableName)
+        ->setModifications([$columnModification]);
+    $tableAdminClient->modifyColumnFamilies($modifyColumnFamiliesRequest);
 
     print('Created column family cf4 with Union GC rule' . PHP_EOL);
 }

bigtable/src/create_family_gc_max_age.php

@@ -24,10 +24,11 @@
 namespace Google\Cloud\Samples\Bigtable;
 
 // [START bigtable_create_family_gc_max_age]
-use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
-use Google\Cloud\Bigtable\Admin\V2\BigtableTableAdminClient;
+use Google\Cloud\Bigtable\Admin\V2\Client\BigtableTableAdminClient;
 use Google\Cloud\Bigtable\Admin\V2\ColumnFamily;
 use Google\Cloud\Bigtable\Admin\V2\GcRule;
+use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest;
+use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
 use Google\Protobuf\Duration;
 
 /**
@@ -59,7 +60,10 @@ function create_family_gc_max_age(
     $columnModification = new Modification();
     $columnModification->setId('cf1');
     $columnModification->setCreate($columnFamily1);
-    $tableAdminClient->modifyColumnFamilies($tableName, [$columnModification]);
+    $modifyColumnFamiliesRequest = (new ModifyColumnFamiliesRequest())
+        ->setName($tableName)
+        ->setModifications([$columnModification]);
+    $tableAdminClient->modifyColumnFamilies($modifyColumnFamiliesRequest);
     print('Created column family cf1 with MaxAge GC Rule.' . PHP_EOL);
 }
 // [END bigtable_create_family_gc_max_age]

bigtable/src/create_family_gc_max_versions.php

@@ -24,10 +24,11 @@
 namespace Google\Cloud\Samples\Bigtable;
 
 // [START bigtable_create_family_gc_max_versions]
-use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
-use Google\Cloud\Bigtable\Admin\V2\BigtableTableAdminClient;
+use Google\Cloud\Bigtable\Admin\V2\Client\BigtableTableAdminClient;
 use Google\Cloud\Bigtable\Admin\V2\ColumnFamily;
 use Google\Cloud\Bigtable\Admin\V2\GcRule;
+use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest;
+use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
 
 /**
  * Create a new column family with a max versions GC rule
@@ -53,7 +54,10 @@ function create_family_gc_max_versions(
     $columnModification = new Modification();
     $columnModification->setId('cf2');
     $columnModification->setCreate($columnFamily2);
-    $tableAdminClient->modifyColumnFamilies($tableName, [$columnModification]);
+    $modifyColumnFamiliesRequest = (new ModifyColumnFamiliesRequest())
+        ->setName($tableName)
+        ->setModifications([$columnModification]);
+    $tableAdminClient->modifyColumnFamilies($modifyColumnFamiliesRequest);
 
     print('Created column family cf2 with Max Versions GC Rule.' . PHP_EOL);
 }

bigtable/src/create_family_gc_nested.php

@@ -24,12 +24,13 @@
 namespace Google\Cloud\Samples\Bigtable;
 
 // [START bigtable_create_family_gc_nested]
-use Google\Cloud\Bigtable\Admin\V2\GcRule\Intersection as GcRuleIntersection;
-use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
-use Google\Cloud\Bigtable\Admin\V2\GcRule\Union as GcRuleUnion;
-use Google\Cloud\Bigtable\Admin\V2\BigtableTableAdminClient;
+use Google\Cloud\Bigtable\Admin\V2\Client\BigtableTableAdminClient;
 use Google\Cloud\Bigtable\Admin\V2\ColumnFamily;
 use Google\Cloud\Bigtable\Admin\V2\GcRule;
+use Google\Cloud\Bigtable\Admin\V2\GcRule\Intersection as GcRuleIntersection;
+use Google\Cloud\Bigtable\Admin\V2\GcRule\Union as GcRuleUnion;
+use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest;
+use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
 use Google\Protobuf\Duration;
 
 /**
@@ -81,7 +82,10 @@ function create_family_gc_nested(
     $columnModification = new Modification();
     $columnModification->setId('cf5');
     $columnModification->setCreate($columnFamily5);
-    $tableAdminClient->modifyColumnFamilies($tableName, [$columnModification]);
+    $modifyColumnFamiliesRequest = (new ModifyColumnFamiliesRequest())
+        ->setName($tableName)
+        ->setModifications([$columnModification]);
+    $tableAdminClient->modifyColumnFamilies($modifyColumnFamiliesRequest);
 
     print('Created column family cf5 with a Nested GC rule.' . PHP_EOL);
 }

bigtable/src/create_family_gc_union.php

@@ -24,11 +24,12 @@
 namespace Google\Cloud\Samples\Bigtable;
 
 // [START bigtable_create_family_gc_union]
-use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
-use Google\Cloud\Bigtable\Admin\V2\GcRule\Union as GcRuleUnion;
-use Google\Cloud\Bigtable\Admin\V2\BigtableTableAdminClient;
+use Google\Cloud\Bigtable\Admin\V2\Client\BigtableTableAdminClient;
 use Google\Cloud\Bigtable\Admin\V2\ColumnFamily;
 use Google\Cloud\Bigtable\Admin\V2\GcRule;
+use Google\Cloud\Bigtable\Admin\V2\GcRule\Union as GcRuleUnion;
+use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest;
+use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
 use Google\Protobuf\Duration;
 
 /**
@@ -69,7 +70,10 @@ function create_family_gc_union(
     $columnModification = new Modification();
     $columnModification->setId('cf3');
     $columnModification->setCreate($columnFamily3);
-    $tableAdminClient->modifyColumnFamilies($tableName, [$columnModification]);
+    $modifyColumnFamiliesRequest = (new ModifyColumnFamiliesRequest())
+        ->setName($tableName)
+        ->setModifications([$columnModification]);
+    $tableAdminClient->modifyColumnFamilies($modifyColumnFamiliesRequest);
 
     print('Created column family cf3 with Union GC rule.' . PHP_EOL);
 }

bigtable/src/create_production_instance.php

@@ -24,13 +24,15 @@
 namespace Google\Cloud\Samples\Bigtable;
 
 // [START bigtable_create_prod_instance]
+use Exception;
+use Google\ApiCore\ApiException;
+use Google\Cloud\Bigtable\Admin\V2\Client\BigtableInstanceAdminClient;
+use Google\Cloud\Bigtable\Admin\V2\Cluster;
+use Google\Cloud\Bigtable\Admin\V2\CreateInstanceRequest;
+use Google\Cloud\Bigtable\Admin\V2\GetInstanceRequest;
+use Google\Cloud\Bigtable\Admin\V2\Instance;
 use Google\Cloud\Bigtable\Admin\V2\Instance\Type as InstanceType;
-use Google\Cloud\Bigtable\Admin\V2\BigtableInstanceAdminClient;
 use Google\Cloud\Bigtable\Admin\V2\StorageType;
-use Google\Cloud\Bigtable\Admin\V2\Instance;
-use Google\Cloud\Bigtable\Admin\V2\Cluster;
-use Google\ApiCore\ApiException;
-use Exception;
 
 /**
  * Create a production Bigtable instance
@@ -71,18 +73,20 @@ function create_production_instance(
         $clusterId => $cluster
     ];
     try {
-        $instanceAdminClient->getInstance($instanceName);
+        $getInstanceRequest = (new GetInstanceRequest())
+            ->setName($instanceName);
+        $instanceAdminClient->getInstance($getInstanceRequest);
         printf('Instance %s already exists.' . PHP_EOL, $instanceId);
         throw new Exception(sprintf('Instance %s already exists.' . PHP_EOL, $instanceId));
     } catch (ApiException $e) {
         if ($e->getStatus() === 'NOT_FOUND') {
             printf('Creating an Instance: %s' . PHP_EOL, $instanceId);
-            $operationResponse = $instanceAdminClient->createInstance(
-                $projectName,
-                $instanceId,
-                $instance,
-                $clusters
-            );
+            $createInstanceRequest = (new CreateInstanceRequest())
+                ->setParent($projectName)
+                ->setInstanceId($instanceId)
+                ->setInstance($instance)
+                ->setClusters($clusters);
+            $operationResponse = $instanceAdminClient->createInstance($createInstanceRequest);
             $operationResponse->pollUntilComplete();
             if (!$operationResponse->operationSucceeded()) {
                 print('Error: ' . $operationResponse->getError()->getMessage());

bigtable/src/create_table.php

@@ -24,11 +24,13 @@
 namespace Google\Cloud\Samples\Bigtable;
 
 // [START bigtable_create_table]
-use Google\Cloud\Bigtable\Admin\V2\BigtableInstanceAdminClient;
-use Google\Cloud\Bigtable\Admin\V2\BigtableTableAdminClient;
-use Google\Cloud\Bigtable\Admin\V2\Table\View;
-use Google\Cloud\Bigtable\Admin\V2\Table;
 use Google\ApiCore\ApiException;
+use Google\Cloud\Bigtable\Admin\V2\Client\BigtableInstanceAdminClient;
+use Google\Cloud\Bigtable\Admin\V2\Client\BigtableTableAdminClient;
+use Google\Cloud\Bigtable\Admin\V2\CreateTableRequest;
+use Google\Cloud\Bigtable\Admin\V2\GetTableRequest;
+use Google\Cloud\Bigtable\Admin\V2\Table;
+use Google\Cloud\Bigtable\Admin\V2\Table\View;
 
 /**
  * Create a new table in a Bigtable instance
@@ -54,17 +56,20 @@ function create_table(
     printf('Creating a Table : %s' . PHP_EOL, $tableId);
 
     try {
-        $tableAdminClient->getTable($tableName, ['view' => View::NAME_ONLY]);
+        $getTableRequest = (new GetTableRequest())
+            ->setName($tableName)
+            ->setView(View::NAME_ONLY);
+        $tableAdminClient->getTable($getTableRequest);
         printf('Table %s already exists' . PHP_EOL, $tableId);
     } catch (ApiException $e) {
         if ($e->getStatus() === 'NOT_FOUND') {
             printf('Creating the %s table' . PHP_EOL, $tableId);
+            $createTableRequest = (new CreateTableRequest())
+                ->setParent($instanceName)
+                ->setTableId($tableId)
+                ->setTable($table);
 
-            $tableAdminClient->createtable(
-                $instanceName,
-                $tableId,
-                $table
-            );
+            $tableAdminClient->createtable($createTableRequest);
             printf('Created table %s' . PHP_EOL, $tableId);
         } else {
             throw $e;