🔖 chore: Sync CLI with latest release v1.14

Author: outscale-ykr

oks_cli/cluster.py

@@ -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=True, help="Name of cluster")
+@click.option('--cluster-name', '-c', required=False, help="Name of cluster")
 @click.option("--profile", help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cluster_login(ctx, cluster_name, profile):
@@ -312,8 +312,7 @@ 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', '-c', required=True, help="Cluster Name")
-@click.option('--name', 'cluster_name', required=True, help="Cluster 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")
@@ -342,6 +341,9 @@ def cluster_create_command(ctx, project_name, cluster_name, description, admin,
         input_data = filename.read()
         cluster_config = detect_and_parse_input(input_data)
 
+    if not cluster_name and "name" not in cluster_config:
+        raise click.BadArgumentUsage("Missing option '--cluster-name' / '-c'.")
+
     if cluster_name:
         cluster_config['name'] = cluster_name
 
@@ -646,7 +648,7 @@ def _run_kubectl(project_id, cluster_id, user, group, args, input=None):
         kubeconfig_path = save_cache(project_id, cluster_id, 'kubeconfig', kubeconfig_raw, user, group)
 
     env = dict(os.environ)
-    env['KUBECONFIG'] = kubeconfig_path
+    env['KUBECONFIG'] = str(kubeconfig_path)
     cmd = ['kubectl']
     cmd += list(args)
     logging.info("running %s", cmd)

oks_cli/main.py

@@ -79,7 +79,7 @@ def fullhelp():
 def version():
     """Display the current CLI version."""
     import importlib.metadata
-    print(importlib.metadata.version(__package__) + ".KAAS-1014")
+    print(importlib.metadata.version(__package__))
 
 @cli.command("install-completion", help="Install shell completion scripts.")
 @click.option('--type', help="Shell")

oks_cli/profile.py

@@ -1,5 +1,5 @@
 import click
-from .utils import set_profile, remove_profile, profile_list, DEFAULT_API_URL
+from .utils import set_profile, remove_profile, profile_list, DEFAULT_API_URL, get_profiles
 
 
 # DEFINE THE PROFILE COMMAND GROUP
@@ -23,6 +23,16 @@ def add_profile(profile_name, access_key, secret_key, username, password, region
     if not profile_name:
         profile_name = "default"
 
+    existing_profiles = get_profiles()
+    if profile_name in existing_profiles:
+        confirm = click.confirm(
+            f"The profile '{profile_name}' already exists. Do you want to replace it?",
+            default=False
+        )
+        if not confirm:
+            click.echo("Aborted.")
+            return
+
     obj = {
         "region_name": region
     }
@@ -47,9 +57,8 @@ def add_profile(profile_name, access_key, secret_key, username, password, region
 
     set_profile(profile_name, obj)
 
-    profile_name = click.style(profile_name, bold=True)
-
-    click.echo(f"Profile {profile_name} has been successfully added")
+    profile_name_styled = click.style(profile_name, bold=True)
+    click.echo(f"Profile {profile_name_styled} has been successfully added")
 
 @profile.command('update', help="Update an existing profile")
 @click.option('--profile-name', required=True, help="Name of profile", type=click.STRING)

oks_cli/project.py

@@ -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=True, help="Name of project", type=click.STRING)
+@click.option('--project-name', '-p', required=False, help="Name of project", type=click.STRING)
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def project_login(ctx, project_name, profile):

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="oks-cli",
-    version="1.13",
+    version="1.14",
     packages=['oks_cli'],
     author="Outscale SAS",
     author_email="mgrechukh@satelliz.com",