wayscloud-cli 0.4.0__tar.gz → 0.6.0__tar.gz

wayscloud_cli-0.6.0/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 WAYSCloud AS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{wayscloud_cli-0.4.0 → wayscloud_cli-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wayscloud-cli
-Version: 0.4.0
+Version: 0.6.0
 Summary: Command-line interface for WAYSCloud — manage VPS, DNS, databases, storage, apps, IoT, and more
 License: MIT
 Project-URL: Homepage, https://wayscloud.services
@@ -19,10 +19,12 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: wayscloud>=0.3.0
+License-File: LICENSE
+Requires-Dist: wayscloud>=0.5.0
 Requires-Dist: typer>=0.9
 Requires-Dist: rich>=13.0
 Requires-Dist: websockets>=12.0
+Dynamic: license-file
 
 # WAYSCloud CLI
 
@@ -34,6 +36,8 @@ Command-line interface for [WAYSCloud](https://wayscloud.services). Built on the
 pip install wayscloud-cli
 ```
 
+Version 0.6.0 adds the upgrade preflight (`cloud k8s preflight`, non-zero exit on blockers) and requires SDK `wayscloud>=0.5.0`.
+
 ## Authentication
 
 ```bash
@@ -94,7 +98,8 @@ cloud redis plans
 cloud storage buckets
 cloud storage buckets-create my-bucket
 cloud storage buckets-delete my-bucket --confirm
-cloud storage credentials
+cloud storage keys my-bucket
+cloud storage keys-create my-bucket --name ci
 ```
 
 ### Apps
@@ -108,6 +113,32 @@ cloud app stop <id>
 cloud app delete <id> --confirm
 ```
 
+### Kubernetes
+
+```bash
+cloud k8s plans --kind node
+cloud k8s list
+cloud k8s create shop --pool k8s-node-2c4g:2 --plan k8s-cluster-dev --region no --wait
+cloud k8s info <cluster-id>
+cloud k8s kubeconfig <cluster-id> -o ~/.kube/shop.yaml   # written with mode 0600
+cloud k8s preflight <cluster-id> 1.35                  # blockers/warnings; exit != 0 on blockers
+cloud k8s upgrade <cluster-id> 1.35 --mode next-maintenance-window --backup-first
+cloud k8s scale <cluster-id> default 4
+cloud k8s add-pool <cluster-id> batch --plan k8s-node-4c16g --count 2 \
+  --label role=worker --taint dedicated=gpu:NoSchedule --ssh-key-id <key-id>
+cloud k8s delete-pool <cluster-id> batch
+cloud k8s api-access <cluster-id> --cidr 203.0.113.0/24
+cloud k8s ip-allocate <cluster-id>
+cloud k8s ip-release <cluster-id> <address>
+cloud k8s ptr <cluster-id> <address> mail.example.com
+cloud k8s backups <cluster-id>
+cloud k8s backup <cluster-id>
+cloud k8s restore <cluster-id> <backup-id> -n shop
+cloud k8s upgrade <cluster-id>            # list available versions
+cloud k8s upgrade <cluster-id> 1.34       # upgrade to a version
+cloud k8s delete <cluster-id> --confirm-name shop --wait
+```
+
 ### IoT
 
 ```bash
@@ -119,6 +150,15 @@ cloud iot groups
 cloud iot groups-create --name "Floor 2"
 ```
 
+### Impact
+
+```bash
+cloud impact forest create "My forest"
+cloud impact forest status --visualize emoji
+cloud impact tree grow --count 10 --idempotency-key <key>
+cloud impact commitments list
+```
+
 ### Shell
 
 ```bash
@@ -138,7 +178,7 @@ cloud vps list --json
 ## Requirements
 
 - Python 3.9+
-- wayscloud (SDK)
+- [wayscloud](https://pypi.org/project/wayscloud/) SDK `>=0.4.0` (installed automatically; the Kubernetes commands need a release that exposes `client.kubernetes`)
 
 ## Documentation
 

{wayscloud_cli-0.4.0 → wayscloud_cli-0.6.0}/README.md

@@ -8,6 +8,8 @@ Command-line interface for [WAYSCloud](https://wayscloud.services). Built on the
 pip install wayscloud-cli
 ```
 
+Version 0.6.0 adds the upgrade preflight (`cloud k8s preflight`, non-zero exit on blockers) and requires SDK `wayscloud>=0.5.0`.
+
 ## Authentication
 
 ```bash
@@ -68,7 +70,8 @@ cloud redis plans
 cloud storage buckets
 cloud storage buckets-create my-bucket
 cloud storage buckets-delete my-bucket --confirm
-cloud storage credentials
+cloud storage keys my-bucket
+cloud storage keys-create my-bucket --name ci
 ```
 
 ### Apps
@@ -82,6 +85,32 @@ cloud app stop <id>
 cloud app delete <id> --confirm
 ```
 
+### Kubernetes
+
+```bash
+cloud k8s plans --kind node
+cloud k8s list
+cloud k8s create shop --pool k8s-node-2c4g:2 --plan k8s-cluster-dev --region no --wait
+cloud k8s info <cluster-id>
+cloud k8s kubeconfig <cluster-id> -o ~/.kube/shop.yaml   # written with mode 0600
+cloud k8s preflight <cluster-id> 1.35                  # blockers/warnings; exit != 0 on blockers
+cloud k8s upgrade <cluster-id> 1.35 --mode next-maintenance-window --backup-first
+cloud k8s scale <cluster-id> default 4
+cloud k8s add-pool <cluster-id> batch --plan k8s-node-4c16g --count 2 \
+  --label role=worker --taint dedicated=gpu:NoSchedule --ssh-key-id <key-id>
+cloud k8s delete-pool <cluster-id> batch
+cloud k8s api-access <cluster-id> --cidr 203.0.113.0/24
+cloud k8s ip-allocate <cluster-id>
+cloud k8s ip-release <cluster-id> <address>
+cloud k8s ptr <cluster-id> <address> mail.example.com
+cloud k8s backups <cluster-id>
+cloud k8s backup <cluster-id>
+cloud k8s restore <cluster-id> <backup-id> -n shop
+cloud k8s upgrade <cluster-id>            # list available versions
+cloud k8s upgrade <cluster-id> 1.34       # upgrade to a version
+cloud k8s delete <cluster-id> --confirm-name shop --wait
+```
+
 ### IoT
 
 ```bash
@@ -93,6 +122,15 @@ cloud iot groups
 cloud iot groups-create --name "Floor 2"
 ```
 
+### Impact
+
+```bash
+cloud impact forest create "My forest"
+cloud impact forest status --visualize emoji
+cloud impact tree grow --count 10 --idempotency-key <key>
+cloud impact commitments list
+```
+
 ### Shell
 
 ```bash
@@ -112,7 +150,7 @@ cloud vps list --json
 ## Requirements
 
 - Python 3.9+
-- wayscloud (SDK)
+- [wayscloud](https://pypi.org/project/wayscloud/) SDK `>=0.4.0` (installed automatically; the Kubernetes commands need a release that exposes `client.kubernetes`)
 
 ## Documentation
 

{wayscloud_cli-0.4.0 → wayscloud_cli-0.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wayscloud-cli"
-version = "0.4.0"
+version = "0.6.0"
 description = "Command-line interface for WAYSCloud — manage VPS, DNS, databases, storage, apps, IoT, and more"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -22,7 +22,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "wayscloud>=0.3.0",
+    "wayscloud>=0.5.0",
     "typer>=0.9",
     "rich>=13.0",
     "websockets>=12.0",

{wayscloud_cli-0.4.0 → wayscloud_cli-0.6.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = wayscloud-cli
-version = 0.4.0
+version = 0.6.0
 
 [options]
 packages = find:

wayscloud_cli-0.6.0/tests/test_k8s_cli.py

@@ -0,0 +1,318 @@
+"""k8s command tests -- option parsing, payloads and file handling."""
+
+import os
+import stat
+
+from typer.testing import CliRunner
+
+from wayscloud_cli.__main__ import app
+from wayscloud_cli.commands import k8s as k8s_cmd
+
+runner = CliRunner()
+
+
+class FakeKubernetes:
+    def __init__(self):
+        self.calls = []
+        self.window = {}
+        self.jobs = []
+        self.upgrade_response = None
+        self.preflight_response = None
+
+    def add_node_pool(self, *args, **kwargs):
+        self.calls.append((args, kwargs))
+        return {"id": "c1"}
+
+    def kubeconfig(self, cluster_id):
+        return "apiVersion: v1\nkind: Config\n"
+
+    def delete_node_pool(self, *args, **kwargs):
+        self.calls.append((args, kwargs))
+        return {"id": "c1"}
+
+    def upgrade_node_pool(self, *args, **kwargs):
+        self.calls.append((args, kwargs))
+        return {"id": "c1"}
+
+    def versions(self, *args, **kwargs):
+        self.calls.append((args, kwargs))
+        return {"default": "1.35", "versions": [
+            {"version": "1.35", "status": "default", "create_allowed": True, "create_until": None,
+             "support_ends_at": "2027-02-28", "upgrade_required_by": None, "recommended_upgrade": None},
+            {"version": "1.34", "status": "transition", "create_allowed": True, "create_until": "2026-10-15",
+             "support_ends_at": "2026-10-27", "upgrade_required_by": "2026-10-20", "recommended_upgrade": "1.35"}]}
+
+    def upgrade(self, *args, **kwargs):
+        self.calls.append((args, kwargs))
+        return self.upgrade_response or {"id": "c1", "status": "upgrading"}
+
+    def upgrade_preflight(self, *args, **kwargs):
+        self.calls.append((args, kwargs))
+        return self.preflight_response or {"ok": True, "errors": [], "warnings": []}
+
+    def upgrade_jobs(self, *args, **kwargs):
+        self.calls.append((args, kwargs))
+        return self.jobs
+
+    def upgrade_job(self, *args, **kwargs):
+        self.calls.append((args, kwargs))
+        return self.jobs[0] if self.jobs else {}
+
+    def cancel_upgrade_job(self, *args, **kwargs):
+        self.calls.append((args, kwargs))
+        return {"id": "j1", "status": "cancelled"}
+
+    def set_maintenance_window(self, *args, **kwargs):
+        self.calls.append((args, kwargs))
+        return {"enabled": kwargs.get("enabled", True), "timezone": kwargs.get("timezone"), "days": kwargs.get("days"),
+                "start": kwargs.get("start"), "duration_minutes": kwargs.get("duration_minutes"),
+                "next_window_start": "2026-10-24T02:00:00+02:00", "next_window_end": "2026-10-24T04:00:00+02:00"}
+
+    def get_maintenance_window(self, *args, **kwargs):
+        self.calls.append((args, kwargs))
+        return self.window
+
+    def delete_maintenance_window(self, *args, **kwargs):
+        self.calls.append((args, kwargs))
+        return {"enabled": False, "timezone": None, "days": [], "start": None, "duration_minutes": None,
+                "next_window_start": None, "next_window_end": None}
+
+
+class FakeClient:
+    def __init__(self, kubernetes):
+        self.kubernetes = kubernetes
+
+
+def patch_client(monkeypatch, kubernetes):
+    monkeypatch.setattr(k8s_cmd, "get_client", lambda token=None: FakeClient(kubernetes))
+
+
+def test_parse_labels_and_taints():
+    assert k8s_cmd._parse_labels([]) == {}
+    assert k8s_cmd._parse_labels(["role=worker", "zone=a=b"]) == {"role": "worker", "zone": "a=b"}
+    assert k8s_cmd._parse_taints([]) == []
+    assert k8s_cmd._parse_taints(["dedicated=gpu:NoSchedule", "spot=:PreferNoSchedule"]) == [
+        {"key": "dedicated", "value": "gpu", "effect": "NoSchedule"},
+        {"key": "spot", "value": "", "effect": "PreferNoSchedule"},
+    ]
+
+
+def test_add_pool_passes_labels_taints_and_ssh_keys(monkeypatch):
+    kube = FakeKubernetes()
+    patch_client(monkeypatch, kube)
+
+    result = runner.invoke(app, [
+        "k8s", "add-pool", "c1", "workers", "--plan", "k8s-node-2c4g", "--count", "3",
+        "--label", "role=worker", "--label", "tier=compute",
+        "--taint", "dedicated=gpu:NoExecute",
+        "--ssh-key-id", "11111111-1111-1111-1111-111111111111",
+    ])
+
+    assert result.exit_code == 0, result.output
+    (args, kwargs), = kube.calls
+    assert args == ("c1", "workers", "k8s-node-2c4g", 3)
+    assert kwargs["labels"] == {"role": "worker", "tier": "compute"}
+    assert kwargs["taints"] == [{"key": "dedicated", "value": "gpu", "effect": "NoExecute"}]
+    assert kwargs["ssh_key_ids"] == ["11111111-1111-1111-1111-111111111111"]
+
+
+def test_add_pool_defaults_to_no_labels_taints_or_keys(monkeypatch):
+    kube = FakeKubernetes()
+    patch_client(monkeypatch, kube)
+
+    result = runner.invoke(app, ["k8s", "add-pool", "c1", "workers", "--plan", "k8s-node-2c4g"])
+
+    assert result.exit_code == 0, result.output
+    (args, kwargs), = kube.calls
+    assert args == ("c1", "workers", "k8s-node-2c4g", 1)
+    assert kwargs == {"labels": {}, "taints": [], "ssh_key_ids": []}
+
+
+def test_add_pool_rejects_malformed_label_and_taint(monkeypatch):
+    patch_client(monkeypatch, FakeKubernetes())
+
+    for value in ("novalue", "=noKey"):
+        result = runner.invoke(app, ["k8s", "add-pool", "c1", "workers", "--plan", "k8s-node-2c4g", "--label", value])
+        assert result.exit_code != 0
+        assert "key=value" in result.output
+
+    for value in ("novalue", "key:NoSchedule", "key=value:Sometimes"):
+        result = runner.invoke(app, ["k8s", "add-pool", "c1", "workers", "--plan", "k8s-node-2c4g", "--taint", value])
+        assert result.exit_code != 0
+        assert "key=value:Effect" in result.output or "taint effect" in result.output
+
+
+def test_kubeconfig_output_file_is_0600_for_new_and_existing_files(monkeypatch, tmp_path):
+    patch_client(monkeypatch, FakeKubernetes())
+
+    existing = tmp_path / "kubeconfig-existing.yaml"
+    existing.write_text("stale-content")
+    os.chmod(existing, 0o644)
+
+    for target in (existing, tmp_path / "kubeconfig-new.yaml"):
+        result = runner.invoke(app, ["k8s", "kubeconfig", "c1", "-o", str(target)])
+        assert result.exit_code == 0, result.output
+        assert stat.S_IMODE(target.stat().st_mode) == 0o600
+        assert target.read_text() == "apiVersion: v1\nkind: Config\n"
+
+
+def test_maintenance_window_set_passes_all_options(monkeypatch):
+    kube = FakeKubernetes()
+    patch_client(monkeypatch, kube)
+
+    result = runner.invoke(app, ["k8s", "maintenance-window", "set", "c1",
+                                 "--timezone", "Europe/Oslo", "--day", "SAT", "--day", "SUN",
+                                 "--start", "02:00", "--duration", "120"])
+
+    assert result.exit_code == 0, result.output
+    (args, kwargs), = kube.calls
+    assert args == ("c1",)
+    assert kwargs == {"timezone": "Europe/Oslo", "days": ["SAT", "SUN"], "start": "02:00",
+                      "duration_minutes": 120, "enabled": True}
+    assert "2026-10-24T02:00:00+02:00" in result.output
+
+
+def test_maintenance_window_set_disabled_and_get(monkeypatch):
+    kube = FakeKubernetes()
+    patch_client(monkeypatch, kube)
+
+    result = runner.invoke(app, ["k8s", "maintenance-window", "set", "c1", "--timezone", "UTC",
+                                 "--day", "MON", "--start", "03:00", "--disabled"])
+    assert result.exit_code == 0, result.output
+    assert kube.calls[0][1]["enabled"] is False
+    assert kube.calls[0][1]["duration_minutes"] == 120  # default
+
+    kube.window = {"enabled": True, "timezone": "Europe/Oslo", "days": ["SAT"], "start": "02:00",
+                   "duration_minutes": 120, "next_window_start": "2026-10-24T02:00:00+02:00",
+                   "next_window_end": "2026-10-24T04:00:00+02:00"}
+    result = runner.invoke(app, ["k8s", "maintenance-window", "get", "c1"])
+    assert result.exit_code == 0, result.output
+    assert "Europe/Oslo" in result.output
+    assert "SAT" in result.output
+
+
+def test_maintenance_window_delete(monkeypatch):
+    kube = FakeKubernetes()
+    patch_client(monkeypatch, kube)
+    result = runner.invoke(app, ["k8s", "maintenance-window", "delete", "c1"])
+    assert result.exit_code == 0, result.output
+    assert "removed" in result.output.lower()
+    assert kube.calls[0][0] == ("c1",)
+
+
+def test_upgrade_mode_options_and_queued_output(monkeypatch):
+    kube = FakeKubernetes()
+    kube.upgrade_response = {"job": {"id": "j1", "target_version": "1.35", "mode": "next_maintenance_window",
+                                     "status": "queued", "execute_after": "2026-10-03T00:00:00+00:00"}}
+    patch_client(monkeypatch, kube)
+
+    result = runner.invoke(app, ["k8s", "upgrade", "c1", "1.35", "--mode", "next-maintenance-window",
+                                 "--strategy", "rolling-update", "--backup-first"])
+
+    assert result.exit_code == 0, result.output
+    (args, kwargs), = kube.calls
+    assert args == ("c1", "1.35")
+    assert kwargs == {"mode": "next_maintenance_window", "scheduled_at": None,
+                      "strategy": "rolling-update", "backup_before_upgrade": True}
+    assert "queued" in result.output
+
+
+def test_upgrade_defaults_to_rolling_after_qualification(monkeypatch):
+    kube = FakeKubernetes()
+    patch_client(monkeypatch, kube)
+
+    result = runner.invoke(app, ["k8s", "upgrade", "c1", "1.35"])
+
+    assert result.exit_code == 0, result.output
+    (args, kwargs), = kube.calls
+    assert kwargs == {"mode": "immediate", "scheduled_at": None, "strategy": "rolling-update", "backup_before_upgrade": False}
+    assert "Upgrading to 1.35" in result.output
+
+
+def test_upgrade_pool_command(monkeypatch):
+    kube = FakeKubernetes()
+    patch_client(monkeypatch, kube)
+
+    result = runner.invoke(app, ["k8s", "upgrade-pool", "c1", "default"])
+
+    assert result.exit_code == 0, result.output
+    assert kube.calls[0][0] == ("c1", "default")
+    assert "convergence started" in result.output
+
+
+def test_versions_command_shows_lifecycle(monkeypatch):
+    kube = FakeKubernetes()
+    patch_client(monkeypatch, kube)
+
+    result = runner.invoke(app, ["k8s", "versions"])
+
+    assert result.exit_code == 0, result.output
+    assert "1.34" in result.output and "transition" in result.output
+    assert "2026-10-15" in result.output
+    assert "Default for new clusters: 1.35" in result.output
+
+
+def test_upgrade_jobs_list_and_cancel(monkeypatch):
+    kube = FakeKubernetes()
+    kube.jobs = [{"id": "j1", "target_version": "1.35", "mode": "scheduled", "status": "queued",
+                  "execute_after": "2026-10-03T00:30:00+00:00", "window_end": "2026-10-03T02:00:00+00:00"}]
+    patch_client(monkeypatch, kube)
+
+    result = runner.invoke(app, ["k8s", "upgrade-jobs", "list", "c1"])
+    assert result.exit_code == 0, result.output
+    assert "queued" in result.output
+
+    result = runner.invoke(app, ["k8s", "upgrade-jobs", "cancel", "c1", "j1"])
+    assert result.exit_code == 0, result.output
+    assert "cancelled" in result.output.lower()
+    assert kube.calls[-1][0] == ("c1", "j1")
+
+
+def test_preflight_passes_options_and_reports_warnings(monkeypatch):
+    kube = FakeKubernetes()
+    kube.preflight_response = {"ok": True, "errors": [],
+                               "warnings": [{"code": "no_recent_backup", "message": "backup is old"}]}
+    patch_client(monkeypatch, kube)
+
+    result = runner.invoke(app, ["k8s", "preflight", "c1", "1.35", "--mode", "next-maintenance-window",
+                                 "--strategy", "rolling-update", "--backup-first"])
+
+    assert result.exit_code == 0, result.output
+    (args, kwargs), = kube.calls
+    assert args == ("c1", "1.35")
+    assert kwargs == {"mode": "next_maintenance_window", "scheduled_at": None,
+                      "strategy": "rolling-update", "backup_before_upgrade": True}
+    assert "WARNING  [no_recent_backup]" in result.output
+    assert "Preflight OK" in result.output
+
+
+def test_preflight_blockers_exit_nonzero(monkeypatch):
+    kube = FakeKubernetes()
+    kube.preflight_response = {"ok": False, "errors": [{"code": "node_pool_not_ready", "message": "pool not ready"}],
+                               "warnings": []}
+    patch_client(monkeypatch, kube)
+
+    result = runner.invoke(app, ["k8s", "preflight", "c1", "1.35"])
+
+    assert result.exit_code == 1, result.output
+    assert "BLOCKER  [node_pool_not_ready]" in result.output
+    assert "Preflight BLOCKED" in result.output
+
+
+def test_preflight_json_mode_prints_full_response_and_still_fails(monkeypatch):
+    import json as json_mod
+    from wayscloud_cli.output import set_json_mode
+
+    kube = FakeKubernetes()
+    kube.preflight_response = {"ok": False, "errors": [{"code": "target_not_available", "message": "nope"}],
+                               "warnings": [], "backup": {"latest_completed_at": None, "age_hours": None}}
+    patch_client(monkeypatch, kube)
+    try:
+        result = runner.invoke(app, ["--json", "k8s", "preflight", "c1", "1.35"])
+    finally:
+        set_json_mode(False)
+
+    assert result.exit_code == 1
+    parsed = json_mod.loads(result.output)
+    assert parsed["errors"][0]["code"] == "target_not_available"
+    assert parsed["backup"] == {"latest_completed_at": None, "age_hours": None}