Decode base64.b64decode output as string for Python 3 compatibility. (GoogleCloudPlatform#1910)

wwlian · engelke · commit b393619b38ea · 2019-01-25T12:58:26.000-08:00
diff --git a/composer/tools/copy_environment.py b/composer/tools/copy_environment.py
@@ -297,6 +297,7 @@ def create_service_account_key(iam_client, project, service_account_name):
     )
     service_account_key_decoded = ast.literal_eval(
         base64.b64decode(service_account_key.get("privateKeyData", ""))
+              .decode("utf-8")
     )
     time.sleep(5)
     return service_account_key_decoded

Original file line number	Diff line number	Diff line change
`@@ -297,6 +297,7 @@ def create_service_account_key(iam_client, project, service_account_name):`
`297`	`297`	`)`
`298`	`298`	`service_account_key_decoded = ast.literal_eval(`
`299`	`299`	`base64.b64decode(service_account_key.get("privateKeyData", ""))`
	`300`	`+ .decode("utf-8")`
`300`	`301`	`)`
`301`	`302`	`time.sleep(5)`
`302`	`303`	`return service_account_key_decoded`