cloudx-proxy 0.17.4__tar.gz → 0.17.6__tar.gz

{cloudx_proxy-0.17.4 → cloudx_proxy-0.17.6}/.github/workflows/claude.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: Run Claude Code
         id: claude
-        uses: anthropics/claude-code-action@v1.0.210
+        uses: anthropics/claude-code-action@v1.0.217
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           

{cloudx_proxy-0.17.4 → cloudx_proxy-0.17.6}/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [0.17.6](https://github.com/easytocloud/cloudX-proxy/compare/v0.17.5...v0.17.6) (2026-09-16)
+
+
+### Bug Fixes
+
+* resolve hostname/environment from plain Name tag, not just legacy prefix ([8f157a5](https://github.com/easytocloud/cloudX-proxy/commit/8f157a587a24c1cbb587162fc4e11ed8945b0715))
+* use warning styling, not the failure symbol, for env tag conflicts ([7866ddc](https://github.com/easytocloud/cloudX-proxy/commit/7866ddcd35248d1124c66491f5d8ce7b6b489ba3))
+
+## [0.17.5](https://github.com/easytocloud/cloudX-proxy/compare/v0.17.4...v0.17.5) (2026-09-10)
+
 ## [0.17.4](https://github.com/easytocloud/cloudX-proxy/compare/v0.17.3...v0.17.4) (2026-09-06)
 
 

{cloudx_proxy-0.17.4 → cloudx_proxy-0.17.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudx-proxy
-Version: 0.17.4
+Version: 0.17.6
 Summary: SSH proxy command to connect VSCode with cloudX instance using AWS Systems Manager
 Author-email: easytocloud <info@easytocloud.com>
 License: MIT License

{cloudx_proxy-0.17.4 → cloudx_proxy-0.17.6}/cloudx_proxy/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.17.4'
-__version_tuple__ = version_tuple = (0, 17, 4)
+__version__ = version = '0.17.6'
+__version_tuple__ = version_tuple = (0, 17, 6)
 
 __commit_id__ = commit_id = None

{cloudx_proxy-0.17.4 → cloudx_proxy-0.17.6}/cloudx_proxy/setup.py

@@ -135,8 +135,12 @@ class CloudXSetup:
         """Fetch instance tags and extract environment and hostname.
 
         Queries EC2 for the instance tags and extracts:
-        - Environment by priority: {env} from Name tag > cloudX:environment tag > Environment tag
-        - Hostname from the 'Name' tag (expects format: cloudX-{env}-{hostname} | {username})
+        - Hostname from the 'Name' tag: legacy cloudX-{env}-{hostname} (optionally
+          " | {username}") format if present, otherwise Name is used as-is (current
+          cloudX-instance.yaml sets Name to the plain hostname with no prefix).
+        - Environment from the cloudX:environment/cloudx:environment/Environment tag,
+          preferred over {env} parsed from a legacy Name tag. A mismatch between the
+          two is logged as a warning; the tag always wins.
 
         Args:
             instance_id: The EC2 instance ID
@@ -173,8 +177,12 @@ class CloudXSetup:
             instance = response['Reservations'][0]['Instances'][0]
             tags = {tag['Key']: tag['Value'] for tag in instance.get('Tags', [])}
 
-            # Extract hostname and env from Name tag
-            # Format: cloudX-{env}-{hostname} | {username}
+            # Hostname comes from the Name tag. Older cloudX-instance.yaml versions
+            # prefixed it as cloudX-{env}-{hostname} (optionally " | {username}");
+            # current versions set Name to the plain hostname with no prefix. Try the
+            # legacy pattern first for backward compatibility, and fall back to using
+            # Name as-is - either way we get a hostname straight from the tag, so this
+            # is never itself a reason to flag anything.
             hostname = None
             env_from_name = None
             name_tag = tags.get('Name', '')
@@ -184,20 +192,30 @@ class CloudXSetup:
                 if match:
                     env_from_name = match.group(1)
                     hostname = match.group(2)
-                    self.print_status(f"Found hostname from Name tag: {hostname}", True, 2)
                 else:
-                    self.print_status(f"Name tag '{name_tag}' does not match cloudX-{{env}}-{{hostname}} format", None, 2)
-
-            # Determine environment by priority:
-            # 1. {env} from Name tag
-            # 2. cloudX:environment or cloudx:environment tag
-            # 3. Environment tag
-            environment = (
-                env_from_name
-                or tags.get('cloudX:environment')
+                    hostname = ssh_hostname
+                if hostname:
+                    self.print_status(f"Found hostname from Name tag: {hostname}", True, 2)
+
+            # Environment: prefer the explicit tag over one parsed from a legacy Name
+            # tag, since the tag is the current, authoritative source. Only speak up
+            # if the two genuinely disagree - that's a real inconsistency worth a
+            # human's attention, not the routine case.
+            env_from_tag = (
+                tags.get('cloudX:environment')
                 or tags.get('cloudx:environment')
                 or tags.get('Environment')
             )
+            if env_from_name and env_from_tag and env_from_name != env_from_tag:
+                self.print_status(
+                    warning(
+                        f"Name tag implies environment '{env_from_name}' but the environment tag says "
+                        f"'{env_from_tag}' - using '{env_from_tag}'"
+                    ),
+                    None, 2
+                )
+
+            environment = env_from_tag or env_from_name
             if environment:
                 self.print_status(f"Found environment: {environment}", True, 2)
 

{cloudx_proxy-0.17.4 → cloudx_proxy-0.17.6}/cloudx_proxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudx-proxy
-Version: 0.17.4
+Version: 0.17.6
 Summary: SSH proxy command to connect VSCode with cloudX instance using AWS Systems Manager
 Author-email: easytocloud <info@easytocloud.com>
 License: MIT License

{cloudx_proxy-0.17.4 → cloudx_proxy-0.17.6}/cloudx_proxy.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ tests/test_backward_compat.py
 tests/test_cli_options.py
 tests/test_config_safety.py
 tests/test_core.py
+tests/test_instance_tags.py
 tests/test_non_interactive.py
 tests/test_runtime_safety.py
 tests/test_setup.py

cloudx_proxy-0.17.6/tests/test_instance_tags.py

@@ -0,0 +1,126 @@
+"""get_instance_tags() hostname/environment resolution.
+
+Older cloudX-instance.yaml versions set the Name tag to
+cloudX-{env}-{hostname} (optionally " | {username}"); current versions set
+Name to the plain hostname with no prefix. Both must resolve a hostname
+without complaint - the absence of the legacy prefix is not itself a
+problem. Environment must prefer the explicit cloudX:environment tag over
+one parsed out of a legacy Name tag, and only speak up when the two
+sources actively disagree.
+"""
+
+import pytest
+
+from cloudx_proxy.setup import CloudXSetup
+
+
+class FakeEC2Client:
+    def __init__(self, tags):
+        self._tags = tags
+
+    def describe_instances(self, InstanceIds):
+        return {
+            "Reservations": [
+                {"Instances": [{"Tags": [{"Key": k, "Value": v} for k, v in self._tags.items()]}]}
+            ]
+        }
+
+
+class FakeSession:
+    def __init__(self, tags):
+        self._tags = tags
+
+    def client(self, service_name):
+        assert service_name == "ec2"
+        return FakeEC2Client(self._tags)
+
+
+@pytest.fixture
+def setup(tmp_path):
+    return CloudXSetup(ssh_config=str(tmp_path / "config"))
+
+
+def get_tags(setup, monkeypatch, tags):
+    monkeypatch.setattr(
+        "cloudx_proxy.setup.boto3.Session", lambda *a, **k: FakeSession(tags)
+    )
+    return setup.get_instance_tags("i-0123456789abcdef0")
+
+
+class TestPlainNameTag:
+    """Current cloudX-instance.yaml: Name is the bare hostname, no prefix."""
+
+    def test_hostname_from_plain_name_no_warning(self, setup, monkeypatch, capsys):
+        environment, hostname = get_tags(
+            setup, monkeypatch, {"Name": "erix", "cloudX:environment": "DTA"}
+        )
+
+        assert (environment, hostname) == ("DTA", "erix")
+        out = capsys.readouterr().out
+        assert "does not match" not in out
+        assert "✗" not in out
+
+    def test_hyphenated_plain_hostname_is_kept_whole(self, setup, monkeypatch):
+        environment, hostname = get_tags(
+            setup, monkeypatch, {"Name": "my-dev-box", "cloudX:environment": "OTA"}
+        )
+
+        assert (environment, hostname) == ("OTA", "my-dev-box")
+
+
+class TestLegacyNameTag:
+    """Older cloudX-instance.yaml: Name is cloudX-{env}-{hostname}."""
+
+    def test_env_and_hostname_parsed_when_tag_absent(self, setup, monkeypatch):
+        environment, hostname = get_tags(setup, monkeypatch, {"Name": "cloudX-OTA-web1"})
+
+        assert (environment, hostname) == ("OTA", "web1")
+
+    def test_username_suffix_is_stripped(self, setup, monkeypatch):
+        environment, hostname = get_tags(
+            setup, monkeypatch, {"Name": "cloudX-OTA-web1 | erik"}
+        )
+
+        assert (environment, hostname) == ("OTA", "web1")
+
+
+class TestEnvironmentPrecedence:
+    def test_tag_wins_and_conflict_is_flagged(self, setup, monkeypatch, capsys):
+        environment, hostname = get_tags(
+            setup, monkeypatch, {"Name": "cloudX-FOO-erik", "cloudX:environment": "BAR"}
+        )
+
+        assert environment == "BAR"
+        assert hostname == "erik"
+        out = capsys.readouterr().out
+        assert "FOO" in out and "BAR" in out
+        assert "✗" not in out, "a resolved conflict is a warning, not a failure"
+
+    def test_agreement_is_not_flagged(self, setup, monkeypatch, capsys):
+        environment, hostname = get_tags(
+            setup, monkeypatch, {"Name": "cloudX-OTA-erik", "cloudX:environment": "OTA"}
+        )
+
+        assert (environment, hostname) == ("OTA", "erik")
+        assert "✗" not in capsys.readouterr().out
+
+    def test_environment_tag_alone_is_sufficient(self, setup, monkeypatch):
+        environment, hostname = get_tags(
+            setup, monkeypatch, {"Name": "erix", "cloudx:environment": "dta"}
+        )
+
+        assert (environment, hostname) == ("dta", "erix")
+
+    def test_generic_environment_tag_is_last_resort(self, setup, monkeypatch):
+        environment, hostname = get_tags(
+            setup, monkeypatch, {"Name": "erix", "Environment": "legacy"}
+        )
+
+        assert (environment, hostname) == ("legacy", "erix")
+
+
+class TestNothingToGoOn:
+    def test_no_name_and_no_environment_tag(self, setup, monkeypatch):
+        environment, hostname = get_tags(setup, monkeypatch, {})
+
+        assert (environment, hostname) == (None, None)