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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oks-cli
-Version: 1.14
+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
@@ -102,31 +102,17 @@ Dynamic: requires-dist
 ### Standard Installation
 
 ```bash
-# Clone the repository
-git clone https://github.com/outscale/oks-cli.git
-cd oks-cli
-
 # Create and activate a virtual environment
 python -m venv venv
 source venv/bin/activate
 
-# Install dependencies
-pip install -r requirements.txt
-
-# Install the CLI in editable mode
-pip install -e .
-```
-
-### User Installation
+# Install the CLI
+pip install oks-cli
 
-Install globally without a virtual environment (Python 3.11):
-
-```bash
-pip3.11 install -e --user .
+# Check version of oks-cli
+oks-cli version
 ```
 
-> **Note:** Ensure `~/Library/Python/3.11/bin` (macOS) or the equivalent path is in your `PATH`.
-
 ---
 
 ## 🚀 Usage
@@ -207,6 +193,15 @@ oks-cli project login --project-name my-project
 Install the CLI in editable mode with development dependencies
 
 ```bash
+# Clone the repository
+git clone https://github.com/outscale/oks-cli.git
+cd oks-cli
+
+# Create and activate a virtual environment
+python -m venv venv
+source venv/bin/activate
+
+# CLI in editable mode
 pip install -e ".[dev]"
 ```
 

{oks_cli-1.14 → oks_cli-1.16}/README.md

@@ -59,31 +59,17 @@
 ### Standard Installation
 
 ```bash
-# Clone the repository
-git clone https://github.com/outscale/oks-cli.git
-cd oks-cli
-
 # Create and activate a virtual environment
 python -m venv venv
 source venv/bin/activate
 
-# Install dependencies
-pip install -r requirements.txt
-
-# Install the CLI in editable mode
-pip install -e .
-```
-
-### User Installation
+# Install the CLI
+pip install oks-cli
 
-Install globally without a virtual environment (Python 3.11):
-
-```bash
-pip3.11 install -e --user .
+# Check version of oks-cli
+oks-cli version
 ```
 
-> **Note:** Ensure `~/Library/Python/3.11/bin` (macOS) or the equivalent path is in your `PATH`.
-
 ---
 
 ## 🚀 Usage
@@ -164,6 +150,15 @@ oks-cli project login --project-name my-project
 Install the CLI in editable mode with development dependencies
 
 ```bash
+# Clone the repository
+git clone https://github.com/outscale/oks-cli.git
+cd oks-cli
+
+# Create and activate a virtual environment
+python -m venv venv
+source venv/bin/activate
+
+# CLI in editable mode
 pip install -e ".[dev]"
 ```
 

{oks_cli-1.14 → 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
+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")
-@click.option('--cluster-name', '-c', required = False, help="Cluster Name")
+@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 cache(ctx, project_name, cluster_name, profile):
@@ -20,8 +22,8 @@ def delete_cache(force):
         clear_cache()
 
 @cache.command('kubeconfigs', help="List cached kubeconfigs")
-@click.option('--project-name', '-p', required=False, help="Project Name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name")
+@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('--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.14 → 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 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
+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")
-@click.option('--name', 'cluster_name', required = False, help="Cluster Name")
-@click.option('--cluster-name', '-c', required = False, help="Cluster Name")
+@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")
+@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):
@@ -70,14 +78,13 @@ def cluster_logout(ctx, profile):
 
 # LIST CLUSTERS
 @cluster.command('list', help="List all clusters")
-@click.option('--project-name', '-p', required=False, help="Project Name")
-@click.option('--name', 'cluster_name', required = False, help="Cluster Name")
-@click.option('--cluster-name', '-c', required = False, help="Cluster Name")
-@click.option('--deleted', is_flag=True, help="List deleted clusters")
+@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('--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")
-@click.option('--name', 'cluster_name', required=False, help="Cluster Name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name")
-@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
 
@@ -311,26 +337,27 @@ def _create_cluster(project_name, cluster_config, output):
 
 # CLUSTER CREATE BY NAME
 @cluster.command('create', help="Create a new cluster")
-@click.option('--project-name', '-p', required=False, help="Project Name")
-@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name")
-@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('--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', '-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', '-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, dry_run, output, filename, profile):
+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):
     """CLI command to create a new Kubernetes cluster with optional configuration parameters."""
     project_name, cluster_name, profile = ctx_update(ctx, project_name, cluster_name, profile)
     login_profile(profile)
@@ -397,31 +424,32 @@ def cluster_create_command(ctx, project_name, cluster_name, description, admin,
 
     if disable_api_termination is not None:
         cluster_config["disable_api_termination"] = disable_api_termination
+    
+    if cp_multi_az is not None:
+        cluster_config["cp_multi_az"] = cp_multi_az
 
     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")
-@click.option('--name', 'cluster_name', required=False, help="Cluster name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster name")
-@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('--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', '-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):
@@ -495,10 +523,9 @@ 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")
-@click.option('--name', 'cluster_name', required=False, help="Cluster name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster name")
-@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('--force', is_flag=True, help="Force upgrade")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
@@ -517,10 +544,9 @@ 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")
-@click.option('--name', 'cluster_name', required=False, help="Cluster name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster name")
-@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('--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)
@@ -549,10 +575,11 @@ 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")
-@click.option('--name', 'cluster_name', required=False, help="Cluster name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name")
+@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('--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")
@@ -560,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)
@@ -615,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):
@@ -642,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)
@@ -659,12 +708,12 @@ 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")
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name")
+@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('--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."""
@@ -677,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.option('--project-name', '-p', required=False, help="Project Name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name")
+@click.group(help="Nodepool related commands.")
+@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('--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)
@@ -707,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', default=["eu-west-2a"], multiple=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."""
@@ -730,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.14 → 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
+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")
-@click.option('--cluster-name', '-c', required = False, help="Cluster Name")
-@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,10 +78,10 @@ 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")
+@click.option('--type', help="Shell, supported [bash,zsh]")
 def install_completion(type):
     """Install shell completion scripts for the CLI."""
     install_completions(type)