Merge pull request #161 from google/upstream-1583445779

Fix credential parsing

BUILD.bazel

@@ -23,9 +23,9 @@ py_library(
         "transport/**/*.py",
     ]),
     deps = [
-        "@httplib2//:httplib2",
-        "@oauth2client//:oauth2client",
-        "@six//:six",
+        "@httplib2",
+        "@oauth2client",
+        "@six",
     ],
 )
 
@@ -84,8 +84,8 @@ sh_test(
     size = "large",
     srcs = ["appender_test.sh"],
     data = [
-        ":testenv.sh",
         ":appender.par",
+        ":testenv.sh",
     ],
 )
 
@@ -94,8 +94,8 @@ sh_test(
     size = "large",
     srcs = ["puller_test.sh"],
     data = [
-        ":testenv.sh",
         ":puller.par",
+        ":testenv.sh",
     ],
 )
 
@@ -104,8 +104,8 @@ sh_test(
     size = "large",
     srcs = ["pusher_test.sh"],
     data = [
-        ":testenv.sh",
         ":pusher.par",
+        ":testenv.sh",
     ],
 )
 
@@ -114,8 +114,8 @@ sh_test(
     size = "large",
     srcs = ["digester_test.sh"],
     data = [
-        ":testenv.sh",
         ":digester.par",
         ":pusher.par",
+        ":testenv.sh",
     ],
 )

client/docker_creds_.py

@@ -175,7 +175,7 @@ def Get(self):
       raise Exception('Error fetching credential for %s, exit status: %d\n%s' %
                       (self._name, p.returncode, stdout))
 
-    blob = json.loads(stdout)
+    blob = json.loads(stdout.decode('utf-8'))
     logging.info('Successfully obtained Docker credentials.')
     return Basic(blob['Username'], blob['Secret']).Get()
 

puller_test.sh

@@ -153,7 +153,6 @@ test_image quay.io/coreos/etcd:latest
 # TODO: Error pulling and saving image registry.gitlab.com/mattmoor/test-project/image:latest: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: unable to get local issuer certificate (_ssl.c:1108)
 # test_base registry.gitlab.com/mattmoor/test-project/image:latest python3 python:3
 
-
 # Test pulling by digest
 test_image gcr.io/google-containers/pause@sha256:9ce5316f9752b8347484ab0f6778573af15524124d52b93230b9a0dcc987e73e