v7.1.2 release (#396)

* b64 decode the server_cas string when parsing a config file (#394)

* Fix tests from base64 bug fix (#395)

* update changelog and version

Co-authored-by: Clayton Lemons <[email protected]>

Author: Ben Bonenfant

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 7.1.2 (2022-03-16)
+- Fix bug where server CAs were not expected to be b64encoded within the pachctl config file.
+
 ## 7.1.1 (2022-02-04)
 - Update protobuf files to v2.0.5
 - Fix bug where only 20MiB of data could be retrieved with `client.get_file`

src/python_pachyderm/client.py

@@ -1,5 +1,6 @@
 import os
 import json
+from base64 import b64decode
 from pathlib import Path
 from typing import TextIO
 from urllib.parse import urlparse
@@ -413,7 +414,9 @@ def _parse_config(config):
         host = u.hostname
         port = u.port
         tls = u.scheme == "grpcs" or u.scheme == "https"
-        root_certs = bytes(root_certs, "utf-8") if root_certs is not None else None
+        root_certs = (
+            b64decode(bytes(root_certs, "utf-8")) if root_certs is not None else None
+        )
 
         return host, port, pachd_address, auth_token, root_certs, transaction_id, tls
 

tests/test_client.py

@@ -1,6 +1,7 @@
 import io
 import os
 import json
+from base64 import b64encode
 from pathlib import Path
 
 import pytest
@@ -11,38 +12,39 @@
 
 
 def test_check_config_order(mocker):
+    server_cas = b64encode(b"foo").decode()
     env_config = json.loads(
-        """
-      {
-        "v2": {
+        f"""
+      {{
+        "v2": {{
           "active_context": "local",
-          "contexts": {
-            "local": {
+          "contexts": {{
+            "local": {{
               "pachd_address": "grpcs://172.17.0.6:30650",
-              "server_cas": "foo",
+              "server_cas": "{server_cas}",
               "session_token": "bar",
               "active_transaction": "baz"
-            }
-          }
-        }
-      }
+            }}
+          }}
+        }}
+      }}
     """
     )
     spout_config = json.loads(
-        """
-      {
-        "v2": {
+        f"""
+      {{
+        "v2": {{
           "active_context": "local",
-          "contexts": {
-            "local": {
+          "contexts": {{
+            "local": {{
               "pachd_address": "[::1]:80",
-              "server_cas": "foo",
+              "server_cas": "{server_cas}",
               "session_token": "bar",
               "active_transaction": "baz"
-            }
-          }
-        }
-      }
+            }}
+          }}
+        }}
+      }}
     """
     )
     local_config = json.loads(
@@ -97,6 +99,9 @@ def test_check_config_order(mocker):
 
 
 def test_parse_config():
+    server_cas = b"foo"
+    server_cas_base64 = b64encode(server_cas)
+
     (
         host,
         port,
@@ -114,21 +119,22 @@ def test_parse_config():
             "contexts": {
               "local": {
                 "pachd_address": "grpcs://172.17.0.6:30650",
-                "server_cas": "foo",
+                "server_cas": "%s",
                 "session_token": "bar",
                 "active_transaction": "baz"
               }
             }
           }
         }
         """
+            % server_cas_base64.decode()
         )
     )
     assert host == "172.17.0.6"
     assert port == 30650
     assert pachd_address == "grpcs://172.17.0.6:30650"
     assert auth_token == "bar"
-    assert root_certs == b"foo"
+    assert root_certs == server_cas
     assert transaction_id == "baz"
     assert tls is True
 
@@ -271,22 +277,23 @@ def test_client_new_from_config():
         )
 
     # check that pachd address and other context fields are respected
+    server_cas = b64encode(b"foo").decode()
     client = python_pachyderm.Client.new_from_config(
         config_file=io.StringIO(
-            """
-        {
-          "v2": {
+            f"""
+        {{
+          "v2": {{
             "active_context": "local",
-            "contexts": {
-              "local": {
+            "contexts": {{
+              "local": {{
                 "pachd_address": "grpcs://172.17.0.6:30650",
-                "server_cas": "foo",
+                "server_cas": "{server_cas}",
                 "session_token": "bar",
                 "active_transaction": "baz"
-              }
-            }
-          }
-        }
+              }}
+            }}
+          }}
+        }}
     """
         )
     )

version.json

@@ -1,6 +1,6 @@
 {
     "pachyderm": "2.0.5",
-    "python-pachyderm": "7.1.1",
+    "python-pachyderm": "7.1.2",
     "kubernetes": "1.21.0",
     "minikube": "1.22.0"
 }