oks-cli 1.17__tar.gz → 1.18__tar.gz

{oks_cli-1.17 → oks_cli-1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oks-cli
-Version: 1.17
+Version: 1.18
 Author: Outscale SAS
 Author-email: opensource@outscale.com
 License: BSD

{oks_cli-1.17 → oks_cli-1.18}/oks_cli/cluster.py

@@ -257,6 +257,9 @@ def cluster_get_command(ctx, project_name, cluster_name, output, profile):
 def prepare_cluster_template(cluster_config):
     cluster_template = get_template("cluster")
 
+    if cluster_template.get("project_id") == "":
+        cluster_template.pop("project_id", None)
+
     admin_whitelist = cluster_config.get("admin_whitelist") or []
     if isinstance(admin_whitelist, str):
         admin_whitelist = [admin_whitelist]

{oks_cli-1.17 → oks_cli-1.18}/oks_cli/profile.py

@@ -18,7 +18,7 @@ def profile():
 @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', help="Enable JWT, by default is false")
+@click.option('--jwt', help="Enable JWT, by default is false", type=click.BOOL)
 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:

{oks_cli-1.17 → oks_cli-1.18}/oks_cli/project.py

@@ -391,4 +391,22 @@ def project_get_public_ips(ctx, project_name, output, profile):
     project_id = find_project_id_by_name(project_name)
 
     data = do_request("GET", f'projects/{project_id}/public_ips')
+    print_output(data, output)
+
+
+
+# GET NETS BY PROJECT NAME
+@project.command('nets', help="Get project nets")
+@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',help="Configuration profile to use")
+@click.pass_context
+def project_get_public_ips(ctx, project_name, output, profile):
+    """Retrieve the list of Nets associated with the specified project."""
+    project_name, _, profile = ctx_update(ctx, project_name, None, profile)
+    login_profile(profile)
+
+    project_id = find_project_id_by_name(project_name)
+
+    data = do_request("GET", f'projects/{project_id}/nets')
     print_output(data, output)

{oks_cli-1.17 → oks_cli-1.18}/oks_cli/utils.py

@@ -77,6 +77,8 @@ def find_response_object(data):
             return response["PublicIps"]
         elif key == "IP":
             return response["IP"]
+        elif key == "Nets":
+            return response["Nets"]
 
     raise click.ClickException("The API response format is incorrect.")
 
@@ -108,10 +110,13 @@ def do_request(method, path, *args, **kwargs):
             obj = find_response_object(data)
             return obj
         except requests.exceptions.HTTPError as err:
-            otp_response = handle_otp_error(err, lambda: do_request(method, path, *args, **kwargs))
+            otp_response = handle_otp_error(err, method, path, args, kwargs)
             if otp_response is not None:
                 return otp_response
 
+            if os.environ.get("OKS_OTP_CODE") is not None:
+                raise JSONClickException(err.response.text)
+
             jwt_response = handle_jwt_error(err, method, path, args, kwargs)
             if jwt_response is not None:
                 return jwt_response
@@ -210,7 +215,7 @@ def print_table(data, table_fields, align="l", style=None):
         table.add_row([d[v] if v in d else "" for v in values])
     click.echo(table)
 
-def handle_otp_error(err, callback):
+def handle_otp_error(err, method, path, args, kwargs):
     """Handle OTP authentication error by prompting the user and retrying the request."""
     try:
         response_body = json.loads(err.response.text)
@@ -218,7 +223,11 @@ def handle_otp_error(err, callback):
             otp_code = click.prompt('Enter your OTP code', type=int)
             os.environ["OKS_OTP_CODE"] = str(otp_code)
 
-            return callback()
+            logging.info("Retrying request with user-provided OTP...")
+            return do_request(method, path, *args, **kwargs)
+
+    except JSONClickException:
+        raise
     except Exception:
         return None
 
@@ -257,8 +266,14 @@ def find_cluster_id_by_name(project_id, cluster_name):
     """Retrieve the cluster ID by name within a given project, or use the default cluster if none is provided."""
     if not cluster_name:
         cluster_id = get_cluster_id()
+        errors = {"Error": "--cluster-name must be specified, or a default cluster must be set"}
+
         if not cluster_id:
-            raise click.BadParameter("--cluster-name must be specified, or a default cluster must be set")
+            raise JSONClickException(json.dumps(errors))
+
+        cluster = do_request("GET", f'clusters/{cluster_id}')
+        if cluster['project_id'] != project_id:
+            raise JSONClickException(json.dumps(errors))
     else:
         data = do_request("GET", 'clusters', params={"project_id": project_id, "name": cluster_name})
         if len(data) != 1:

{oks_cli-1.17 → oks_cli-1.18}/oks_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oks-cli
-Version: 1.17
+Version: 1.18
 Author: Outscale SAS
 Author-email: opensource@outscale.com
 License: BSD

{oks_cli-1.17 → oks_cli-1.18}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="oks-cli",
-    version="1.17",
+    version="1.18",
     packages=['oks_cli'],
     author="Outscale SAS",
     author_email="opensource@outscale.com",

{oks_cli-1.17 → oks_cli-1.18}/tests/test_profile.py

@@ -1,6 +1,6 @@
 from click.testing import CliRunner
 from oks_cli.main import cli
-
+from unittest.mock import patch
 
 def test_profile_list_command():
     runner = CliRunner()
@@ -38,6 +38,32 @@ def test_profile_add_command():
     assert result.exit_code == 0
     assert "Profile default has been successfully added" in result.output
 
+def test_profile_add_jwt_boolean():
+    runner = CliRunner()
+
+    with patch("oks_cli.profile.set_profile") as mock_set_profile:
+        result = runner.invoke(
+            cli,
+            [
+                "profile", "add",
+                "--region", "eu-west-2",
+                "--access-key", "AK",
+                "--secret-key", "SK",
+                "--jwt", "true"
+            ],
+            input="y\n"
+        )
+
+        assert result.exit_code == 0
+
+        mock_set_profile.assert_called_once()
+        profile_name, obj = mock_set_profile.call_args[0]
+
+        assert profile_name == "default"
+
+        assert isinstance(obj["jwt"], bool)
+        assert obj["jwt"] is True
+
 def test_profile_update_command(add_default_profile):
     runner = CliRunner()
     result = runner.invoke(cli, ["profile", "update", "--profile-name", "default", "--region", "cloudgouv-eu-west-1"])

{oks_cli-1.17 → oks_cli-1.18}/tests/test_project.py

@@ -476,6 +476,80 @@ def test_project_publicips_yaml(mock_request, add_default_profile):
 # END PROJECT PUBLICIPS COMMAND
 
 
+# START PROJECT NETS COMMAND
+# Test the "project nets" command: verifies fetching project nets
+nets = [{
+    "DhcpOptionsSetId": "dopt-12345678",
+    "IpRange": "10.50.0.0/16",
+    "NetId": "vpc-12345678",
+    "State": "available",
+    "Tags": [
+        {
+            "Key": "Name",
+            "Value": "default"
+        }
+    ]
+}]
+
+@patch("oks_cli.utils.requests.request")
+def test_project_nets_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": {}, "Nets": nets })
+    ]
+
+    runner = CliRunner()
+    result = runner.invoke(cli, ["project", "nets", "-p", "test"])
+    assert result.exit_code == 0
+
+    data = json.loads(result.output)
+    assert isinstance(data, list)
+    assert data == nets
+
+@patch("oks_cli.utils.requests.request")
+def test_project_nets_json(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": {}, "Nets": nets })
+    ]
+
+    runner = CliRunner()
+    result = runner.invoke(cli, [
+        "project", "nets",
+        "-p", "test-project",
+        "-o", "json",
+        "--profile", "default"
+    ])
+
+    assert result.exit_code == 0
+
+    data = json.loads(result.output)
+    assert isinstance(data, list)
+    assert data == nets
+
+@patch("oks_cli.utils.requests.request")
+def test_project_nets_yaml(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": {}, "Nets": nets })
+    ]
+
+    runner = CliRunner()
+    result = runner.invoke(cli, [
+        "project", "nets",
+        "-p", "test-project",
+        "-o", "yaml",
+        "--profile", "default"
+    ])
+
+    assert result.exit_code == 0
+
+    data = yaml.safe_load(result.output)
+    assert isinstance(data, list)
+    assert data == nets
+# END PROJECT NETS COMMAND
+
+
 # Test the "project list" command with --watch option
 @patch("oks_cli.utils.requests.request")
 @patch("time.sleep")