feat: samples for dual region bucket creation (GoogleCloudPlatform#1659)

Author: vishwarajanand

storage/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-storage": "^1.20.1",
+        "google/cloud-storage": "^1.28.0",
         "paragonie/random_compat": "^9.0.0"
     },
     "require-dev": {

storage/src/create_bucket_dual_region.php

@@ -30,21 +30,25 @@
  * Create a new bucket with a custom default storage class and location.
  *
  * @param string $bucketName The name of your Cloud Storage bucket.
- * @param string $location1 First location for the bucket's regions. Case-insensitive.
- * @param string $location2 Second location for the bucket's regions. Case-insensitive.
+ * @param string $location Location for the bucket's regions. Case-insensitive.
+ * @param string $region1 First region for the bucket's regions. Case-insensitive.
+ * @param string $region2 Second region for the bucket's regions. Case-insensitive.
  */
-function create_bucket_dual_region($bucketName, $location1, $location2)
+function create_bucket_dual_region($bucketName, $location, $region1, $region2)
 {
     // $bucketName = 'my-bucket';
-    // $location1 = 'US-EAST1';
-    // $location2 = 'US-WEST1';
+    // $location = 'US';
+    // $region1 = 'US-EAST1';
+    // $region2 = 'US-WEST1';
 
     $storage = new StorageClient();
     $bucket = $storage->createBucket($bucketName, [
-        'location' => "${location1}+${location2}",
+        'location' => $location,
+        'customPlacementConfig' => [
+            'dataLocations' => [$region1, $region2],
+        ],
     ]);
-
-    printf("Created dual-region bucket '%s' in '%s+%s'", $bucket->name(), $location1, $location2);
+    printf("Bucket '%s' created in '%s' and '%s'", $bucket->name(), $region1, $region2);
 }
 # [END storage_create_bucket_dual_region]
 

storage/test/storageTest.php

@@ -674,23 +674,38 @@ public function testCreateBucketClassLocation()
 
     public function testCreateBucketDualRegion()
     {
-        $location1 = 'US-EAST1';
-        $location2 = 'US-WEST1';
+        $location = 'US';
+        $region1 = 'US-EAST1';
+        $region2 = 'US-WEST1';
 
         $bucketName = uniqid('samples-create-bucket-dual-region-');
         $output = self::runFunctionSnippet('create_bucket_dual_region', [
             $bucketName,
-            $location1,
-            $location2
+            $location,
+            $region1,
+            $region2
         ]);
 
         $bucket = self::$storage->bucket($bucketName);
+        $info = $bucket->reload();
         $exists = $bucket->exists();
         $bucket->delete();
 
         $this->assertTrue($exists);
-        $this->assertStringContainsString('Created dual-region bucket', $output);
-        $this->assertStringContainsString("${location1}+${location2}", $output);
+        $this->assertEquals(
+            sprintf(
+                "Bucket '%s' created in '%s' and '%s'",
+                $bucketName,
+                $region1,
+                $region2
+            ),
+            $output
+        );
+        $this->assertEquals($location, $info['location']);
+        $this->assertArrayHasKey('customPlacementConfig', $info);
+        $this->assertArrayHasKey('dataLocations', $info['customPlacementConfig']);
+        $this->assertContains($region1, $info['customPlacementConfig']['dataLocations']);
+        $this->assertContains($region2, $info['customPlacementConfig']['dataLocations']);
     }
 
     public function testObjectCsekToCmek()