fixes(bigtable): Fixes variable casing in Bigtable samples GoogleCloudPlatform#1385 (GoogleCloudPlatform#1387)

Author: saranshdhingra

bigtable/src/create_cluster.php

@@ -28,8 +28,8 @@
 if (count($argv) < 3 || count($argv) > 5) {
     return printf("Usage: php %s PROJECT_ID INSTANCE_ID CLUSTER_ID [LOCATION_ID]" . PHP_EOL, __FILE__);
 }
-list($_, $project_id, $instance_id, $cluster_id) = $argv;
-$location_id = isset($argv[4]) ? $argv[4] : 'us-east1-b';
+list($_, $projectId, $instanceId, $clusterId) = $argv;
+$locationId = isset($argv[4]) ? $argv[4] : 'us-east1-b';
 
 // [START bigtable_create_cluster]
 
@@ -39,23 +39,23 @@
 use Google\ApiCore\ApiException;
 
 /** Uncomment and populate these variables in your code */
-// $project_id = 'The Google project ID';
-// $instance_id = 'The Bigtable instance ID';
-// $cluster_id = 'The Bigtable cluster ID';
-// $location_id = 'The Bigtable region ID';
+// $projectId = 'The Google project ID';
+// $instanceId = 'The Bigtable instance ID';
+// $clusterId = 'The Bigtable cluster ID';
+// $locationId = 'The Bigtable region ID';
 
 
 $instanceAdminClient = new BigtableInstanceAdminClient();
 
-$instanceName = $instanceAdminClient->instanceName($project_id, $instance_id);
-$clusterName = $instanceAdminClient->clusterName($project_id, $instance_id, $cluster_id);
+$instanceName = $instanceAdminClient->instanceName($projectId, $instanceId);
+$clusterName = $instanceAdminClient->clusterName($projectId, $instanceId, $clusterId);
 
-printf("Adding Cluster to Instance %s" . PHP_EOL, $instance_id);
+printf("Adding Cluster to Instance %s" . PHP_EOL, $instanceId);
 try {
     $instanceAdminClient->getInstance($instanceName);
 } catch (ApiException $e) {
     if ($e->getStatus() === 'NOT_FOUND') {
-        printf("Instance %s does not exists." . PHP_EOL, $instance_id);
+        printf("Instance %s does not exists." . PHP_EOL, $instanceId);
         return;
     } else {
         throw $e;
@@ -77,21 +77,21 @@
 $cluster->setDefaultStorageType($storage_type);
 $cluster->setLocation(
     $instanceAdminClient->locationName(
-        $project_id,
-        $location_id
+        $projectId,
+        $locationId
     )
 );
 try {
     $instanceAdminClient->getCluster($clusterName);
-    printf("Cluster %s already exists, aborting...", $cluster_id);
+    printf("Cluster %s already exists, aborting...", $clusterId);
 } catch (ApiException $e) {
     if ($e->getStatus() === 'NOT_FOUND') {
-        $operationResponse = $instanceAdminClient->createCluster($instanceName, $cluster_id, $cluster);
+        $operationResponse = $instanceAdminClient->createCluster($instanceName, $clusterId, $cluster);
 
         $operationResponse->pollUntilComplete();
         if ($operationResponse->operationSucceeded()) {
             $result = $operationResponse->getResult();
-            printf("Cluster created: %s", $cluster_id);
+            printf("Cluster created: %s", $clusterId);
         } else {
             $error = $operationResponse->getError();
             printf("Cluster not created: %s", $error);

bigtable/src/create_dev_instance.php

@@ -28,8 +28,8 @@
 if (count($argv) < 3 || count($argv) > 5) {
     return printf("Usage: php %s PROJECT_ID INSTANCE_ID CLUSTER_ID [LOCATION_ID]" . PHP_EOL, __FILE__);
 }
-list($_, $project_id, $instance_id, $cluster_id) = $argv;
-$location_id = isset($argv[4]) ? $argv[4] : 'us-east1-b';
+list($_, $projectId, $instanceId, $clusterId) = $argv;
+$locationId = isset($argv[4]) ? $argv[4] : 'us-east1-b';
 
 // [START bigtable_create_dev_instance]
 
@@ -41,62 +41,62 @@
 use Google\ApiCore\ApiException;
 
 /** Uncomment and populate these variables in your code */
-// $project_id = 'The Google project ID';
-// $instance_id = 'The Bigtable instance ID';
-// $cluster_id = 'The Bigtable cluster ID';
-// $location_id = 'The Bigtable region ID';
+// $projectId = 'The Google project ID';
+// $instanceId = 'The Bigtable instance ID';
+// $clusterId = 'The Bigtable cluster ID';
+// $locationId = 'The Bigtable region ID';
 
 
 $instanceAdminClient = new BigtableInstanceAdminClient();
 
-$projectName = $instanceAdminClient->projectName($project_id);
-$instanceName = $instanceAdminClient->instanceName($project_id, $instance_id);
+$projectName = $instanceAdminClient->projectName($projectId);
+$instanceName = $instanceAdminClient->instanceName($projectId, $instanceId);
 
 
 printf("Creating a DEVELOPMENT Instance" . PHP_EOL);
 // Set options to create an Instance
 
-$storage_type = StorageType::HDD;
+$storageType = StorageType::HDD;
 $development = InstanceType::DEVELOPMENT;
 $labels = ['dev-label' => 'dev-label'];
 
 
 # Create instance with given options
 $instance = new Instance();
-$instance->setDisplayName($instance_id);
+$instance->setDisplayName($instanceId);
 $instance->setLabels($labels);
 $instance->setType($development);
 
 // Create cluster with given options
 $cluster = new Cluster();
-$cluster->setDefaultStorageType($storage_type);
+$cluster->setDefaultStorageType($storageType);
 $cluster->setLocation(
     $instanceAdminClient->locationName(
-        $project_id,
-        $location_id
+        $projectId,
+        $locationId
     )
 );
 $clusters = [
-    $cluster_id => $cluster
+    $clusterId => $cluster
 ];
 // Create development instance with given options
 try {
     $instanceAdminClient->getInstance($instanceName);
-    printf("Instance %s already exists." . PHP_EOL, $instance_id);
+    printf("Instance %s already exists." . PHP_EOL, $instanceId);
 } catch (ApiException $e) {
     if ($e->getStatus() === 'NOT_FOUND') {
-        printf("Creating a development Instance: %s" . PHP_EOL, $instance_id);
+        printf("Creating a development Instance: %s" . PHP_EOL, $instanceId);
         $operationResponse = $instanceAdminClient->createInstance(
             $projectName,
-            $instance_id,
+            $instanceId,
             $instance,
             $clusters
         );
         $operationResponse->pollUntilComplete();
         if (!$operationResponse->operationSucceeded()) {
             print('Error: ' . $operationResponse->getError()->getMessage());
         } else {
-            printf("Instance %s created.", $instance_id);
+            printf("Instance %s created.", $instanceId);
         }
     } else {
         throw $e;

bigtable/src/create_family_gc_intersection.php

@@ -28,7 +28,7 @@
 if (count($argv) != 4) {
     return printf("Usage: php %s PROJECT_ID INSTANCE_ID TABLE_ID" . PHP_EOL, __FILE__);
 }
-list($_, $project_id, $instance_id, $table_id) = $argv;
+list($_, $projectId, $instanceId, $tableId) = $argv;
 
 // [START bigtable_create_family_gc_intersection]
 use Google\Cloud\Bigtable\Admin\V2\GcRule\Intersection as GcRuleIntersection;
@@ -39,26 +39,26 @@
 use Google\Protobuf\Duration;
 
 /** Uncomment and populate these variables in your code */
-// $project_id = 'The Google project ID';
-// $instance_id = 'The Bigtable instance ID';
-// $table_id = 'The Bigtable table ID';
+// $projectId = 'The Google project ID';
+// $instanceId = 'The Bigtable instance ID';
+// $tableId = 'The Bigtable table ID';
 
 $tableAdminClient = new BigtableTableAdminClient();
 
-$tableName = $tableAdminClient->tableName($project_id, $instance_id, $table_id);
+$tableName = $tableAdminClient->tableName($projectId, $instanceId, $tableId);
 
 print('Creating column family cf4 with Intersection GC rule...' . PHP_EOL);
 $columnFamily4 = new ColumnFamily();
 
-$intersection_rule = new GcRuleIntersection();
-$intersection_array = [
+$intersectionRule = new GcRuleIntersection();
+$intersectionArray = [
     (new GcRule)->setMaxAge((new Duration())->setSeconds(3600 * 24 * 5)),
     (new GcRule)->setMaxNumVersions(2)
 ];
-$intersection_rule->setRules($intersection_array);
+$intersectionRule->setRules($intersectionArray);
 
 $intersection = new GcRule();
-$intersection->setIntersection($intersection_rule);
+$intersection->setIntersection($intersectionRule);
 
 $columnFamily4->setGCRule($intersection);
 

bigtable/src/create_family_gc_max_age.php

@@ -28,7 +28,7 @@
 if (count($argv) != 4) {
     return printf("Usage: php %s PROJECT_ID INSTANCE_ID TABLE_ID" . PHP_EOL, __FILE__);
 }
-list($_, $project_id, $instance_id, $table_id) = $argv;
+list($_, $projectId, $instanceId, $tableId) = $argv;
 
 // [START bigtable_create_family_gc_max_age]
 use Google\Cloud\Bigtable\Admin\V2\ModifyColumnFamiliesRequest\Modification;
@@ -38,13 +38,13 @@
 use Google\Protobuf\Duration;
 
 /** Uncomment and populate these variables in your code */
-// $project_id = 'The Google project ID';
-// $instance_id = 'The Bigtable instance ID';
-// $table_id = 'The Bigtable table ID';
+// $projectId = 'The Google project ID';
+// $instanceId = 'The Bigtable instance ID';
+// $tableId = 'The Bigtable table ID';
 
 $tableAdminClient = new BigtableTableAdminClient();
 
-$tableName = $tableAdminClient->tableName($project_id, $instance_id, $table_id);
+$tableName = $tableAdminClient->tableName($projectId, $instanceId, $tableId);
 
 
 print('Creating column family cf1 with MaxAge GC Rule...' . PHP_EOL);

bigtable/src/create_family_gc_max_versions.php

@@ -28,7 +28,7 @@
 if (count($argv) != 4) {
     return printf("Usage: php %s PROJECT_ID INSTANCE_ID TABLE_ID" . PHP_EOL, __FILE__);
 }
-list($_, $project_id, $instance_id, $table_id) = $argv;
+list($_, $projectId, $instanceId, $tableId) = $argv;
 
 // [START bigtable_create_family_gc_max_versions]
 
@@ -38,13 +38,13 @@
 use Google\Cloud\Bigtable\Admin\V2\GcRule;
 
 /** Uncomment and populate these variables in your code */
-// $project_id = 'The Google project ID';
-// $instance_id = 'The Bigtable instance ID';
-// $table_id = 'The Bigtable table ID';
+// $projectId = 'The Google project ID';
+// $instanceId = 'The Bigtable instance ID';
+// $tableId = 'The Bigtable table ID';
 
 $tableAdminClient = new BigtableTableAdminClient();
 
-$tableName = $tableAdminClient->tableName($project_id, $instance_id, $table_id);
+$tableName = $tableAdminClient->tableName($projectId, $instanceId, $tableId);
 
 
 print('Creating column family cf2 with max versions GC rule...' . PHP_EOL);

bigtable/src/create_family_gc_nested.php

@@ -28,7 +28,7 @@
 if (count($argv) != 4) {
     return printf("Usage: php %s PROJECT_ID INSTANCE_ID TABLE_ID" . PHP_EOL, __FILE__);
 }
-list($_, $project_id, $instance_id, $table_id) = $argv;
+list($_, $projectId, $instanceId, $tableId) = $argv;
 
 // [START bigtable_create_family_gc_nested]
 
@@ -41,13 +41,13 @@
 use Google\Protobuf\Duration;
 
 /** Uncomment and populate these variables in your code */
-// $project_id = 'The Google project ID';
-// $instance_id = 'The Bigtable instance ID';
-// $table_id = 'The Bigtable table ID';
+// $projectId = 'The Google project ID';
+// $instanceId = 'The Bigtable instance ID';
+// $tableId = 'The Bigtable table ID';
 
 $tableAdminClient = new BigtableTableAdminClient();
 
-$tableName = $tableAdminClient->tableName($project_id, $instance_id, $table_id);
+$tableName = $tableAdminClient->tableName($projectId, $instanceId, $tableId);
 
 
 print('Creating column family cf5 with a Nested GC rule...' . PHP_EOL);
@@ -71,14 +71,14 @@
 $rule2 = new GcRule();
 $rule2->setIntersection($rule2Intersection);
 
-$nested_rule = new GcRuleUnion();
-$nested_rule->setRules([
+$nestedRule = new GcRuleUnion();
+$nestedRule->setRules([
     $rule1,
     $rule2
 ]);
-$nested_rule = (new GcRule())->setUnion($nested_rule);
+$nestedRule = (new GcRule())->setUnion($nestedRule);
 
-$columnFamily5->setGCRule($nested_rule);
+$columnFamily5->setGCRule($nestedRule);
 
 $columnModification = new Modification();
 $columnModification->setId('cf5');

bigtable/src/create_family_gc_union.php

@@ -28,7 +28,7 @@
 if (count($argv) != 4) {
     return printf("Usage: php %s PROJECT_ID INSTANCE_ID TABLE_ID" . PHP_EOL, __FILE__);
 }
-list($_, $project_id, $instance_id, $table_id) = $argv;
+list($_, $projectId, $instanceId, $tableId) = $argv;
 
 // [START bigtable_create_family_gc_union]
 
@@ -40,14 +40,14 @@
 use Google\Protobuf\Duration;
 
 /** Uncomment and populate these variables in your code */
-// $project_id = 'The Google project ID';
-// $instance_id = 'The Bigtable instance ID';
-// $table_id = 'The Bigtable table ID';
-// $location_id = 'The Bigtable region ID';
+// $projectId = 'The Google project ID';
+// $instanceId = 'The Bigtable instance ID';
+// $tableId = 'The Bigtable table ID';
+// $locationId = 'The Bigtable region ID';
 
 $tableAdminClient = new BigtableTableAdminClient();
 
-$tableName = $tableAdminClient->tableName($project_id, $instance_id, $table_id);
+$tableName = $tableAdminClient->tableName($projectId, $instanceId, $tableId);
 
 
 print('Creating column family cf3 with union GC rule...' . PHP_EOL);
@@ -59,14 +59,14 @@
 
 $columnFamily3 = new ColumnFamily();
 
-$rule_union = new GcRuleUnion();
-$rule_union_array = [
+$ruleUnion = new GcRuleUnion();
+$ruleUnionArray = [
     (new GcRule)->setMaxNumVersions(2),
     (new GcRule)->setMaxAge((new Duration())->setSeconds(3600 * 24 * 5))
 ];
-$rule_union->setRules($rule_union_array);
+$ruleUnion->setRules($ruleUnionArray);
 $union = new GcRule();
-$union->setUnion($rule_union);
+$union->setUnion($ruleUnion);
 
 $columnFamily3->setGCRule($union);