Debug CI

.github/workflows/test.yml

@@ -12,17 +12,6 @@ defaults:
   run:
     shell: bash
 jobs:
-  unit-test:
-    runs-on: ubuntu-20.04
-    name: "unit tests"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Unit Tests
-        working-directory: install
-        run: find ./ -type f -name "*-test.sh" -exec "./{}" \;
-
   integration-test:
     runs-on: ubuntu-20.04
     name: "integration test"
@@ -34,6 +23,8 @@ jobs:
             compose_path: '/usr/local/bin'
           - compose_version: 'v2.0.1'
             compose_path: '/usr/local/lib/docker/cli-plugins'
+          - compose_version: 'v2.2.3'
+            compose_path: '/usr/local/lib/docker/cli-plugins'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -48,16 +39,12 @@ jobs:
           sudo curl -L https://github.com/docker/compose/releases/download/${{ matrix.compose_version }}/docker-compose-`uname -s`-`uname -m` -o "${{ matrix.compose_path }}/docker-compose"
           sudo chmod +x "${{ matrix.compose_path }}/docker-compose"
 
-      - name: Integration Test
+      - name: Hack Test
         run: |
-          echo "Testing initial install"
-          ./install.sh
-          ./_integration-test/run.sh
-          echo "Testing in-place upgrade"
-          # Also test plugin installation here
-          echo "sentry-auth-oidc" >> sentry/requirements.txt
-          ./install.sh --minimize-downtime
-          ./_integration-test/run.sh
+          pwd
+          ls -FGl
+          ls -FGl relay
+          ./test-relay
 
       - name: Inspect failure
         if: failure()

_integration-test/run.sh

@@ -95,7 +95,7 @@ PROJECT_ID=${DSN_PIECES[1]}
 TEST_EVENT_ID=$(export LC_ALL=C; head /dev/urandom | tr -dc "a-f0-9" | head -c 32)
 # Thanks @untitaker - https://forum.sentry.io/t/how-can-i-post-with-curl-a-sentry-event-which-authentication-credentials/4759/2?u=byk
 echo "Creating test event..."
-curl -sf --data '{"event_id": "'"$TEST_EVENT_ID"'","level":"error","message":"a failure","extra":{"object":"42"}}' -H 'Content-Type: application/json' -H "X-Sentry-Auth: Sentry sentry_version=7, sentry_key=$SENTRY_KEY, sentry_client=test-bash/0.1" "$SENTRY_TEST_HOST/api/$PROJECT_ID/store/" -o /dev/null
+curl -f --data '{"event_id": "'"$TEST_EVENT_ID"'","level":"error","message":"a failure","extra":{"object":"42"}}' -H 'Content-Type: application/json' -H "X-Sentry-Auth: Sentry sentry_version=7, sentry_key=$SENTRY_KEY, sentry_client=test-bash/0.1" "$SENTRY_TEST_HOST/api/$PROJECT_ID/store/" -o out && cat out || cat out
 
 EVENT_PATH="projects/sentry/internal/events/$TEST_EVENT_ID/"
 export -f sentry_api_request get_csrf_token

install.sh

@@ -19,6 +19,11 @@ source check-minimum-requirements.sh
 # Let's go! Start impacting things.
 source turn-things-off.sh
 source create-docker-volumes.sh
+
+# Test thing
+source relay-credentials.sh
+exit
+
 source ensure-files-from-examples.sh
 source generate-secret-key.sh
 source replace-tsdb.sh

install/relay-credentials.sh

@@ -2,24 +2,25 @@ echo "${_group}Generating Relay credentials ..."
 
 RELAY_CONFIG_YML="../relay/config.yml"
 RELAY_CREDENTIALS_JSON="../relay/credentials.json"
+RELAY_CREDENTIALS_JSON_TMP="/tmp/credentials.json"
 
 ensure_file_from_example $RELAY_CONFIG_YML
 
-if [[ ! -f "$RELAY_CREDENTIALS_JSON" ]]; then
+if [[ -f "$RELAY_CREDENTIALS_JSON" ]]; then
+  echo "$RELAY_CREDENTIALS_JSON already exists, skipped creation."
+else
 
-  # We need the ugly hack below as `relay generate credentials` tries to read
-  # the config and the credentials even with the `--stdout` and `--overwrite`
-  # flags and then errors out when the credentials file exists but not valid
-  # JSON. We hit this case as we redirect output to the same config folder,
-  # creating an empty credentials file before relay runs.
-
-  $dcr \
-    --no-deps \
-    --volume "$(pwd)/$RELAY_CONFIG_YML:/tmp/config.yml" \
-    relay --config /tmp credentials generate --stdout \
-    > "$RELAY_CREDENTIALS_JSON"
-
-  echo "Relay credentials written to $RELAY_CREDENTIALS_JSON"
+  ls -FGl ../relay
+  $dcr --no-deps relay credentials generate
+  ls -FGl ../relay
+  cat ../relay/credentials.json
+  $dcr relay credentials show 
+  if [[ -f "$RELAY_CREDENTIALS_JSON" ]]; then
+    echo "Relay credentials written to $RELAY_CREDENTIALS_JSON."
+  else
+    echo "Failed to write relay credentials to $RELAY_CREDENTIALS_JSON."
+    exit 2
+  fi
 fi
 
 echo "${_endgroup}"

reset.sh

@@ -11,6 +11,8 @@ fi
 
 cd "$(dirname $0)"
 
+_group=""
+_endgroup=""
 source install/dc-detect-version.sh
 
 function confirm () {
@@ -60,4 +62,4 @@ if [ -n "$version" ]; then
 fi
 
 # Install.
-./install.sh
+#./install.sh

test-relay

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+dc_base="$(docker compose version &> /dev/null && echo 'docker compose' || echo 'docker-compose')"
+if [[ "$(basename $0)" = "install.sh"  ]]; then
+  dc="$dc_base --ansi never --env-file ${_ENV}"
+else
+  dc="$dc_base --ansi never"
+fi
+dcr="$dc run --rm"
+
+$dc version
+
+$dc down --rmi local --remove-orphans
+docker volume create --name=sentry-clickhouse
+docker volume create --name=sentry-data
+docker volume create --name=sentry-kafka
+docker volume create --name=sentry-postgres
+docker volume create --name=sentry-redis
+docker volume create --name=sentry-symbolicator
+docker volume create --name=sentry-zookeeper
+
+cd relay
+cp config.example.yml config.yml
+rm credentials.json
+cd ..
+
+echo 'list images -----------------------------'
+docker image list --all | grep relay
+echo 'generate --------------------------------'
+creds="$dcr --no-deps relay credentials"
+ls -FGl relay
+$creds generate --stdout 2> stderr > credentials.json.tmp
+echo 'list images again -----------------------'
+docker image list --all | grep relay
+echo 'stderr ----------------------------------'
+cat stderr
+echo 'ls relay --------------------------------'
+ls -FGl relay
+echo 'creds show ------------------------------'
+$creds show
+echo 'moving ----------------------------------'
+mv credentials.json.tmp relay/credentials.json
+ls -FGl relay
+echo 'relay/credentials.json ------------------'
+cat relay/credentials.json
+echo '========================================='
+$creds show