From f65b9696d1d173373d5968f406fabd62b610c789 Mon Sep 17 00:00:00 2001 From: Brian Greunke Date: Thu, 20 Feb 2025 14:01:42 -0600 Subject: [PATCH 1/2] refactor: updated all referencs to 'crucible' for platform rebrand --- README.md | 2 +- dreadnode_cli/agent/tests/test_docker.py | 18 +++++++++--------- dreadnode_cli/defaults.py | 2 +- dreadnode_cli/tests/test_api_create_client.py | 4 ++-- dreadnode_cli/tests/test_config.py | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index b818aa0..0cd2d7d 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ dreadnode login Authenticate to a specific server: ```bash -dreadnode login --server https://dev-crucible.dreadnode.io +dreadnode login --server https://platform.dreadnode.io ``` Manage server profiles with: diff --git a/dreadnode_cli/agent/tests/test_docker.py b/dreadnode_cli/agent/tests/test_docker.py index b66a02a..8a5c9ac 100644 --- a/dreadnode_cli/agent/tests/test_docker.py +++ b/dreadnode_cli/agent/tests/test_docker.py @@ -55,7 +55,7 @@ def list(*args: t.Any, **kwargs: t.Any) -> list[MockContainer]: return MockDockerClient.containers.containers -def _create_test_server_config(url: str = "https://crucible.dreadnode.io") -> ServerConfig: +def _create_test_server_config(url: str = "https://platform.dreadnode.io") -> ServerConfig: return ServerConfig( url=url, email="test@example.com", @@ -121,11 +121,11 @@ def test_get_registry() -> None: assert docker.get_registry(config) == "registry.dreadnode.io" # Test staging registry - config = _create_test_server_config("https://staging-crucible.dreadnode.io") + config = _create_test_server_config("https://staging-platform.dreadnode.io") assert docker.get_registry(config) == "staging-registry.dreadnode.io" # Test dev registry - config = _create_test_server_config("https://dev-crucible.dreadnode.io") + config = _create_test_server_config("https://dev-platform.dreadnode.io") assert docker.get_registry(config) == "dev-registry.dreadnode.io" # Test localhost registry @@ -149,13 +149,13 @@ def test_get_local_registry_port_with_running_registry_container() -> None: def test_get_registry_without_schema() -> None: # Test without schema - config = _create_test_server_config("crucible.dreadnode.io") + config = _create_test_server_config("platform.dreadnode.io") assert docker.get_registry(config) == "registry.dreadnode.io" - config = _create_test_server_config("staging-crucible.dreadnode.io") + config = _create_test_server_config("staging-platform.dreadnode.io") assert docker.get_registry(config) == "staging-registry.dreadnode.io" - config = _create_test_server_config("dev-crucible.dreadnode.io") + config = _create_test_server_config("dev-platform.dreadnode.io") assert docker.get_registry(config) == "dev-registry.dreadnode.io" config = _create_test_server_config("localhost:8000") @@ -164,15 +164,15 @@ def test_get_registry_without_schema() -> None: def test_get_registry_custom_platform_base_domain() -> None: # Test custom platform base domain - config = _create_test_server_config("crucible.example.com") + config = _create_test_server_config("platform.example.com") with pytest.MonkeyPatch.context() as mp: mp.setattr("dreadnode_cli.agent.docker.PLATFORM_BASE_DOMAIN", "example.com") assert docker.get_registry(config) == "registry.example.com" - config = _create_test_server_config("staging-crucible.example.com") + config = _create_test_server_config("staging-platform.example.com") assert docker.get_registry(config) == "staging-registry.example.com" - config = _create_test_server_config("dev-crucible.example.com") + config = _create_test_server_config("dev-platform.example.com") assert docker.get_registry(config) == "dev-registry.example.com" diff --git a/dreadnode_cli/defaults.py b/dreadnode_cli/defaults.py index 46607cd..af5a74b 100644 --- a/dreadnode_cli/defaults.py +++ b/dreadnode_cli/defaults.py @@ -11,7 +11,7 @@ # default platform domain PLATFORM_BASE_DOMAIN = "dreadnode.io" # default server URL -PLATFORM_BASE_URL = os.getenv("DREADNODE_SERVER", f"https://crucible.{PLATFORM_BASE_DOMAIN}") +PLATFORM_BASE_URL = os.getenv("DREADNODE_SERVER", f"https://platform.{PLATFORM_BASE_DOMAIN}") # default docker registry subdomain DOCKER_REGISTRY_SUBDOMAIN = "registry" # default docker registry local port diff --git a/dreadnode_cli/tests/test_api_create_client.py b/dreadnode_cli/tests/test_api_create_client.py index 02d69ab..fec2c30 100644 --- a/dreadnode_cli/tests/test_api_create_client.py +++ b/dreadnode_cli/tests/test_api_create_client.py @@ -26,7 +26,7 @@ def _create_test_config(monkeypatch: pytest.MonkeyPatch, tmp_path: pathlib.Path, # Create test config config = UserConfig() server_config = ServerConfig( - url="https://crucible.dreadnode.io", + url="https://platform.dreadnode.io", email="test@example.com", username="test", api_key="test123", @@ -53,7 +53,7 @@ def test_create_client_with_valid_token(monkeypatch: pytest.MonkeyPatch, tmp_pat client = api.create_client() - assert client._base_url == "https://crucible.dreadnode.io" + assert client._base_url == "https://platform.dreadnode.io" assert client._client.cookies["access_token"] == token assert client._client.cookies["refresh_token"] == token diff --git a/dreadnode_cli/tests/test_config.py b/dreadnode_cli/tests/test_config.py index c90cdca..65a1711 100644 --- a/dreadnode_cli/tests/test_config.py +++ b/dreadnode_cli/tests/test_config.py @@ -11,14 +11,14 @@ def test_server_config() -> None: # Test valid server config config = ServerConfig( - url="https://crucible.dreadnode.io", + url="https://platform.dreadnode.io", email="test@example.com", username="test", api_key="test123", access_token="token123", refresh_token="refresh123", ) - assert config.url == "https://crucible.dreadnode.io" + assert config.url == "https://platform.dreadnode.io" assert config.email == "test@example.com" assert config.username == "test" assert config.api_key == "test123" @@ -42,7 +42,7 @@ def test_user_config(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None: # Test adding server config server_config = ServerConfig( - url="https://crucible.dreadnode.io", + url="https://platform.dreadnode.io", email="test@example.com", username="test", api_key="test123", From ddd7bb747c0972e3a0cd539ac257d541722e5dd1 Mon Sep 17 00:00:00 2001 From: Brian Greunke Date: Wed, 5 Mar 2025 13:07:47 -0600 Subject: [PATCH 2/2] bug: updated sha for cache action - previous version was deprecated and failing CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d72144a..1c2423b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: poetry config virtualenvs.in-project true --local - name: Cache dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: ./.venv key: venv-${{ runner.os }}-py${{ matrix.python-version }}-${{ hashFiles('poetry.lock') }}