fix(run_kubectl_command): with apply typos fixed

Signed-off-by: Erdinc Kaya <[email protected]>

Author: erdincka

hpecp/cli/base.py

@@ -55,7 +55,7 @@ def get_profile():
     """Retrieve the profile - if supplied."""
     profile = os.getenv("PROFILE", default="default")
     _log.debug(
-        "PROFILE envirionment variable exists with value '{}'".format(profile)
+        "PROFILE environment variable exists with value '{}'".format(profile)
     )
     return profile
 

hpecp/cli/k8scluster.py

@@ -64,7 +64,7 @@ def __dir__(self):
             "statuses",
             "upgrade_cluster",
             "wait_for_status",
-            "run_kubectl_command"
+            "run_kubectl_command",
         ]
 
     def __init__(self):
@@ -321,7 +321,7 @@ def get_available_addons(self, id=None, k8s_version=None):
                 print(
                     "'k8s_version' parameter must be quoted, e.g. \\\"1.20.11\\\" or \"'1.20.11'\"",
                     file=sys.stderr,
-                    )
+                )
                 sys.exit(1)
             print(
                 base.get_client().k8s_cluster.get_available_addons(
@@ -554,15 +554,13 @@ def import_generic_cluster_with_json(
         )
 
     @base.intercept_exception
-    def run_kubectl_command(
-        self, id, op, yaml
-    ):
+    def run_kubectl_command(self, id, op, yaml):
         """Run a kubectl command on k8s cluster.
-    
+
         Parameters
         ------
         :param id: The k8s cluster ID, as full resource path </api/v2/k8scluster/1>
-        :param op: operation to pass to kubectl, either 'create' or 'delete'
+        :param op: operation to pass to kubectl, either 'create', 'apply' or 'delete'
         :param yaml: base64 encoded yaml file to operate
 
         Returns
@@ -573,8 +571,4 @@ def run_kubectl_command(
         ------
         APIException
         """
-        print(
-            base.get_client().k8s_cluster.run_kubectl_command(
-                id, op, yaml
-            )
-        )
+        print(base.get_client().k8s_cluster.run_kubectl_command(id, op, yaml))

hpecp/gateway.py

@@ -205,7 +205,12 @@ class GatewayController(AbstractWaitableResourceController):
     #     raise NotImplementedError()
 
     def create_with_ssh_key(
-        self, ip, proxy_node_hostname, ssh_key_data, ssh_passphrase=None, tags=[]
+        self,
+        ip,
+        proxy_node_hostname,
+        ssh_key_data,
+        ssh_passphrase=None,
+        tags=[],
     ):
         """Create a gateway instance using SSH key credentials to access the
         host.
@@ -253,7 +258,7 @@ def create_with_ssh_key(
         }
 
         if ssh_passphrase is not None:
-            data['credentials']['ssh_key_passphrase'] = ssh_passphrase
+            data["credentials"]["ssh_key_passphrase"] = ssh_passphrase
 
         response = self.client._request(
             url="/api/v1/workers/",

hpecp/k8s_cluster.py

@@ -672,15 +672,15 @@ def import_generic_cluster_with_json(self, json):
         )
         return CaseInsensitiveDict(response.headers)["Location"]
 
-    def run_kubectl_command(self, id, op='create', yaml=''):
+    def run_kubectl_command(self, id, op="apply", yaml=""):
         """Run a kubectl command on k8s cluster.
-    
+
         Parameters
         ------
         id: str
             The k8s cluster ID (i.e., '/api/v2/k8s_cluster/1')
         op: str
-            op can be either 'create' or 'delete'
+            op can be either 'create', 'apply' or 'delete'
         yaml: str
             base64 encoding of the yaml file
 
@@ -693,17 +693,24 @@ def run_kubectl_command(self, id, op='create', yaml=''):
         APIException
         """
 
-        data = {
-            "op": op,
-            "data": yaml
-            }
+        assert isinstance(
+            id, basestring
+        ), "ID must be provided in /api/v2/k8scluster/<int> format"
+
+        assert op in [
+            "create",
+            "apply",
+            "delete",
+        ], 'op must be either "create", "apply", "delete"'
+
+        # TODO: assert yaml is a valid base64 encoded string of a yaml
+
+        data = {"op": op, "data": yaml}
 
         response = self.client._request(
             url="{}/kubectl".format(id),
             http_method="post",
-            description=(
-                "K8sClusterController/" "run_kubectl_command"
-            ),
+            description=("K8sClusterController/" "run_kubectl_command"),
             data=data,
         )
         return response.text

hpecp/k8s_worker.py

@@ -107,7 +107,9 @@ class K8sWorkerController(AbstractWaitableResourceController):
     #     """Not Implemented yet"""
     #     raise NotImplementedError()
 
-    def create_with_ssh_key(self, ip, ssh_key_data, ssh_passphrase=None, tags=[]):
+    def create_with_ssh_key(
+        self, ip, ssh_key_data, ssh_passphrase=None, tags=[]
+    ):
         """Create a gateway instance using SSH key credentials to access the host.
 
         Parameters
@@ -145,7 +147,7 @@ def create_with_ssh_key(self, ip, ssh_key_data, ssh_passphrase=None, tags=[]):
         }
 
         if ssh_passphrase is not None:
-            data['credentials']['ssh_key_passphrase'] = ssh_passphrase
+            data["credentials"]["ssh_key_passphrase"] = ssh_passphrase
 
         response = self.client._request(
             url="/api/v2/worker/k8shost/",