Bump nick-fields/retry from 2 to 3 (#330)

* Bump nick-fields/retry from 2 to 3

Bumps [nick-fields/retry](https://github.com/nick-fields/retry) from 2 to 3.
- [Release notes](https://github.com/nick-fields/retry/releases)
- [Changelog](https://github.com/nick-fields/retry/blob/master/.releaserc.js)
- [Commits](nick-fields/retry@v2...v3)

---
updated-dependencies:
- dependency-name: nick-fields/retry
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Remove gone VOs

* Improve tests

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Enol Fernandez <enol.fernandez@egi.eu>

.github/workflows/deploy.yml

@@ -130,9 +130,27 @@ jobs:
         run: |
           cd deploy
           terraform output -raw instance-id
+      - name: Re-configure providers access
+        env:
+          MYTOKEN: ${{ secrets.MYTOKEN }}
+          REFRESH_TOKEN: ${{ secrets.REFRESH_TOKEN }}
+        run: |
+          OIDC_TOKEN=$(curl -X POST "https://aai.egi.eu/auth/realms/egi/protocol/openid-connect/token" \
+                            -d "grant_type=refresh_token&refresh_token=$REFRESH_TOKEN&client_id=token-portal&scope=openid%20email%20profile%20voperson_id%20eduperson_entitlement" \
+                          | jq -r ".access_token")
+          echo "::add-mask::$OIDC_TOKEN"
+          cd deploy
+          BACKEND_SITE="$(yq -r .clouds.backend.site clouds.yaml)"
+          BACKEND_VO="$(yq -r .clouds.backend.vo clouds.yaml)"
+          BACKEND_OS_TOKEN="$(fedcloud openstack token issue --oidc-access-token "$OIDC_TOKEN" \
+                                                             --site "$BACKEND_SITE" --vo "$BACKEND_VO" -j | jq -r '.[0].Result.id')"
+          echo "::add-mask::$BACKEND_OS_TOKEN"
+          sed -i -e "s/backend_secret/$BACKEND_OS_TOKEN/" clouds.yaml
+          mkdir -p ~/.config/openstack
+          touch ~/.config/openstack/secure.yaml
       - name: Get the status file from swift
         if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 10
           max_attempts: 20

.github/workflows/validate.yaml

@@ -27,13 +27,3 @@ jobs:
       - name: Validate GOC and VOs
         run: |
           ./validate.sh
-      - name: Check all VOs are in the deployment dir
-        run: |
-          for f in sites/*.yaml; do
-            for vo in $(yq -r ".vos[].name" < "$f"); do
-              # remove FQAN stuff
-              # shellcheck disable=SC2001
-              vo=$(echo "$vo" | sed 's#/\([^/]*\)/.*#\1#')
-              grep "$vo" deploy/vos.yaml > /dev/null || (echo "VO $vo not configured" ; exit 1)
-            done
-          done

deploy/vos.yaml

@@ -3,8 +3,6 @@ vos:
   # Co-manage service account
   EOServices-vo.indra.es:
     auth: "{{ fedcloud_sa }}"
-  benchmark.terradue.com:
-    auth: "{{ fedcloud_sa }}"
   biinsight.eosc-hub.eu:
     auth: "{{ fedcloud_sa }}"
   cesga.es:

sites/CESGA-CLOUD.yaml

@@ -17,9 +17,6 @@ vos:
 - name: bioisi
   auth:
     project_id: 458f3225272243d7b1c0551d3af3f130
-- name: benchmark.terradue.com
-  auth:
-    project_id: 5fe3458a96084df893200e92bdb33213
 - name: vo.plocan.eu
   auth:
     project_id: 2ce3f160cdd64d46b02f3b1f856ed8ec

sites/CESGA.yaml

@@ -2,9 +2,6 @@
 gocdb: CESGA
 endpoint: https://fedcloud-osservices.egi.cesga.es:5000/v3
 vos:
-- name: benchmark.terradue.com
-  auth:
-    project_id: c948a24f5e564668af0e9a106e38a944
 - name: blazarmonitoring.asi.it
   auth:
     project_id: 835c2dd1be6f4e319dfce60b34c1b1c3

sites/CESNET-MCC.yaml

@@ -69,9 +69,6 @@ vos:
 - name: vo.indigo-datacloud.eu
   auth:
     project_id: 25cb49baedbf40a194729ff6802c8491
-- name: vo.max-centre.eu
-  auth:
-    project_id: 50fc58ed66a14106b40b9c6d7d9af86c
 - name: vo.nextgeoss.eu
   auth:
     project_id: 081396a827c94f3da0c922cf6d8fb7f7

sites/CLOUDIFIN.yaml

@@ -2,9 +2,6 @@
 gocdb: CLOUDIFIN
 endpoint: https://cloud-ctrl.nipne.ro:443/v3
 vos:
-- name: benchmark.terradue.com
-  auth:
-    project_id: c9aedbfbf1154d3b9a0db9b0d63f7d85
 - name: dteam
   auth:
     project_id: f726c16f3e2346bf891021c89b4dc58d

sites/IN2P3-IRES.yaml

@@ -5,9 +5,6 @@ vos:
 - name: belle
   auth:
     project_id: e5258170eee8429da316e6a710f6d185
-- name: benchmark.terradue.com
-  auth:
-    project_id: d579ada647314c91989daa63399fe2fa
 - name: bioisi
   auth:
     project_id: bf15d4331f3d4c3997e17c0740930e8c
@@ -55,4 +52,4 @@ vos:
     project_id: 96709738ce5a4439a0e14a77db9d3882
 - name: vo.pithia.eu
   auth:
-    project_id: 7408db293bcd473a98e44924263f1190
+    project_id: 7408db293bcd473a98e44924263f1190

vo-mappings.yaml

@@ -3,7 +3,6 @@ vos:
   EOServices-vo.indra.es: "urn:mace:egi.eu:group:EOServices-vo.indra.es:role=vm_operator#aai.egi.eu"
   aquamonitor.c-scale.eu: "urn:mace:egi.eu:group:aquamonitor.c-scale.eu:role=member#aai.egi.eu"
   belle: "urn:mace:egi.eu:group:belle:role=vm_operator#aai.egi.eu"
-  benchmark.terradue.com: "urn:mace:egi.eu:group:benchmark.terradue.com:role=vm_operator#aai.egi.eu"
   bioisi: "urn:mace:egi.eu:group:bioisi:role=vm_operator#aai.egi.eu"
   biomed: "urn:mace:egi.eu:group:biomed:role=vm_operator#aai.egi.eu"
   /biomed/vip: "urn:mace:egi.eu:group:biomed:role=vm_operator#aai.egi.eu"
@@ -78,7 +77,6 @@ vos:
   vo.lifewatch.eu: "urn:mace:egi.eu:group:vo.lifewatch.eu:role=vm_operator#aai.egi.eu"
   /vo.lifewatch.eu/openbiomap: "urn:mace:egi.eu:group:vo.lifewatch.eu:role=vm_operator#aai.egi.eu"
   vo.matrycs.eu: "urn:mace:egi.eu:group:vo.matrycs.eu:role=vm_operator#aai.egi.eu"
-  vo.max-centre.eu: "urn:mace:egi.eu:group:vo.max-centre.eu:role=vm_operator#aai.egi.eu"
   vo.mightee.idia.za: "urn:mace:egi.eu:group:vo.mightee.idia.za:role=vm_operator#aai.egi.eu"
   vo.nbis.se: "urn:mace:egi.eu:group:vo.nbis.se:role=vm_operator#aai.egi.eu"
   vo.nextgeoss.eu: "urn:mace:egi.eu:group:vo.nextgeoss.eu:role=vm_operator#aai.egi.eu"