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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oks-cli
-Version: 1.14
+Version: 1.15
 Author: Outscale SAS
 Author-email: opensource@outscale.com
 License: BSD
@@ -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.15}/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.15}/oks_cli/cache.py

@@ -1,11 +1,11 @@
 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
 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', '-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 +20,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', '-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)

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

@@ -12,7 +12,7 @@ import human_readable
 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
+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
 
 from .profile import add_profile
 from .project import project_create, project_login
@@ -20,9 +20,9 @@ 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('--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")
+@click.option('--cluster-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 +31,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', '-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,9 +70,9 @@ 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('--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")
+@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('--plain', is_flag=True, help="Plain table format")
 @click.option('--msword', is_flag=True, help="Microsoft Word table format")
@@ -215,9 +215,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('--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('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
@@ -311,8 +311,8 @@ 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('--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")
@@ -325,12 +325,13 @@ def _create_cluster(project_name, cluster_config, output):
 @click.option('--quirk', multiple=True, help="Quirk")
 @click.option('--tags', 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('--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('--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,6 +398,9 @@ 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)
@@ -407,9 +411,9 @@ def cluster_create_command(ctx, project_name, cluster_name, description, admin,
 
 # UPDATE CLUSTER
 @cluster.command('update', help="Update a cluster by name")
-@click.option('--project-name', '-p', 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")
+@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")
@@ -495,9 +499,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('--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")
+@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('--force', is_flag=True, help="Force upgrade")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
@@ -517,9 +521,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('--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")
+@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('--dry-run', is_flag=True, help="Run without any action")
 @click.option('--force', is_flag=True, help="Force deletion without confirmation")
@@ -549,9 +553,9 @@ 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('--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")
+@click.option('--cluster-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('--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)")
@@ -659,8 +663,8 @@ 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', '-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)
@@ -678,8 +682,8 @@ def cluster_kubectl_command(ctx, project_name, cluster_name, 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.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('--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,7 +715,7 @@ def nodepool_list(ctx):
 @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('--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('--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 ")

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

@@ -9,13 +9,13 @@ 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, login_profile, 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('--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.pass_context
 def cli(ctx, project_name, cluster_name, profile, verbose):
@@ -82,7 +82,7 @@ def version():
     print(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)

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

@@ -1,5 +1,6 @@
 import click
-from .utils import set_profile, remove_profile, profile_list, DEFAULT_API_URL, get_profiles
+import prettytable
+from .utils import set_profile, remove_profile, profile_list, DEFAULT_API_URL, get_profiles, print_output, print_table
 
 
 # DEFINE THE PROFILE COMMAND GROUP
@@ -62,15 +63,18 @@ def add_profile(profile_name, access_key, secret_key, username, password, region
 
 @profile.command('update', help="Update an existing profile")
 @click.option('--profile-name', required=True, help="Name of profile", type=click.STRING)
+@click.option('--new-name', required=False, help="Update profile name with new one, USE IT WITH CAUTION", type=click.STRING)
 @click.option('--region', required=False, 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)
-def update_profile(profile_name, region, endpoint, jwt):
+@click.option('--force', is_flag=True, help="Force update profile name without confirmation")
+def update_profile(profile_name, region, endpoint, jwt, new_name, force):
     """Update configuration settings for an existing profile."""
     profiles = profile_list()
     if profile_name not in profiles:
-        raise click.ClickException(f"There no profile with name: {profile_name}")
+        raise click.ClickException(f"There is no profile with name: {profile_name}")
 
+    msg = f"Profile {profile_name} has been successfully updated"
     profile = profiles[profile_name]
     if region:
         profile["region_name"] = region
@@ -81,11 +85,17 @@ def update_profile(profile_name, region, endpoint, jwt):
     if jwt is not None:
         profile["jwt"] = jwt
 
-    set_profile(profile_name, profile)
+    if new_name is not None:
+        old_profile = click.style(profile_name, bold=True)
+        new_profile = click.style(new_name, bold=True)
+        if force or click.confirm(f"Are you sure you want to update the profile {old_profile} with new name {new_profile}?", abort=True):
+            remove_profile(profile_name)
+            profile_name = new_name
+            msg = f"Profile {old_profile} has been successfully updated with new name {new_profile}"
 
+    set_profile(profile_name, profile)
     profile_name = click.style(profile_name, bold=True)
-
-    click.echo(f"Profile {profile_name} has been successfully updated")
+    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)
@@ -103,7 +113,8 @@ def delete_profile(profile_name, force):
         click.echo(f"Profile {profile_name_bold} has been successfully deleted")
 
 @profile.command('list', help="List existing profiles")
-def list_profiles():
+@click.option('-o', '--output', 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()
 
@@ -111,18 +122,49 @@ def list_profiles():
         return click.echo("There are no profiles")
 
     profiles_keys = list(profiles.keys())
+    lines = list()
 
     for key in profiles_keys:
         if 'endpoint' not in profiles[key]:
             if 'region_name' in profiles[key]:
-                endpoint = click.style(DEFAULT_API_URL.format(region=profiles[key]['region_name']), bold=True)
+                endpoint = DEFAULT_API_URL.format(region=profiles[key]['region_name'])
             else:
                 endpoint = None
         else:
-            endpoint = click.style(profiles[key]["endpoint"], bold=True)
-        name = click.style(key, bold=True)
-        account_type = click.style(profiles[key]["type"], bold=True)
-        region = click.style(profiles[key]["region_name"], bold=True)
-        jwt = click.style(profiles[key].get("jwt", False), bold=True)
-
-        click.echo(f"Profile: {name} Account type: {account_type} Region: {region} Endpoint: {endpoint} Enabled JWT auth: {jwt}")
+            endpoint = profiles[key]["endpoint"]
+
+        name = key
+        account_type = profiles[key]["type"]
+        region = profiles[key]["region_name"]
+        jwt = profiles[key].get("jwt", False)
+        # Remove credentials keys from profiles
+        profiles[key].pop('access_key', None)
+        profiles[key].pop('secret_key', None)
+        profiles[key].pop('username', None)
+        profiles[key].pop('password', None)
+        # Add endpoint and JWT to dict
+        profiles[key].update({'endpoint': endpoint})
+        profiles[key].update({'jwt': jwt})
+
+        if output == 'wide' or output is None:
+            lines.append("Profile: {} Account type: {} Region: {} Endpoint: {} Enabled JWT auth: {}".format(
+                         click.style(name, bold=True),
+                         click.style(account_type, bold=True),
+                         click.style(region, bold=True),
+                         click.style(endpoint, bold=True),
+                         click.style(jwt, bold=True)))
+        else:
+            lines.append({"name": name, "account_type": account_type, "region": region, "endpoint": endpoint, "jwt": jwt})
+    
+    if output == "table":
+        print_table(lines, [["Profile", "name"],
+                            ["Account type", "account_type"],
+                            ["Region", "region"],
+                            ["Endpoint", "endpoint"],
+                            ["JWT enabled", "jwt"]])
+    elif output in ["json", "yaml"]:
+        print_output(profiles, output)
+    else:
+        for line in lines:
+            click.echo(line)
+    return

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

@@ -6,12 +6,12 @@ import human_readable
 import prettytable
 import os
 
-from .utils import do_request, print_output, find_project_id_by_name, get_project_id, set_project_id, detect_and_parse_input, transform_tuple, ctx_update, set_cluster_id, get_template, get_project_name, format_changed_row, is_interesting_status, login_profile, profile_completer
+from .utils import do_request, print_output, print_table, find_project_id_by_name, get_project_id, set_project_id, detect_and_parse_input, transform_tuple, ctx_update, set_cluster_id, get_template, get_project_name, format_changed_row, is_interesting_status, login_profile, profile_completer, project_completer
 
 # 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")
+@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):
@@ -20,7 +20,7 @@ def project(ctx, project_name, profile):
 
 # LOGIN ON PROJECT
 @project.command('login', help="Set a default project by name")
-@click.option('--project-name', '-p', required=False, help="Name of project", type=click.STRING)
+@click.option('--project-name', '-p', required=False, help="Name of project", type=click.STRING, shell_complete=project_completer)
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def project_login(ctx, project_name, profile):
@@ -58,7 +58,7 @@ 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)
+@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('--plain', is_flag=True, help="Plain table format")
 @click.option('--msword', is_flag=True, help="Microsoft Word table format")
@@ -193,7 +193,7 @@ 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")
+@click.option('--project-name', '-p', help="Name of the project", shell_complete=project_completer)
 @click.option('--description', help="Description of the project")
 @click.option('--cidr', help='CIDR for the project')
 @click.option('--quirk', multiple=True, help="Quirk")
@@ -254,7 +254,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")
+@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", shell_complete=profile_completer)
 @click.pass_context
@@ -270,7 +270,7 @@ 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")
+@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('--dry-run', is_flag=True, help="Run without any action")
 @click.option('--force', is_flag=True, help="Force deletion without confirmation")
@@ -302,7 +302,7 @@ 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")
+@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'")
@@ -350,8 +350,8 @@ 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")
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@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('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def project_get_quotas(ctx, project_name, output, profile):
@@ -362,12 +362,23 @@ def project_get_quotas(ctx, project_name, output, profile):
     project_id = find_project_id_by_name(project_name)
 
     data = do_request("GET", f'projects/{project_id}/quotas')["data"]
-    print_output(data, output)
+    if output == "table":
+        print_table(data["quotas"], [["Name", "Name"],
+                                     ["Collection", "QuotaCollection"],
+                                     ["Description", "ShortDescription"],
+                                     ["Max Value", "MaxValue"],
+                                     ["Used Value", "UsedValue"]])
+        print_table(data["subregions"], [["Region", "RegionName"],
+                                         ["Availability Zone", "SubregionName"],
+                                         ["State", "State"]])
+
+    else:
+        print_output(data, output)
 
 
 # GET PROJECT SNAPSHOTS BY PROJECT NAME
 @project.command('snapshots', help="Get project snapshots")
-@click.option('--project-name', '-p', help="Name of the project")
+@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", shell_complete=profile_completer)
 @click.pass_context
@@ -383,7 +394,7 @@ 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")
+@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.pass_context

oks_cli-1.15/oks_cli/quotas.py

@@ -0,0 +1,21 @@
+import click
+import prettytable
+from .utils import do_request, print_output, print_table, ctx_update, login_profile, profile_completer
+
+@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.pass_context
+def quotas(ctx, profile, output):
+    """Retrieve global quotas across all projects for the given profile."""
+    _, _, profile = ctx_update(ctx, None, None, profile)
+    login_profile(profile)
+
+    data = do_request("GET", 'quotas')
+    if output == "table":
+        print_table([data], [["Projects", "Projects"],
+                           ["Clusters per project", "ClustersPerProject"],
+                           ["Kubernetes versions", "KubeVersions"],
+                           ["Control plane subregions", "CPSubregions"]])
+    else:
+        print_output(data, output)