Use the new(er) getServiceAccount method instead of hard coding the s…

…torage service account (#1666) * use getServiceAccount in favor of hard coded approach * add space * remove unnecessary variables
googleapis · Feb 6, 2019 · 22b52f2 · 22b52f2
1 parent 8b93fb8
commit 22b52f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/Storage/tests/System/ManageNotificationsTest.php b/Storage/tests/System/ManageNotificationsTest.php
@@ -27,13 +27,12 @@ public function testCreateAndListNotifications()
     {
         $created = [];
         $topic = self::createTopic(self::$pubsubClient, uniqid(self::TESTING_PREFIX));
-        $projectId = self::getProjectId(getenv('GOOGLE_CLOUD_PHP_TESTS_KEY_PATH'));
         $policy = $topic->iam()->policy();
         $policy['bindings'] = [
             [
                 'role' => 'roles/pubsub.publisher',
                 'members' => [
-                    "serviceAccount:$projectId@gs-project-accounts.iam.gserviceaccount.com"
+                    'serviceAccount:' . self::$client->getServiceAccount()
                 ]
             ]
         ];

diff --git a/Storage/tests/System/RequesterPaysTest.php b/Storage/tests/System/RequesterPaysTest.php
@@ -53,17 +53,12 @@ public static function setupBeforeClass()
 
         $requesterKeyFilePath = getenv('GOOGLE_CLOUD_PHP_WHITELIST_TESTS_KEY_PATH');
         $ownerKeyFilePath = getenv('GOOGLE_CLOUD_PHP_TESTS_KEY_PATH');
-
         self::$requesterKeyFile = json_decode(file_get_contents($requesterKeyFilePath), true);
         self::$requesterEmail = self::$requesterKeyFile['client_email'];
         self::$requesterProject = self::$requesterKeyFile['project_id'];
-
         self::$ownerKeyFile = json_decode(file_get_contents($ownerKeyFilePath), true);
         self::$ownerEmail = self::$ownerKeyFile['client_email'];
-        self::$ownerProject = self::$ownerKeyFile['project_id'];
-
         self::$bucketName = uniqid(self::TESTING_PREFIX);
-
         $client = self::$client;
 
         // Owner bucket instance is a bucket class with requester pays turned on
@@ -111,7 +106,7 @@ public static function setupBeforeClass()
         $p['bindings'][] = [
             'role' => 'roles/pubsub.publisher',
             'members' => [
-                'serviceAccount:'. self::$ownerProject .'@gs-project-accounts.iam.gserviceaccount.com',
+                'serviceAccount:' . $client->getServiceAccount()
             ]
         ];
         self::$topic->iam()->setPolicy($p);