Merge pull request GoogleCloudPlatform#960 from GoogleCloudPlatform/fix-hmac-sample

[Storage] Fix metadata HMAC list sample

Author: frankyn

storage/src/list_hmac_keys.php

@@ -38,8 +38,10 @@ function list_hmac_keys($projectId)
     // By default hmacKeys will use the projectId used by StorageClient() to list HMAC Keys.
     $hmacKeys = $storage->hmacKeys(['projectId' => $projectId]);
 
+    printf('HMAC Key\'s:' . PHP_EOL);
     foreach ($hmacKeys as $hmacKey) {
-        printf('HMAC key Metadata: %s' . PHP_EOL, print_r($hmacKey->info(), true));
+        printf('Service Account Email: %s' . PHP_EOL, $hmacKey->info()['serviceAccountEmail']);
+        printf('Access Id: %s' . PHP_EOL, $hmacKey->info()['accessId']);
     }
 }
 # [END storage_list_hmac_keys]

storage/test/HmacCommandTest.php

@@ -78,7 +78,7 @@ public function testHmacKeyList()
               'projectId' => self::$projectId
           ],
           ['interactive' => false]);
-        $this->assertContains("HMAC key Metadata:", $this->getActualOutput());
+        $this->assertContains('HMAC Key\'s:', $this->getActualOutput());
     }
 
     public function testHmacKeyCreate()
@@ -89,7 +89,7 @@ public function testHmacKeyCreate()
             'serviceAccountEmail' => $this->hmacServiceAccount
         ],
         ['interactive' => false]);
-        $this->assertContains("The base64 encoded secret is:", $this->getActualOutput());
+        $this->assertContains('The base64 encoded secret is:', $this->getActualOutput());
     }
 
     public function testHmacKeyGet()
@@ -101,7 +101,7 @@ public function testHmacKeyGet()
             '--get' => true
         ],
         ['interactive' => false]);
-        $this->assertContains("HMAC key Metadata:", $this->getActualOutput());
+        $this->assertContains('HMAC key Metadata:', $this->getActualOutput());
     }
 
     public function testHmacKeyDeactivate()
@@ -113,7 +113,7 @@ public function testHmacKeyDeactivate()
             '--deactivate' => true
         ],
         ['interactive' => false]);
-        $this->assertContains("The HMAC key is now inactive", $this->getActualOutput());
+        $this->assertContains('The HMAC key is now inactive', $this->getActualOutput());
     }
 
     public function testHmacKeyActivate()
@@ -132,7 +132,7 @@ public function testHmacKeyActivate()
               '--activate' => true
           ],
           ['interactive' => false]);
-        $this->assertContains("The HMAC key is now active", $this->getActualOutput());
+        $this->assertContains('The HMAC key is now active', $this->getActualOutput());
     }
 
     public function testHmacKeyDelete()
@@ -151,6 +151,6 @@ public function testHmacKeyDelete()
             '--delete' => true
         ],
         ['interactive' => false]);
-        $this->assertContains("The key is deleted,", $this->getActualOutput());
+        $this->assertContains('The key is deleted,', $this->getActualOutput());
     }
 }