Cleaning up samples

Adding conditional for removing retention policy

Author: billyjacobson

storage/src/remove_retention_policy.php

@@ -37,9 +37,16 @@ function remove_retention_policy($bucketName)
 {
     $storage = new StorageClient();
     $bucket = $storage->bucket($bucketName);
+    $bucket->reload();
+
+    if ($bucket->info()['retentionPolicy']['isLocked']) {
+        printf('Unable to remove retention period as retention policy is locked.' . PHP_EOL);
+        return;
+    }
+
     $bucket->update([
-        'retentionPolicy' => [
-        ]]);
+        'retentionPolicy' => []
+    ]);
     printf('Removed bucket %s retention policy' . PHP_EOL, $bucketName);
 }
 # [END storage_remove_retention_policy]

storage/storage.php

@@ -148,7 +148,7 @@
     });
 
 
-// Create Buckets command
+// Set Bucket Lock commands
 $application->add(new Command('bucketlock'))
     ->setDescription('Manage Cloud Storage retention policies')
     ->setHelp(<<<EOF
@@ -160,7 +160,7 @@
     )
     ->addArgument('bucket', InputArgument::REQUIRED, 'The Cloud Storage bucket name')
     ->addArgument('object', InputArgument::OPTIONAL, 'The Cloud Storage object name')
-    ->addArgument('retention-period', InputArgument::OPTIONAL, 'The length of the retention period')
+    ->addArgument('retention-period', InputArgument::OPTIONAL, 'The length of the retention period in seconds')
     ->addOption('set-retention-policy', null, InputOption::VALUE_NONE, 'Set the retention policy')
     ->addOption('remove-retention-policy', null, InputOption::VALUE_NONE, 'Remove the retention policy')
     ->addOption('lock-retention-policy', null, InputOption::VALUE_NONE, 'Lock the retention policy')

storage/test/BucketLockCommandTest.php

@@ -82,7 +82,7 @@ public function testRetentionPolicyNoLock()
         );
         $this->bucket->reload();
 
-        $this->assertNull($this->bucket->info()['retentionPolicy']['isLocked']);
+        $this->assertFalse($this->bucket->info()['retentionPolicy']['isLocked']);
         $this->assertNotNull($this->bucket->info()['retentionPolicy']['effectiveTime']);
         $this->assertEquals($this->bucket->info()['retentionPolicy']['retentionPeriod'], $retentionPeriod);