Add projectId as a clear parameter

Author: Frank Natividad

storage/src/activate_hmac_key.php

@@ -30,15 +30,16 @@
  * Activate HMAC key.
  *
  * @param string $accessId access ID for an inactive HMAC key.
+ * @param string $projectId Google Cloud Project ID.
  *
  */
-function activate_hmac_key($accessId)
+function activate_hmac_key($accessId, $projectId)
 {
     $storage = new StorageClient();
     // By default hmacKey will use the projectId used by StorageClient().
-    $hmacKey = $storage->hmacKey($accessId);
+    $hmacKey = $storage->hmacKey($accessId, $projectId);
 
-    $hmacKey = $hmacKey->update('ACTIVE');
+    $hmacKey->update('ACTIVE');
 
     print("The HMAC key is now active.");
     printf("HMAC key Metadata: %s" . PHP_EOL, print_r($hmacKey->info()));

storage/src/create_hmac_key.php

@@ -30,14 +30,14 @@
  * Create a new HMAC key.
  *
  * @param string $serviceAccountEmail service account email to associate with new HMAC key.
- * @param string $options options for the new HMAC key such as projectId.
+ * @param string $projectId Google Cloud Project ID.
  *
  */
-function create_hmac_key($serviceAccountEmail, $options = ['projectId' => 'your-project-id'])
+function create_hmac_key($serviceAccountEmail, $projectId)
 {
     $storage = new StorageClient();
     // By default createHmacKey will use the projectId used by StorageClient().
-    $hmacKeyCreated = $storage->createHmacKey($serviceAccountEmail, $options);
+    $hmacKeyCreated = $storage->createHmacKey($serviceAccountEmail, ['projectId' => $projectId]);
 
     printf("The base64 encoded secret is: %s", $hmacKeyCreated->secret());
     print("Do not miss that secret, there is no API to recover it.");

storage/src/deactivate_hmac_key.php

@@ -30,15 +30,16 @@
  * Deactivate HMAC key.
  *
  * @param string $accessId access ID for an inactive HMAC key.
+ * @param string $projectId Google Cloud Project ID.
  *
  */
-function deactivate_hmac_key($accessId)
+function deactivate_hmac_key($accessId, $projectId)
 {
     $storage = new StorageClient();
     // By default hmacKey will use the projectId used by StorageClient().
-    $hmacKey = $storage->hmacKey($accessId);
+    $hmacKey = $storage->hmacKey($accessId, $projectId);
 
-    $hmacKey = $hmacKey->update('INACTIVE');
+    $hmacKey->update('INACTIVE');
 
     print("The HMAC key is now inactive.");
     printf("HMAC key Metadata: %s" . PHP_EOL, print_r($hmacKey->info()));

storage/src/delete_hmac_key.php

@@ -30,13 +30,14 @@
  * Delete HMAC key.
  *
  * @param string $accessId access ID for an inactive HMAC key.
+ * @param string $projectId Google Cloud Project ID.
  *
  */
-function delete_hmac_key($accessId)
+function delete_hmac_key($accessId, $projectId)
 {
     $storage = new StorageClient();
     // By default hmacKey will use the projectId used by StorageClient().
-    $hmacKey = $storage->hmacKey($accessId);
+    $hmacKey = $storage->hmacKey($accessId, $projectId);
 
     $hmacKey->delete();
     print("The key is deleted, though it may still appear in StorageClient.hmacKeys() results.");

storage/src/get_hmac_key.php

@@ -30,7 +30,7 @@
  * Get HMAC key.
  *
  * @param string $accessId access ID for HMAC key.
- * @param string $projectId Google Cloud Project Id.
+ * @param string $projectId Google Cloud Project ID.
  *
  */
 function get_hmac_key($accessId, $projectId)

storage/src/list_hmac_keys.php

@@ -29,14 +29,14 @@
 /**
  * List HMAC keys.
  *
- * @param string $options options for the new HMAC key.
+ * @param string $projectId Google Cloud Project ID.
  *
  */
-function list_hmac_keys($options = ['projectId' => 'your-project-id'])
+function list_hmac_keys($projectId)
 {
     $storage = new StorageClient();
     // By default hmacKeys will use the projectId used by StorageClient() list HMAC Keys.
-    $hmacKeys = $storage->hmacKeys($options);
+    $hmacKeys = $storage->hmacKeys(['projectId' => $projectId]);
 
     foreach ($hmacKeys as $hmacKey) {
         printf("HMAC key Metadata: %s" . PHP_EOL, print_r($hmacKey->info()));

storage/storage.php

@@ -443,7 +443,7 @@
     ->addArgument('projectId', InputArgument::REQUIRED, 'The Cloud Project ID HMAC Keys to list')
     ->setCode(function ($input, $output) {
         $projectId = $input->getArgument('projectId');
-        list_hmac_keys(['projectId' => $projectId]);
+        list_hmac_keys($projectId);
     });
 
 $application->add(new Command('hmac-sa-create'))
@@ -460,7 +460,7 @@
     ->setCode(function ($input, $output) {
         $projectId = $input->getArgument('projectId');
         $serviceAccountEmail = $input->getArgument('serviceAccountEmail');
-        create_hmac_key($serviceAccountEmail, ['projectId' => $projectId]);
+        create_hmac_key($serviceAccountEmail, $projectId);
     });
 
 $application->add(new Command('hmac-sa-manage'))
@@ -482,13 +482,13 @@
         $projectId = $input->getArgument('projectId');
         $accessId = $input->getArgument('accessId');
         if ($input->getOption('activate')) {
-            activate_hmac_key($accessId);
+            activate_hmac_key($accessId, $projectId);
         } elseif ($input->getOption('deactivate')) {
-            deactivate_hmac_key($accessId);
+            deactivate_hmac_key($accessId, $projectId);
         } elseif ($input->getOption('get')) {
             get_hmac_key($accessId, $projectId);
         } elseif ($input->getOption('delete')) {
-            delete_hmac_key($accessId);
+            delete_hmac_key($accessId, $projectId);
         } else {
             throw new \Exception('You must provide --activate, --deactivate, --get, or --delete with an HMAC key accessId.');
         }