Merge pull request #325 from cipherstash/go-integration-remove-orchestration

refactor(tests): remove orchestration from go integration tests

Author: tobyhede

.github/actions/setup-test/action.yml

@@ -14,9 +14,11 @@ runs:
     - name: Setup Rust cache
       uses: Swatinem/rust-cache@v2
       with:
-        cache-provider: ${{ inputs.provider }}
-        shared-key: ${{ inputs.key }}
         cache-all-crates: true
+    - name: Set up Docker Compose
+      uses: docker/setup-compose-action@v1
+      with:
+        version: latest
     - uses: jdx/mise-action@v2
       with:
         version: 2025.1.0 # [default: latest] mise version to install

mise.toml

@@ -28,7 +28,9 @@ CS_DATABASE__PORT = "5532"
 # CS_DATABASE__PORT = "5617"
 
 # Default configuration for dev cipherstash-proxy run using 'mise run proxy:up'
-CS_PROXY__HOST = "proxy"
+# CS_PROXY__HOST = "proxy"
+CS_PROXY__HOST = "host.docker.internal"
+
 # Misc
 DOCKER_CLI_HINTS = "false" # Please don't show us What's Next.
 
@@ -387,7 +389,14 @@ echo '###############################################'
 echo '# Test: Language-specific integration'
 echo '###############################################'
 echo
+
+mise --env tls run postgres:up --extra-args "--detach --wait"
+mise --env tls run postgres:setup
+mise --env tls run proxy:down proxy-tls
+mise --env tls run proxy:up --extra-args "--detach --wait"
+
 mise run test:integration:lang:golang
+
 mise run test:integration:lang:python
 
 # Commented out pending fix of the root cause of the test flake

tests/docker-compose.yml

@@ -71,6 +71,8 @@ services:
       - CS_LOG__CONTEXT_LEVEL=${CS_LOG__CONTEXT_LEVEL:-debug}
     networks:
       - postgres
+    extra_hosts:
+      - host.docker.internal:host-gateway
     deploy:
       resources:
         limits:
@@ -114,6 +116,8 @@ services:
       - ./tls/server.key:/etc/cipherstash-proxy/server.key
     networks:
       - postgres
+    extra_hosts:
+      - host.docker.internal:host-gateway
 
   python:
     image: test/python

tests/tasks/test/integration/lang/golang.sh

@@ -5,16 +5,13 @@
 
 set -e
 
-mise --env tls run postgres:up --extra-args "--detach --wait"
-mise --env tls run postgres:setup
-mise --env tls run proxy:down proxy-tls
-mise --env tls run proxy:up --extra-args "--detach --wait"
 
 source "$(dirname "${BASH_SOURCE[0]}")/../url_encode.sh"
 
 encoded_password=$(urlencode "${CS_DATABASE__PASSWORD}")
 
 connection_url=postgresql://${CS_DATABASE__USERNAME}:${encoded_password}@proxy:6432/${CS_DATABASE__NAME}
+
 network_id=$(docker network ls --filter name=tests_postgres --quiet)
 platform="linux/$(uname -m | sed 's/x86_64/amd64/')"