From 8be2f97100ab02064ea43cf78c25322e6b120f2c Mon Sep 17 00:00:00 2001 From: Auri Munoz Date: Fri, 8 Sep 2023 15:15:43 +0200 Subject: [PATCH] refactor --- .github/workflows/e2e-atomic-fruits-vault.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e-atomic-fruits-vault.yml b/.github/workflows/e2e-atomic-fruits-vault.yml index 863cab4f..7f695d30 100644 --- a/.github/workflows/e2e-atomic-fruits-vault.yml +++ b/.github/workflows/e2e-atomic-fruits-vault.yml @@ -72,7 +72,7 @@ jobs: ./scripts/primaza.sh localdeploy ./scripts/primaza.sh isAlive - - name: Load the data such as cluster, services, claim & credential + - name: Load the data such as cluster, services & credential env: PRIMAZA_URL: primaza.127.0.0.1.nip.io PRIMAZA_NAMESPACE: primaza @@ -86,7 +86,7 @@ jobs: ./scripts/data/credentials.sh url=$PRIMAZA_URL credential_name=fruits_database-vault-creds service_name=postgresql vault_kv=primaza/fruits - ./scripts/data/claims.sh url=$PRIMAZA_URL claim_name=fruits-claim description=postgresql-fruits-db requested_service=postgresql-14.5 +# ./scripts/data/claims.sh url=$PRIMAZA_URL claim_name=fruits-claim description=postgresql-fruits-db requested_service=postgresql-14.5 - name: Installing Vault run: | ./scripts/vault.sh @@ -136,6 +136,10 @@ jobs: note "Attempt $retry_attempt of $max_retries" if discover_atomic_fruits; then note "Primaza discovered the atomic-fruits application: $APPLICATION." + note "Getting the application id for atomic-fruits" + APPLICATION_ID=$(echo "$APPLICATION" | jq -r '.id') + echo "atomic-fruits application id: $APPLICATION_ID" + ./scripts/data/claims.sh url=$PRIMAZA_URL claim_name=fruits-claim description=postgresql-fruits-db requested_service=postgresql-14.5 application_id=$APPLICATION_ID exit 0 else warn "Primaza didn't yet discovered the atomic-fruits application: $APPLICATION." @@ -143,11 +147,6 @@ jobs: fi done - note "Getting the application id for atomic-fruits" - APPLICATION_ID=$(echo "$APPLICATION" | jq -r '.id') - echo "atomic-fruits application id: $APPLICATION_ID" - ./scripts/data/claims.sh url=$PRIMAZA_URL claim_name=fruits-claim description=postgresql-fruits-db requested_service=postgresql-14.5 application_id=$APPLICATION_ID - - name: Bind application env: PRIMAZA_URL: primaza.127.0.0.1.nip.io