oks-cli 1.15__tar.gz → 1.16__tar.gz

{oks_cli-1.15 → oks_cli-1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oks-cli
-Version: 1.15
+Version: 1.16
 Author: Outscale SAS
 Author-email: opensource@outscale.com
 License: BSD
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: certifi>=2024.8.30
 Requires-Dist: charset-normalizer>=3.3.2
-Requires-Dist: click>=8.1.7
+Requires-Dist: click<8.3.0,>=8.1.7
 Requires-Dist: colorama>=0.4.6
 Requires-Dist: idna>=3.10
 Requires-Dist: pyyaml>=6.0.2

{oks_cli-1.15 → oks_cli-1.16}/oks_cli/cache.py

@@ -1,11 +1,13 @@
 import click
-from .utils import clear_cache, find_project_id_by_name, find_cluster_id_by_name, get_all_cache, get_expiration_date, ctx_update, login_profile, profile_completer, cluster_completer, project_completer
+from .utils import clear_cache, find_project_id_by_name, find_cluster_id_by_name, get_all_cache, get_expiration_date, \
+                   ctx_update, login_profile, profile_completer, cluster_completer, project_completer, print_table
+
 import prettytable
 
 # DEFINE THE CACHE COMMAND GROUP
 @click.group(help="Cache related commands.")
 @click.option('--project-name', '-p', required = False, help="Project Name", shell_complete=project_completer)
-@click.option('--cluster-name', '-c', required = False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--cluster-name', '--name', '-c', required = False, help="Cluster Name", shell_complete=cluster_completer)
 @click.option("--profile", help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cache(ctx, project_name, cluster_name, profile):
@@ -21,7 +23,7 @@ def delete_cache(force):
 
 @cache.command('kubeconfigs', help="List cached kubeconfigs")
 @click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
 @click.option('--plain', is_flag=True, help="Plain table format")
 @click.option('--msword', is_flag=True, help="Microsoft Word table format")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
@@ -36,14 +38,8 @@ def list_kubeconfigs(ctx, project_name, cluster_name, plain, msword, profile):
 
     result = get_all_cache(project_id, cluster_id, "kubeconfig")
 
-    table = prettytable.PrettyTable()
-    table.field_names = ["user",  "group", "expiration date"]
-
-    if plain:
-        table.set_style(prettytable.PLAIN_COLUMNS)
-
-    if msword:
-        table.set_style(prettytable.MSWORD_FRIENDLY)
+    data = list()
+    fields = [["user", "user"],["group", "group"], ["expiration date", "expires_at"]]
 
     for element in result:
         kubeconfig = None
@@ -57,7 +53,12 @@ def list_kubeconfigs(ctx, project_name, cluster_name, plain, msword, profile):
         if kubeconfig:
             exp = get_expiration_date(kubeconfig)
             row = user, group, exp
+            data.append({"user": user, "group": group, "expires_at": exp})
 
-            table.add_row(row)
+    style = None
+    if plain:
+        style = prettytable.PLAIN_COLUMNS
+    if msword:
+        style = prettytable.MSWORD_FRIENDLY
 
-    click.echo(table)
+    print_table(data, fields, style=style)

{oks_cli-1.15 → oks_cli-1.16}/oks_cli/cluster.py

@@ -6,23 +6,31 @@ from nacl.encoding import Base64Encoder
 
 import time
 import os
-import datetime
+from datetime import datetime
 import dateutil.parser
 import human_readable
+import pathlib
 import prettytable
 import logging
-
-from .utils import cluster_completer, do_request, print_output, find_project_id_by_name, find_cluster_id_by_name, get_cache, save_cache, detect_and_parse_input, verify_certificate, shell_completions, transform_tuple, profile_list, login_profile, cluster_create_in_background, ctx_update, set_cluster_id, get_cluster_id, get_project_id, get_template, get_cluster_name, format_changed_row, is_interesting_status, profile_completer, project_completer
+import yaml
+
+from .utils import cluster_completer, do_request, print_output,                 \
+                   find_project_id_by_name, find_cluster_id_by_name,            \
+                   get_cache, save_cache, detect_and_parse_input,               \
+                   verify_certificate, shell_completions, transform_tuple,      \
+                   profile_list, login_profile, cluster_create_in_background,   \
+                   ctx_update, set_cluster_id, get_cluster_id, get_project_id,  \
+                   get_template, get_cluster_name, format_changed_row,          \
+                   is_interesting_status, profile_completer, project_completer, \
+                   kubeconfig_parse_fields, print_table, get_expiration_date
 
 from .profile import add_profile
 from .project import project_create, project_login
 
 # DEFINE THE CLUSTER GROUP
 @click.group(help="Cluster related commands.")
-@click.option('--project', 'project_name', required = False, help="Project Name")
-@click.option('--project-name', '-p', required = False, help="Project Name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required = False, help="Cluster Name")
-@click.option('--cluster-name', '-c', required = False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
 @click.option("--profile", help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cluster(ctx, project_name, cluster_name, profile):
@@ -31,7 +39,7 @@ def cluster(ctx, project_name, cluster_name, profile):
 
 # LOGIN ON CLUSTER
 @cluster.command('login', help="Set a default cluster")
-@click.option('--cluster-name', '-c', required=False, help="Name of cluster", shell_complete=cluster_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Name of cluster", shell_complete=cluster_completer)
 @click.option("--profile", help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cluster_login(ctx, cluster_name, profile):
@@ -71,13 +79,12 @@ def cluster_logout(ctx, profile):
 # LIST CLUSTERS
 @cluster.command('list', help="List all clusters")
 @click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required = False, help="Cluster Name")
-@click.option('--cluster-name', '-c', required = False, help="Cluster Name", shell_complete=cluster_completer)
-@click.option('--deleted', is_flag=True, help="List deleted clusters")
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--deleted', '-x', is_flag=True, help="List deleted clusters")  # x pour "deleted" / "removed"
 @click.option('--plain', is_flag=True, help="Plain table format")
 @click.option('--msword', is_flag=True, help="Microsoft Word table format")
 @click.option('--watch', '-w', is_flag=True, help="Watch the changes")
-@click.option('-o', '--output', type=click.Choice(["json", "yaml", "wide"]), help="Specify output format")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml", "wide"]), help="Specify output format")
 @click.option('--profile', help="Configuration profile to use")
 @click.pass_context
 def cluster_list(ctx, project_name, cluster_name, deleted, plain, msword, watch, output, profile):
@@ -85,6 +92,8 @@ def cluster_list(ctx, project_name, cluster_name, deleted, plain, msword, watch,
     project_name, cluster_name, profile = ctx_update(ctx, project_name, cluster_name, profile)
     login_profile(profile)
 
+    profile_name = os.getenv('OKS_PROFILE')
+    region_name = os.getenv('OKS_REGION')
     project_id = find_project_id_by_name(project_name)
     cluster_id = get_cluster_id()
 
@@ -96,7 +105,7 @@ def cluster_list(ctx, project_name, cluster_name, deleted, plain, msword, watch,
     if deleted:
         params['deleted'] = True
 
-    field_names = ["NAME", "CREATED", "UPDATED", "STATUS", "DEFAULT"]
+    field_names = ["CLUSTER", "PROFILE", "REGION", "CREATED", "UPDATED", "STATUS", "DEFAULT"]
 
     data = do_request("GET", 'clusters', params=params)
 
@@ -141,9 +150,9 @@ def cluster_list(ctx, project_name, cluster_name, deleted, plain, msword, watch,
 
         created_at = dateutil.parser.parse(cluster['statuses']['created_at'])
         updated_at = dateutil.parser.parse(cluster['statuses']['updated_at'])
-        now = datetime.datetime.now(tz = created_at.tzinfo)
+        now = datetime.now(tz = created_at.tzinfo)
 
-        row = [name, human_readable.date_time(now - created_at), human_readable.date_time(now - updated_at), msg, default]
+        row = [name, profile_name, region_name, human_readable.date_time(now - created_at), human_readable.date_time(now - updated_at), msg, default]
 
         if output == "wide":
             row.insert(0, cluster['id'])
@@ -215,10 +224,9 @@ def cluster_list(ctx, project_name, cluster_name, deleted, plain, msword, watch,
 
 # GET CLUSTER BY NAME
 @cluster.command('get', help="Get a cluster by name")
-@click.option('--project-name', '-p', required = False, help="Project Name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required=False, help="Cluster Name", shell_complete=cluster_completer)
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cluster_get_command(ctx, project_name, cluster_name, output, profile):
@@ -234,6 +242,26 @@ def cluster_get_command(ctx, project_name, cluster_name, output, profile):
     print_output(data, output)
 
 
+def prepare_cluster_template(cluster_config):
+    cluster_template = get_template("cluster")
+
+    admin_whitelist = cluster_config.get("admin_whitelist") or []
+    if isinstance(admin_whitelist, str):
+        admin_whitelist = [admin_whitelist]
+
+    final_whitelist = []
+
+    for entry in admin_whitelist:
+        if entry == "my-ip":
+            final_whitelist.extend(cluster_template.get("admin_whitelist", []))
+        else:
+            final_whitelist.append(entry)
+
+    cluster_config["admin_whitelist"] = list(dict.fromkeys(final_whitelist))
+
+    cluster_template.update(cluster_config)
+    return cluster_template
+
 def _create_cluster(project_name, cluster_config, output):
     """Create a new cluster with interactive setup for missing profiles/projects."""
     profiles = profile_list()
@@ -274,8 +302,8 @@ def _create_cluster(project_name, cluster_config, output):
         project_name = project_name or "default"
         projects = do_request("GET", 'projects', params={"name": project_name})
 
-        cluster_template = get_template('cluster')
-        cluster_template.update(cluster_config)
+        cluster_template = prepare_cluster_template(cluster_config)
+        print_output(cluster_template, output)
 
         project_name_styled = click.style(project_name, bold=True)
         cluster_name_styled = click.style(cluster_template.get("name"), bold=True)
@@ -299,9 +327,7 @@ def _create_cluster(project_name, cluster_config, output):
     else:
         project_id = find_project_id_by_name(project_name)
 
-        cluster_template = get_template('cluster')
-        cluster_template.update(cluster_config)
-
+        cluster_template = prepare_cluster_template(cluster_config)
         do_request("GET", f'projects/{project_id}')
         cluster_template['project_id'] = project_id
 
@@ -313,22 +339,22 @@ def _create_cluster(project_name, cluster_config, output):
 @cluster.command('create', help="Create a new cluster")
 @click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
 @click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
-@click.option('--description', help="Description of the cluster")
-@click.option('--admin', help="Admin Whitelist")
-@click.option('--version', shell_complete=shell_completions, help="Kubernetes version")
+@click.option('--description', '-d', help="Description of the cluster")
+@click.option('--admin', '-a', help="Admin Whitelist ips. you can use 'my-ip' to automatically use your current IP.")
+@click.option('--version', '-v', shell_complete=shell_completions, help="Kubernetes version")
 @click.option('--cidr-pods', help="CIDR of pods")
 @click.option('--cidr-service', help='CIDR of services')
 @click.option('--control-plane', shell_complete=shell_completions, help="Controlplane plan")
-@click.option('--zone', multiple=True, shell_complete=shell_completions, help="List of Control Plane availability zones")
+@click.option('--zone', '-z', multiple=True, shell_complete=shell_completions, help="List of Control Plane availability zones")
 @click.option('--enable-admission-plugins', help="List of admission plugins, separated by commas")
 @click.option('--disable-admission-plugins', help="List of admission plugins, separated by commas")
-@click.option('--quirk', multiple=True, help="Quirk")
-@click.option('--tags', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
+@click.option('--quirk', '-q', multiple=True, help="Quirk")
+@click.option('--tags', '-t', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
 @click.option('--disable-api-termination', type=click.BOOL, help="Disable delete action by API")
-@click.option('--cp-multi-az', is_flag=True, help="enable control plane multi az")
+@click.option('--cp-multi-az', '-m', is_flag=True, help="Enable control plane multi AZ")
 @click.option('--dry-run', is_flag=True, help="Client dry-run, only print the object that would be sent, without sending it")
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
-@click.option('-f', '--filename', type=click.File("r"), help="Path to file to use to create the cluster ")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--filename', '-f', type=click.File("r"), help="Path to file to use to create the cluster ")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cluster_create_command(ctx, project_name, cluster_name, description, admin, version, cidr_pods, cidr_service, control_plane, zone, enable_admission_plugins, disable_admission_plugins, quirk, tags, disable_api_termination, cp_multi_az, dry_run, output, filename, profile):
@@ -405,27 +431,25 @@ def cluster_create_command(ctx, project_name, cluster_name, description, admin,
     if not dry_run:
         _create_cluster(project_name, cluster_config, output)
     else:
-        cluster_template = get_template("cluster")
-        cluster_template.update(cluster_config)
+        cluster_template = prepare_cluster_template(cluster_config)
         print_output(cluster_template, output)
 
 # UPDATE CLUSTER
 @cluster.command('update', help="Update a cluster by name")
 @click.option('--project-name', '-p', required=False, help="Project name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required=False, help="Cluster name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster name", shell_complete=cluster_completer)
-@click.option('--description', help="Description of the cluster")
-@click.option('--admin', help="Admin Whitelist")
-@click.option('--version', shell_complete=shell_completions, help="Kubernetes version")
-@click.option('--tags', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster name", shell_complete=cluster_completer)
+@click.option('--description', '-d', help="Description of the cluster")
+@click.option('--admin', '-a', help="Admin Whitelist ips. you can use 'my-ip' to automatically use your current IP.")
+@click.option('--version', '-v', shell_complete=shell_completions, help="Kubernetes version")
+@click.option('--tags', '-t', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
 @click.option('--enable-admission-plugins', help="List of admission plugins, separated by commas")
 @click.option('--disable-admission-plugins', help="List of admission plugins, separated by commas")
-@click.option('--quirk', multiple=True, help="Quirk")
+@click.option('--quirk', '-q', multiple=True, help="Quirk")
 @click.option('--disable-api-termination', type=click.BOOL, help="Disable delete action by API")
 @click.option('--control-plane', shell_complete=shell_completions, help="Controlplane plan")
 @click.option('--dry-run', is_flag=True, help="Client dry-run, only print the object that would be sent, without sending it")
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
-@click.option('-f', '--filename', type=click.File("r"), help="Path to file to use to update the cluster ")
+@click.option('--output', '-o',  type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--filename', '-f', type=click.File("r"), help="Path to file to use to update the cluster ")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cluster_update_command(ctx, project_name, cluster_name, description, admin, version, tags, enable_admission_plugins, disable_admission_plugins, quirk, disable_api_termination, control_plane, dry_run, output, filename, profile):
@@ -500,9 +524,8 @@ def cluster_update_command(ctx, project_name, cluster_name, description, admin,
 # UPGRADE CLUSTER
 @cluster.command('upgrade', help="Upgrade a cluster by name")
 @click.option('--project-name', '-p', required=False, help="Project name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required=False, help="Cluster name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster name", shell_complete=cluster_completer)
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster name", shell_complete=cluster_completer)
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--force', is_flag=True, help="Force upgrade")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
@@ -522,9 +545,8 @@ def cluster_update_command(ctx, project_name, cluster_name, output, force, profi
 # DELETE CLUSTER BY NAME
 @cluster.command('delete', help="Delete a cluster by name")
 @click.option('--project-name', '-p', required=False, help="Project name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required=False, help="Cluster name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster name", shell_complete=cluster_completer)
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster name", shell_complete=cluster_completer)
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--dry-run', is_flag=True, help="Run without any action")
 @click.option('--force', is_flag=True, help="Force deletion without confirmation")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
@@ -554,9 +576,10 @@ def cluster_delete_command(ctx, project_name, cluster_name, output, dry_run, for
 # GET KUBECONFIG
 @cluster.command('kubeconfig', help="Fetch the kubeconfig for a cluster")
 @click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required=False, help="Cluster name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
 @click.option('--print-path', is_flag=True, help="Print path to saved kubeconfig")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml", "table"]), default="yaml", help="Specify output format, default is yaml")
+@click.option('--wide', is_flag=True, help="Prints additional info, only supported for table output")
 @click.option('--refresh', '--force', is_flag=True, help="Force refresh saved kubeconfig")
 @click.option('--nacl', is_flag=True, help="Use public key encryption on wire (require api support)")
 @click.option('--user', type=click.STRING, help="User")
@@ -564,7 +587,7 @@ def cluster_delete_command(ctx, project_name, cluster_name, output, dry_run, for
 @click.option('--ttl', type=click.STRING, help="TTL in human readable format (5h, 1d, 1w)")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
-def cluster_kubeconfig_command(ctx, project_name, cluster_name, print_path, refresh, nacl, user, group, ttl, profile):
+def cluster_kubeconfig_command(ctx, project_name, cluster_name, print_path, output, wide, refresh, nacl, user, group, ttl, profile):
     """CLI command to fetch and optionally print the kubeconfig for a specified cluster."""
     project_name, cluster_name, profile = ctx_update(ctx, project_name, cluster_name, profile)
     login_profile(profile)
@@ -619,9 +642,31 @@ def cluster_kubeconfig_command(ctx, project_name, cluster_name, print_path, refr
         kubeconfig_path = save_cache(project_id, cluster_id, 'kubeconfig', kubeconfig, user, group)
 
     if print_path:
-        print(kubeconfig_path)
+        click.echo(kubeconfig_path)
     else:
-        print(kubeconfig)
+        if output == 'table':
+            kubeconfig_path = pathlib.Path(kubeconfig_path).absolute()
+            if not user:
+                user = kubeconfig_path.parts[-3]
+            if not group:
+                group = kubeconfig_path.parts[-2]
+            if kubeconfig_path.is_file():
+                with kubeconfig_path.open() as f:
+                    kubeconfig_str = f.read()
+                kubedata = kubeconfig_parse_fields(kubeconfig_str, cluster_name, user, group)
+                if not len(kubedata):
+                    raise SystemExit("Something went wrong, could not parse kubeconfig")
+                fields = [["user", "user"], ["group", "group"], ["expiration date", "expires_at"]]
+                if wide:
+                    fields.extend([["Cert subject", "cn"], ["context:name", "context_name"], ["context:user", "ctx_user"],
+                                   ["context:cluster", "cluster_name"], ["cluster endpoint", "server_name"]])
+                print_table(kubedata, fields)
+            else:
+                raise SystemExit(f"Could not find {kubeconfig_path}")
+        elif output == 'json':
+            click.echo(json.dumps(yaml.safe_load(kubeconfig)))
+        else:
+            click.echo(kubeconfig)
 
 
 def _run_kubectl(project_id, cluster_id, user, group, args, input=None):
@@ -646,7 +691,7 @@ def _run_kubectl(project_id, cluster_id, user, group, args, input=None):
             "GET", f'clusters/{cluster_id}/kubeconfig')['data']['kubeconfig']
 
         if not kubeconfig_raw:
-            print("Cannot get kubeconfig")
+            click.echo("Cannot get kubeconfig")
             raise SystemExit()
 
         kubeconfig_path = save_cache(project_id, cluster_id, 'kubeconfig', kubeconfig_raw, user, group)
@@ -664,11 +709,11 @@ def _run_kubectl(project_id, cluster_id, user, group, args, input=None):
 
 @cluster.command('kubectl', help='Fetch the kubeconfig for a cluster and run kubectl against it', context_settings={"ignore_unknown_options": True})
 @click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
 @click.option('--user', type=click.STRING, help="User")
 @click.option('--group', type=click.STRING, help="Group")
-@click.argument("args", nargs=-1, type=click.UNPROCESSED)
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
+@click.argument("args", nargs=-1, type=click.UNPROCESSED)
 @click.pass_context
 def cluster_kubectl_command(ctx, project_name, cluster_name, user, group, args, profile):
     """CLI command to run kubectl against a specified cluster using its kubeconfig."""
@@ -681,9 +726,9 @@ def cluster_kubectl_command(ctx, project_name, cluster_name, user, group, args,
     _run_kubectl(project_id, cluster_id, user, group, args)
 
 
-@click.group(help="nodepool related commands.")
+@click.group(help="Nodepool related commands.")
 @click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
 @click.option('--user', type=click.STRING, help="User")
 @click.option('--group', type=click.STRING, help="Group")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
@@ -711,14 +756,14 @@ def nodepool_list(ctx):
                  'get', 'nodepool', '-o', 'wide'])
 
 
-@nodepool.command('create')
+@nodepool.command('create', help="Create a new nodepool")
 @click.option('--nodepool-name', '-n', default="nodepool01", help="Nodepool Name")
-@click.option('--count', default=2, help="Count of nodes")
-@click.option('--type', 'vmtype', default="tinav6.c2r4p3", help="Type of VMs")
-@click.option('--zone', multiple=True, required=True, help="Provide zone")
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--count', '-c', default=2, help="Count of nodes")
+@click.option('--type', 'vmtype', '-t', default="tinav6.c2r4p3", help="Type of VMs")
+@click.option('--zone', '-z', multiple=True, help="Provide zone(s)")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--dry-run', is_flag=True, help="Run without any action")
-@click.option('-f', '--filename', type=click.File("r"), help="Path to file to use to create the Nodepool ")
+@click.option('--filename', '-f', type=click.File("r"), help="Path to file to use to create the Nodepool")
 @click.pass_context
 def setup_worker_pool(ctx, nodepool_name, count, vmtype, zone, output, dry_run, filename):
     """Create a new nodepool in the cluster, optionally from a file or parameters."""
@@ -734,6 +779,9 @@ def setup_worker_pool(ctx, nodepool_name, count, vmtype, zone, output, dry_run,
         if zone:
             nodepool['spec']["zones"] = list(zone)
 
+    if not nodepool['spec']["zones"]:
+        raise click.BadArgumentUsage("Missing option '--zone' / '-z'.")
+
     if dry_run:
         print_output(nodepool, output)
     else:

{oks_cli-1.15 → oks_cli-1.16}/oks_cli/main.py

@@ -9,14 +9,14 @@ from .profile import profile
 from .cache import cache
 from .quotas import quotas
 
-from .utils import ctx_update, login_profile, install_completions, profile_completer, cluster_completer, project_completer
+from .utils import ctx_update, install_completions, profile_completer, cluster_completer, project_completer
 
 # Main CLI entry point
 @click.group(invoke_without_command=True)
-@click.option("--profile", help="Configuration profile to use", shell_complete=profile_completer)
-@click.option('--project-name', '-p', required = False, help="Project Name", shell_complete=project_completer)
-@click.option('--cluster-name', '-c', required = False, help="Cluster Name", shell_complete=cluster_completer)
-@click.option('-v', '--verbose', count=True)
+@click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
+@click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--verbose', '-v', count=True, help="Increase verbosity")
 @click.pass_context
 def cli(ctx, project_name, cluster_name, profile, verbose):
     """
@@ -64,8 +64,7 @@ cli.add_command(quotas)
 def recursive_help(cmd, parent=None):
     """Recursively prints help for all commands and subcommands."""
     ctx = click.core.Context(cmd, info_name=cmd.name, parent=parent)
-    print(cmd.get_help(ctx))
-    print()
+    click.echo(cmd.get_help(ctx))
     commands = getattr(cmd, 'commands', {})
     for sub in commands.values():
         recursive_help(sub, ctx)
@@ -79,7 +78,7 @@ def fullhelp():
 def version():
     """Display the current CLI version."""
     import importlib.metadata
-    print(importlib.metadata.version(__package__))
+    click.echo(importlib.metadata.version(__package__))
 
 @cli.command("install-completion", help="Install shell completion scripts.")
 @click.option('--type', help="Shell, supported [bash,zsh]")

{oks_cli-1.15 → oks_cli-1.16}/oks_cli/profile.py

@@ -11,14 +11,14 @@ def profile():
 
 
 @profile.command('add', help="Add AK/SK or username/password new profile")
-@click.option('--profile-name', required=False, help="Name of profile, optional", type=click.STRING)
+@click.option('--profile-name', '--profile', required=False, help="Name of profile, optional", type=click.STRING)
 @click.option('--access-key', required=False, help="AK of profile", type=click.STRING)
 @click.option('--secret-key', required=False, help="SK of profile", type=click.STRING)
 @click.option('--username', required=False, help="Username", type=click.STRING)
 @click.option('--password', required=False, help="Password", type=click.STRING)
 @click.option('--region', required=True, help="Region name", type=click.Choice(['eu-west-2', 'cloudgouv-eu-west-1']))
 @click.option('--endpoint', required=False, help="API endpoint", type=click.STRING)
-@click.option('--jwt', required=False, help="Enable jwt, by default is false", type=click.BOOL)
+@click.option('--jwt', help="Enable JWT, by default is false")
 def add_profile(profile_name, access_key, secret_key, username, password, region, endpoint, jwt):
     """Add a new profile with AK/SK or username/password authentication."""
     if not profile_name:
@@ -98,8 +98,8 @@ def update_profile(profile_name, region, endpoint, jwt, new_name, force):
     click.echo(msg)
 
 @profile.command('delete', help="Delete a profile by name")
-@click.option('--profile-name', required=True, help="Name of profile", type=click.STRING)
-@click.option('--force', is_flag=True, help="Force deletion without confirmation")
+@click.option('--profile-name', '--profile', required=True, help="Name of profile", type=click.STRING)
+@click.option('--force', '-f', is_flag=True, help="Force deletion without confirmation")
 def delete_profile(profile_name, force):
     """Delete a profile with confirmation."""
     profiles = profile_list()
@@ -113,7 +113,7 @@ def delete_profile(profile_name, force):
         click.echo(f"Profile {profile_name_bold} has been successfully deleted")
 
 @profile.command('list', help="List existing profiles")
-@click.option('-o', '--output', type=click.Choice(["json", "yaml", "table", "wide"]), help="Specify output format, by default is wide")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml", "table", "wide"]), help="Specify output format, by default is wide")
 def list_profiles(output):
     """Display all configured profiles with their settings."""
     profiles = profile_list()

{oks_cli-1.15 → oks_cli-1.16}/oks_cli/project.py

@@ -11,8 +11,8 @@ from .utils import do_request, print_output, print_table, find_project_id_by_nam
 # DEIFNE THE PROJECT COMMAND GROUP
 @click.group(help="Project related commands.")
 @click.option('--project', 'project_name', required = False, help="Project Name")
-@click.option('--project-name', '-p', required = False, help="Project Name", shell_complete=project_completer)
-@click.option("--profile", help="Configuration profile to use", shell_complete=profile_completer)
+@click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
+@click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def project(ctx, project_name, profile):
     """Group of commands related to project management."""
@@ -59,12 +59,12 @@ def project_logout(ctx, profile):
 # LIST PROJECTS
 @project.command('list', help="List all projects")
 @click.option('--project-name', '-p', help="Name of project", type=click.STRING, shell_complete=project_completer)
-@click.option('--deleted', is_flag=True, help="List deleted projects")
+@click.option('--deleted', '-x', is_flag=True, help="List deleted projects")
 @click.option('--plain', is_flag=True, help="Plain table format")
 @click.option('--msword', is_flag=True, help="Microsoft Word table format")
-@click.option('--uuid', is_flag=True, help="show uuid")
+@click.option('--uuid', is_flag=True, help="Show UUID")
 @click.option('--watch', '-w', is_flag=True, help="Watch the changes")
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--output', '-o',  type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--profile', help="Configuration profile to use")
 @click.pass_context
 def project_list(ctx, project_name, deleted, plain, msword, uuid, watch, output, profile):
@@ -72,7 +72,9 @@ def project_list(ctx, project_name, deleted, plain, msword, uuid, watch, output,
     project_name, _, profile = ctx_update(ctx, project_name, None, profile)
     login_profile(profile)
 
+    profile_name = os.getenv('OKS_PROFILE')
     project_id = get_project_id()
+
     params = {}
     if project_name:
         params['name'] = project_name
@@ -86,7 +88,7 @@ def project_list(ctx, project_name, deleted, plain, msword, uuid, watch, output,
         print_output(data, output)
         return
 
-    field_names = ["NAME", "CREATED", "UPDATED", "STATUS", "DEFAULT"]
+    field_names = ["PROJECT", "PROFILE", "REGION", "CREATED", "UPDATED", "STATUS", "DEFAULT"]
     if uuid:
         field_names.append('UUID')
 
@@ -120,11 +122,12 @@ def project_list(ctx, project_name, deleted, plain, msword, uuid, watch, output,
         else:
             default = ""
 
+        region_name = project.get('region')
         created_at = dateutil.parser.parse(project['created_at'])
         updated_at = dateutil.parser.parse(project['updated_at'])
         now = datetime.datetime.now(tz=created_at.tzinfo)
 
-        row = [name, human_readable.date_time(now - created_at), human_readable.date_time(now - updated_at), msg, default]
+        row = [name, profile_name, region_name, human_readable.date_time(now - created_at), human_readable.date_time(now - updated_at), msg, default]
         if uuid:
             row.append(project['id'])
 
@@ -193,15 +196,15 @@ def project_list(ctx, project_name, deleted, plain, msword, uuid, watch, output,
 
 # CREATE PROJECT BY NAME
 @project.command('create', help="Create a new project")
-@click.option('--project-name', '-p', help="Name of the project", shell_complete=project_completer)
-@click.option('--description', help="Description of the project")
+@click.option('--project-name', '-p', help="Name of the project", type=click.STRING, shell_complete=project_completer)
+@click.option('--description', '-d', help="Description of the project")
 @click.option('--cidr', help='CIDR for the project')
-@click.option('--quirk', multiple=True, help="Quirk")
-@click.option('--tags', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
+@click.option('--quirk', '-q', multiple=True, help="Quirk")
+@click.option('--tags', '-t', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
 @click.option('--disable-api-termination', type=click.BOOL, help="Disable delete action by API")
 @click.option('--dry-run', is_flag=True, help="Client dry-run, only print the object that would be sent, without sending it")
-@click.option('-o', '--output', type=click.Choice(["json", "yaml", "silent"]), help="Specify output format, by default is json")
-@click.option('-f', '--filename', type=click.File("r"), help="Path to file to use to create the project ")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml", "silent"]), help="Specify output format, by default is json")
+@click.option('--filename', '-f', type=click.File("r"), help="Path to file to use to create the project")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def project_create(ctx, project_name, description, cidr, quirk, tags, disable_api_termination, dry_run, output, filename, profile):
@@ -255,7 +258,7 @@ def project_create(ctx, project_name, description, cidr, quirk, tags, disable_ap
 # GET PROJECT BY NAME
 @project.command('get', help="Get default project or the project by name")
 @click.option('--project-name', '-p', help="Name of the project", shell_complete=project_completer)
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def project_get(ctx, project_name, output, profile):
@@ -270,8 +273,8 @@ def project_get(ctx, project_name, output, profile):
 
 # DELETE PROJECT BY NAME
 @project.command('delete', help="Delete a project by name")
-@click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--project-name', '-p', required=False, help="Project Name", type=click.STRING, shell_complete=project_completer)
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--dry-run', is_flag=True, help="Run without any action")
 @click.option('--force', is_flag=True, help="Force deletion without confirmation")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
@@ -302,12 +305,12 @@ def project_delete_command(ctx, project_name, output, dry_run, force, profile):
 
 # UPDATE PROJECT BY NAME
 @project.command('update', help="Update a project by name")
-@click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
-@click.option('--description', help="Description of the project")
-@click.option('--quirk', multiple=True, help="Quirk")
-@click.option('--tags', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
+@click.option('--project-name', '-p', required=False, help="Project Name", type=click.STRING, shell_complete=project_completer)
+@click.option('--description', '-d', help="Description of the project")
+@click.option('--quirk', '-q', multiple=True, help="Quirk")
+@click.option('--tags', '-t', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
 @click.option('--disable-api-termination', type=click.BOOL, help="Disable delete action by API")
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--dry-run', is_flag=True, help="Run without any action")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
@@ -351,7 +354,7 @@ def project_update_command(ctx, project_name, description, quirk, tags, disable_
 # GET PROJECT QUOTAS BY PROJECT NAME
 @project.command('quotas', help="Get project quotas")
 @click.option('--project-name', '-p', help="Name of the project", shell_complete=project_completer)
-@click.option('-o', '--output', type=click.Choice(["json", "yaml", "table"]), help="Specify output format, by default is json")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml", "table"]), help="Specify output format, by default is json")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def project_get_quotas(ctx, project_name, output, profile):
@@ -379,7 +382,7 @@ def project_get_quotas(ctx, project_name, output, profile):
 # GET PROJECT SNAPSHOTS BY PROJECT NAME
 @project.command('snapshots', help="Get project snapshots")
 @click.option('--project-name', '-p', help="Name of the project", shell_complete=project_completer)
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def project_get(ctx, project_name, output, profile):
@@ -395,8 +398,8 @@ def project_get(ctx, project_name, output, profile):
 # GET PUBLIC IPS BY PROJECT NAME
 @project.command('publicips', help="Get project public ips")
 @click.option('--project-name', '-p', help="Name of the project", shell_complete=project_completer)
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
-@click.option('--profile', help="Configuration profile to use")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--profile',help="Configuration profile to use")
 @click.pass_context
 def project_get_public_ips(ctx, project_name, output, profile):
     """Retrieve the list of public IPs associated with the specified project."""

{oks_cli-1.15 → oks_cli-1.16}/oks_cli/quotas.py

@@ -4,7 +4,7 @@ from .utils import do_request, print_output, print_table, ctx_update, login_prof
 
 @click.command(help="Get Quotas")
 @click.option("--profile", help="Configuration profile to use", shell_complete=profile_completer)
-@click.option('-o', '--output', type=click.Choice(["json", "yaml", "table"]), help="Specify output format, by default is json")
+@click.option('--output','-o', type=click.Choice(["json", "yaml", "table"]), help="Specify output format, by default is json")
 @click.pass_context
 def quotas(ctx, profile, output):
     """Retrieve global quotas across all projects for the given profile."""

{oks_cli-1.15 → oks_cli-1.16}/oks_cli/utils.py

@@ -170,14 +170,17 @@ def print_output(data, output_fromat):
 
     click.echo(output_data)
 
-def print_table(data, table_fields, align="l"):
+def print_table(data, table_fields, align="l", style=None):
     """Print API returned data as table
     data: list of dict containing data
     table_fields: List of 2 elements list. First element is the table field name, second element is the corresponding dict key in data
     align: Columns alignment (l,r,c)
+    style: Table format other style
     """
     table = prettytable.PrettyTable()
     table.align = align
+    if style and isinstance(style, prettytable.TableStyle):
+        table.set_style(style)
     fields = list()
     values = list()
 
@@ -697,16 +700,65 @@ def get_expiration_date(kubeconfig_str):
             logging.info("No client certificate data found for user.")
             continue
 
-        ca_cert = base64.b64decode(client_cert_data)
+        cert = decode_parse_certificate(client_cert_data)
+        not_after = cert.get_notAfter().decode('ascii')
+        not_after_date = datetime.strptime(not_after, '%Y%m%d%H%M%SZ')
 
-        try:
-            cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, ca_cert)
-            not_after = cert.get_notAfter().decode('ascii')
-            not_after_date = datetime.strptime(not_after, '%Y%m%d%H%M%SZ')
+        return not_after_date
+
+def decode_parse_certificate(cert_str):
+    """Parse base64 encoded certificate data and returns cert (X509) object"""
+    try:
+        ca_cert = base64.b64decode(cert_str)
+        cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, ca_cert)
+        return cert
+    except OpenSSL.crypto.Error as e:
+        logging.info(f"ERROR: Can't parse base64 encoded certificate: {e}")
 
-            return not_after_date
-        except OpenSSL.crypto.Error as e:
-             logging.info(f"ERROR: Invalid certificate data for cluster. Error: {e}")
+def kubeconfig_parse_fields(kubeconfig, cluster_name, user, group):
+    """
+    Load YAML kubeconfig and extract fields
+    kubeconfig: Kubeconfig load file as string (YAML)
+    cluster_name: Name of the cluster kubeconfig is related to
+    user: user name of this kubeconfig (if set)
+    group: user group name of this kubeconfig (if set)
+    """
+    kubeconfig_str = yaml.safe_load(kubeconfig)
+    kubedata = list()
+
+    # Ensure loaded YAML returnes a valid dict object
+    if not isinstance(kubeconfig_str, dict):
+        return kubedata
+
+    for context in kubeconfig_str.get('contexts', []):
+        data = dict()
+        ctx_cluster = context.get('context').get('cluster', None)
+        ctx_user = context.get('context').get('user', None)
+        ctx_name = context.get('name')
+        data.update({"context_name": ctx_name})
+
+        for cluster in kubeconfig_str.get('clusters', []):
+            if ctx_cluster == cluster.get('name', None):
+                cls_server = cluster.get('cluster').get('server')
+                if not cluster_name:
+                    cluster_name = ctx_cluster
+                data.update({"cluster_name": cluster_name, "server_name": cls_server})
+                break
+
+        for user_name in kubeconfig_str.get('users', []):
+            if ctx_user == user_name.get('name'):
+                cert_str = user_name.get('user').get('client-certificate-data')
+                cert_obj = decode_parse_certificate(cert_str)
+                expires_at = datetime.strptime(cert_obj.get_notAfter().decode('ascii'), '%Y%m%d%H%M%SZ')
+                cn = cert_obj.get_subject().get_components()
+                cn_user = f"CN={cn[0][1].decode('utf-8')}"
+                cn_group = f"/O={cn[1][1].decode('utf-8')}" if len(cn) > 1 else ""
+                data.update({"user": click.style(user, bold=True), "group": click.style(group, bold=True),
+                             "expires_at": expires_at, "ctx_user": ctx_user, "cn": f"{cn_user}{cn_group}"})
+                break
+        kubedata.append(data)
+
+    return kubedata
 
 def retrieve_cp_sized(filepath, endpoint):
     """Fetch control plane sizes from API and save to file."""

{oks_cli-1.15 → oks_cli-1.16}/oks_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oks-cli
-Version: 1.15
+Version: 1.16
 Author: Outscale SAS
 Author-email: opensource@outscale.com
 License: BSD
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: certifi>=2024.8.30
 Requires-Dist: charset-normalizer>=3.3.2
-Requires-Dist: click>=8.1.7
+Requires-Dist: click<8.3.0,>=8.1.7
 Requires-Dist: colorama>=0.4.6
 Requires-Dist: idna>=3.10
 Requires-Dist: pyyaml>=6.0.2

{oks_cli-1.15 → oks_cli-1.16}/oks_cli.egg-info/requires.txt

@@ -1,6 +1,6 @@
 certifi>=2024.8.30
 charset-normalizer>=3.3.2
-click>=8.1.7
+click<8.3.0,>=8.1.7
 colorama>=0.4.6
 idna>=3.10
 pyyaml>=6.0.2

{oks_cli-1.15 → oks_cli-1.16}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="oks-cli",
-    version="1.15",
+    version="1.16",
     packages=['oks_cli'],
     author="Outscale SAS",
     author_email="opensource@outscale.com",
@@ -26,7 +26,7 @@ setup(
     install_requires=[
         "certifi>=2024.8.30",
         "charset-normalizer>=3.3.2",
-        "click>=8.1.7",
+        "click>=8.1.7,<8.3.0",
         "colorama>=0.4.6",
         "idna>=3.10",
         "pyyaml>=6.0.2",

{oks_cli-1.15 → oks_cli-1.16}/tests/test_cache.py

@@ -15,6 +15,6 @@ def test_cache_kubeconfigs_command(mock_request, add_default_profile):
     ]
 
     runner = CliRunner()
-    result = runner.invoke(cli, ["cache", "kubeconfigs", "-p", "test", "-c", "test"])
+    result = runner.invoke(cli, ["--profile", "default", "cache", "kubeconfigs", "-p", "test", "-c", "test"])
     assert result.exit_code == 0
     assert '| user | group | expiration date |' in result.output

{oks_cli-1.15 → oks_cli-1.16}/tests/test_cluster.py

@@ -5,6 +5,29 @@ from unittest.mock import patch, MagicMock
 import json 
 import yaml
 
+# Test the "cluster list" command: verifies region and profile are shown
+@patch("oks_cli.utils.requests.request")
+def test_cluster_list_command_with_region_and_profile(mock_request, add_default_profile):
+    mock_request.side_effect = [
+        MagicMock(status_code=200, headers = {}, json=lambda: {"ResponseContext": {}, "Projects": [{"id": "12345"}]}),
+        MagicMock(status_code=200, headers = {}, json=lambda:
+                  {"ResponseContext": {},
+                   "Clusters": [
+                       {"id": "12345", "name": "test",
+                        "statuses": {"status": "ready",
+                                     "created_at": "2019-08-24T14:15:22Z",
+                                     "updated_at": "2019-08-24T14:15:22Z"}
+                        }
+                    ]
+                  }),
+    ]
+
+    runner = CliRunner()
+    result = runner.invoke(cli, ["--profile", "default", "cluster", "list", "-p", "test", "-c", "test"])
+    assert result.exit_code == 0
+    assert 'eu-west-2' in result.output
+    assert 'default' in result.output
+
 # Test the "cluster list" command: verifies listing clusters in a project
 @patch("oks_cli.utils.requests.request")
 def test_cluster_list_command(mock_request, add_default_profile):
@@ -14,7 +37,7 @@ def test_cluster_list_command(mock_request, add_default_profile):
     ]
 
     runner = CliRunner()
-    result = runner.invoke(cli, ["cluster", "list", "-p", "test", "-c", "test", '-o', 'json'])
+    result = runner.invoke(cli, ["--profile", "default", "cluster", "list", "-p", "test", "-c", "test", '-o', 'json'])
     assert result.exit_code == 0
     assert '"name": "test"' in result.output
 
@@ -296,6 +319,20 @@ def test_cluster_kubeconfig_command(mock_request, add_default_profile):
     assert result.exit_code == 0
     assert 'kubeconfig' in result.output
 
+# Test the "cluster kubeconfig --output table" command: verifies retrieving the kubeconfig and output as table
+@patch("oks_cli.utils.requests.request")
+def test_cluster_kubeconfig_info_command(mock_request, add_default_profile):
+    mock_request.side_effect = [
+        MagicMock(status_code=200, headers = {}, json=lambda: {"ResponseContext": {}, "Projects": [{"id": "12345"}]}),
+        MagicMock(status_code=200, headers = {}, json=lambda: {"ResponseContext": {}, "Clusters": [{"id": "12345"}]}),
+        MagicMock(status_code=200, headers = {}, json=lambda: {"ResponseContext": {}, "Cluster":  {"data": {"kubeconfig": "kubeconfig"}}})
+    ]
+
+    runner = CliRunner()
+    result = runner.invoke(cli, ["cluster", "kubeconfig", "-p", "test", "-c", "test", "--output", "table"])
+    assert result.exit_code != 0
+    assert 'Something went wrong, could not parse kubeconfig' in result.output
+
 # Test the "cluster delete" command with JSON output
 @patch("oks_cli.utils.requests.request")
 def test_cluster_delete_command_json(mock_request, add_default_profile):
@@ -360,14 +397,13 @@ def test_cluster_kubectl_command(mock_request, mock_run, add_default_profile):
     runner = CliRunner()
     result = runner.invoke(cli, ["cluster", "-p", "test", "-c", "test", "kubectl", "get", "pods"])
     mock_run.assert_called()
-    
+
     args, kwargs = mock_run.call_args
 
     assert result.exit_code == 0
     assert ".oks_cli/cache/12345-12345/default/default/kubeconfig" in kwargs["env"]["KUBECONFIG"]
     assert args[0] == ["kubectl", "get", "pods"]
 
-
 # Test the "cluster create by one-click" command: verifies creating cluster interactively
 @patch("oks_cli.utils.os.fork")
 @patch("oks_cli.utils.time.sleep")

{oks_cli-1.15 → oks_cli-1.16}/tests/test_project.py

@@ -5,6 +5,27 @@ import yaml
 import json 
 
 # START PROJECT LIST COMMAND
+# Test the "project list" command: verifies region and profile are shown
+@patch("oks_cli.utils.requests.request")
+def test_project_list_command_with_region_and_profile(mock_request, add_default_profile):
+    mock_request.side_effect = [
+        MagicMock(status_code=200, headers = {}, json=lambda: {
+            "ResponseContext": {},
+            "Projects": [
+                {"id": "12345",
+                 "name":"test",
+                 "created_at": "2019-08-24T14:15:22Z",
+                 "updated_at": "2019-08-24T14:15:22Z",
+                 "status": "ready",
+                 "region":"eu-west-2"}]})
+    ]
+
+    runner = CliRunner()
+    result = runner.invoke(cli, ["project", "list"])
+    assert result.exit_code == 0
+    assert 'eu-west-2' in result.output
+    assert 'default' in result.output
+
 # Test the "project list" command: verifies listing 1 projects with json
 @patch("oks_cli.utils.requests.request")
 def test_project_list_command_json(mock_request, add_default_profile):
@@ -247,8 +268,6 @@ def test_project_delete_json(mock_request, add_default_profile):
         "--profile", "default"
     ])
 
-    print(result.output)
-
     assert result.exit_code == 0
 
     # La sortie doit être du JSON valide