From c9131536b51bbcba1d32cbad7c05a9bd329cbd9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enol=20Fern=C3=A1ndez?= <enol.fernandez@egi.eu>
Date: Wed, 29 May 2024 11:19:28 +0100
Subject: [PATCH] Add the type of provider (#342)

* Add the type of provider

Otherwise rclone will fail

* Fix the user id

* Remove old VOs
---
 cloud-info/ams-wrapper.sh | 2 ++
 deploy/deploy.sh          | 4 ++--
 sites/CESGA.yaml          | 3 ---
 sites/CESNET-MCC.yaml     | 3 ---
 vo-mappings.yaml          | 2 --
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/cloud-info/ams-wrapper.sh b/cloud-info/ams-wrapper.sh
index c2f05714..c217e1d9 100755
--- a/cloud-info/ams-wrapper.sh
+++ b/cloud-info/ams-wrapper.sh
@@ -110,6 +110,8 @@ if [ -f site.json ]; then
 	export RCLONE_CONFIG_S3_ENDPOINT
 	S3_BUCKET_NAME="$(yq -r '.s3.bucket' <"$CHECKIN_SECRETS_FILE")"
 	export S3_BUCKET_NAME
+	RCLONE_CONFIG_S3_PROVIDER="$(yq -r '.s3.provider' <"$CHECKIN_SECRETS_FILE")"
+	export RCLONE_CONFIG_S3_PROVIDER
 	export RCLONE_CONFIG_S3_ACL=private
 	export RCLONE_CONFIG_S3_NO_CHECK_BUCKET=true
 	rclone copy site.json "s3:$S3_BUCKET_NAME/$SITE_NAME"
diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index b283ad06..252235fb 100755
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -31,8 +31,8 @@ fi
 # copy the secrets to the /etc/egi/vos dir which is readable from the containers
 cp secrets.yaml /etc/egi/vos/secrets.yaml
 
-# make sure the container user (999) can access the files
-chown -R 999:999 /etc/egi/
+# make sure the container user (1999) can access the files
+chown -R 1999:1999 /etc/egi/
 
 GITHUB_COMMIT_URL="https://api.github.com/repos/EGI-Federation/fedcloud-catchall-operations/commits/$COMMIT_SHA/pulls"
 
diff --git a/sites/CESGA.yaml b/sites/CESGA.yaml
index 13c294ad..404e2a2a 100644
--- a/sites/CESGA.yaml
+++ b/sites/CESGA.yaml
@@ -2,9 +2,6 @@
 gocdb: CESGA
 endpoint: https://fedcloud-osservices.egi.cesga.es:5000/v3
 vos:
-- name: blazarmonitoring.asi.it
-  auth:
-    project_id: 835c2dd1be6f4e319dfce60b34c1b1c3
 - name: covid19.eosc-synergy.eu
   auth:
     project_id: 972298c557184a2192ebc861f3184da8
diff --git a/sites/CESNET-MCC.yaml b/sites/CESNET-MCC.yaml
index 629b960c..42810c89 100644
--- a/sites/CESNET-MCC.yaml
+++ b/sites/CESNET-MCC.yaml
@@ -5,9 +5,6 @@ vos:
 - name: biomed
   auth:
     project_id: eca73ad6a84d4c0088063505c36349ab
-- name: chipster.csc.fi
-  auth:
-    project_id: 2ce965f162c9434cb21ac25f3b05bd9f
 - name: covid19.eosc-synergy.eu
   auth:
     project_id: 192e87f713474117a2a22704ac4da1a2
diff --git a/vo-mappings.yaml b/vo-mappings.yaml
index 19c311ee..8f702d69 100644
--- a/vo-mappings.yaml
+++ b/vo-mappings.yaml
@@ -6,10 +6,8 @@ vos:
   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"
-  blazarmonitoring.asi.it: "urn:mace:egi.eu:group:blazarmonitoring.asi.it:role=vm_operator#aai.egi.eu"
   cesga: "urn:mace:egi.eu:group:cesga:role=vm_operator#aai.egi.eu"
   cesga.es: "urn:mace:egi.eu:group:cesga.es:role=vm_operator#aai.egi.eu"
-  chipster.csc.fi: "urn:mace:egi.eu:group:chipster.csc.fi:role=vm_operator#aai.egi.eu"
   cloud.egi.eu: "urn:mace:egi.eu:group:cloud.egi.eu:role=vm_operator#aai.egi.eu"
   cms: "urn:mace:egi.eu:group:cms:role=vm_operator#aai.egi.eu"
   covid19.eosc-synergy.eu: "urn:mace:egi.eu:group:covid19.eosc-synergy.eu:role=vm_operator#aai.egi.eu"