fix(k8scluster): better err handling

Signed-off-by: Chris Snow <[email protected]>

Author: snowch

hpecp/cli/k8scluster.py

@@ -104,8 +104,7 @@ def create(
         :param addons: list of required addons. See:
             `hpecp k8scluster get-available-addons`
         :param external_identity_server: dict
-           Example {
-                "bind_pwd":"password",
+           Example '{"bind_pwd":"password",
                 "user_attribute":"CN",
                 "bind_type":"search_bind",
                 "bind_dn":"cn=Administrator,CN=Users,DC=samdom,DC=example,DC=com",
@@ -115,25 +114,25 @@ def create(
                 "base_dn":"CN=Users,DC=samdom,DC=example,DC=com",
                 "verify_peer":false,
                 "type":"Active Directory",
-                "port":636}
+                "port":636}'
         """
         host_config = [
             K8sClusterHostConfig.create_from_list(h.split(":"))
             for h in k8shosts_config.split(",")
         ]
 
-        if external_identity_server:
-            try:
-                external_identity_server = json.loads(external_identity_server)
-            except ValueError:
-                print(
-                    (
-                        "could not parse 'external_identity_server' parameter"
-                        " - is it valid json?"
-                    ),
-                    file=sys.stderr,
-                )
-                sys.exit(1)
+        if external_identity_server and not isinstance(
+            external_identity_server, dict
+        ):
+            print(
+                (
+                    "Could not parse 'external_identity_server' parameter"
+                    " - is it valid json?\n"
+                    "Received: " + external_identity_server + "\n"
+                ),
+                file=sys.stderr,
+            )
+            sys.exit(1)
 
         print(
             base.get_client().k8s_cluster.create(

tests/k8s_cluster_test.py

@@ -1108,7 +1108,7 @@ def test_k8scluster_create_valid_external_identity_server_json(
         hpecp.k8scluster.create(
             name="mycluster",
             k8shosts_config="/api/v2/worker/k8shost/1:master,/api/v2/worker/k8shost/2:worker",
-            external_identity_server='{"valid_json": true}',
+            external_identity_server={"valid_json": True},
         )
 
         output = self.out.getvalue().strip()
@@ -1136,7 +1136,10 @@ def test_k8scluster_create_invalid_external_identity_server_json(
         error = self.err.getvalue().strip()
         self.assertEqual(
             error,
-            "could not parse 'external_identity_server' parameter - is it valid json?",
+            (
+                "Could not parse 'external_identity_server' parameter - is it valid json?\n"
+                'Received: {\\"not_valid_json\\": true}'
+            ),
         )
 
         self.assertEqual(cm.exception.code, 1)