fix conflict

Signed-off-by: Romain Demeure <romain.demeure@outscale.com>

Author: outscale-rde

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', '--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", "-pr", 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', '--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', '-pl', is_flag=True, help="Plain table format")
 @click.option('--msword', '-mw', is_flag=True, help="Microsoft Word table format")
 @click.option('--profile', "-pr", help="Configuration profile to use", shell_complete=profile_completer)

oks_cli/cluster.py

@@ -12,15 +12,15 @@
 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
 
 # DEFINE THE CLUSTER GROUP
 @click.group(help="Cluster related commands.")
-@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("--profile", "-pr", help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cluster(ctx, project_name, cluster_name, profile):
@@ -29,7 +29,7 @@ def cluster(ctx, project_name, cluster_name, profile):
 
 # LOGIN ON CLUSTER
 @cluster.command('login', help="Set a default cluster")
-@click.option('--cluster-name', '--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", "-pr", help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cluster_login(ctx, cluster_name, profile):
@@ -68,8 +68,8 @@ 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('--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('--deleted', '-x', is_flag=True, help="List deleted clusters")  # x pour "deleted" / "removed"
 @click.option('--plain', '-pl', is_flag=True, help="Plain table format")
 @click.option('--msword', '-mw', is_flag=True, help="Microsoft Word table format")
@@ -212,8 +212,8 @@ def format_row(cluster):
 
 # 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('--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('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--profile', '-pr', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
@@ -307,8 +307,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', '-d', help="Description of the cluster")
 @click.option('--admin', '-a', help="Admin Whitelist")
 @click.option('--version', '-v', shell_complete=shell_completions, help="Kubernetes version")
@@ -407,8 +407,8 @@ 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('--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', '-d', help="Description of the cluster")
 @click.option('--admin', '-a', help="Admin Whitelist")
 @click.option('--version', '-v', shell_complete=shell_completions, help="Kubernetes version")
@@ -494,8 +494,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")
-@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('--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', '-pr', help="Configuration profile to use", shell_complete=profile_completer)
@@ -515,8 +515,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")
-@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('--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")
@@ -546,8 +546,8 @@ 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('--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('--print-path', '-pp', 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)")
@@ -655,8 +655,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', '--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', '-u', type=click.STRING, help="User")
 @click.option('--group', '-g', type=click.STRING, help="Group")
 @click.option('--profile', '-pr', help="Configuration profile to use", shell_complete=profile_completer)
@@ -674,8 +674,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', '--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', '-u', type=click.STRING, help="User")
 @click.option('--group', '-g', type=click.STRING, help="Group")
 @click.option('--profile', '-pr', help="Configuration profile to use", shell_complete=profile_completer)

oks_cli/main.py

@@ -9,13 +9,13 @@
 from .cache import cache
 from .quotas import quotas
 
-from .utils import ctx_update, 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', '-pr', help="Configuration profile to use", shell_complete=profile_completer)
-@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('--verbose', '-v', count=True, help="Increase verbosity")
 @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', required=True, help="Shell, supported [bash,zsh]")
+@click.option('--type', help="Shell, supported [bash,zsh]")
 def install_completion(type):
     """Install shell completion scripts for the CLI."""
     install_completions(type)

oks_cli/project.py

@@ -6,11 +6,12 @@
 import prettytable
 import os
 
-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
+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-name', '-p', required=False, help="Project Name")
+@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', '-pr', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def project(ctx, project_name, profile):
@@ -19,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', '-pr', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def project_login(ctx, project_name, profile):
@@ -57,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', '-x', is_flag=True, help="List deleted projects")
 @click.option('--plain', '-pl', is_flag=True, help="Plain table format")
 @click.option('--msword', '-mw', is_flag=True, help="Microsoft Word table format")
@@ -192,7 +193,7 @@ def format_row(project):
 
 # CREATE PROJECT BY NAME
 @project.command('create', help="Create a new project")
-@click.option('--project-name', '-p', help="Name of the project", type=click.STRING)
+@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', '-q', multiple=True, help="Quirk")
@@ -253,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('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--profile', '-pr', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
@@ -269,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", type=click.STRING)
+@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")
@@ -301,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", type=click.STRING)
+@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'")
@@ -349,7 +350,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")
+@click.option('--project-name', '-p', help="Name of the project", shell_complete=project_completer)
 @click.option('--output', '-o', type=click.Choice(["json", "yaml", "table"]), help="Specify output format, by default is json")
 @click.option('--profile', '-pr', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
@@ -377,7 +378,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")
+@click.option('--project-name', '-p', help="Name of the project", shell_complete=project_completer)
 @click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--profile', '-pr', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
@@ -393,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('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--profile', '-pr',help="Configuration profile to use")
 @click.pass_context