From ee1207e2d93f2fdc07f95d234a748cc56b951c55 Mon Sep 17 00:00:00 2001 From: bohessefm Date: Wed, 18 Feb 2026 23:21:50 +0000 Subject: [PATCH] Update .forgejo/workflows/deploy.yaml --- .forgejo/workflows/deploy.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 5c8f7ef..3049754 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -65,15 +65,15 @@ jobs: kubectl delete secret backend-secrets -n gohorsejobsdev --ignore-not-found - # AJUSTE AQUI: Usando %s para evitar corrupção de caracteres e removendo decodificação dupla instável - if [ -n "${{ secrets.RSA_PRIVATE_KEY_BASE64 }}" ]; then - echo "Processing RSA_PRIVATE_KEY_BASE64 from secrets" - printf '%s' "${{ secrets.RSA_PRIVATE_KEY_BASE64 }}" > /tmp/rsa_key.base64 - base64 -d /tmp/rsa_key.base64 > /tmp/rsa_key.pem || cp /tmp/rsa_key.base64 /tmp/rsa_key.pem - elif [ -n "${{ vars.RSA_PRIVATE_KEY_BASE64 }}" ]; then - echo "Processing RSA_PRIVATE_KEY_BASE64 from vars" - printf '%s' "${{ vars.RSA_PRIVATE_KEY_BASE64 }}" > /tmp/rsa_key.base64 - base64 -d /tmp/rsa_key.base64 > /tmp/rsa_key.pem || cp /tmp/rsa_key.base64 /tmp/rsa_key.pem + # PEGA A SECRET, REMOVE ESPAÇOS E QUEBRAS DE LINHA QUE CAUSAM O ERRO UTF-8 + RAW_KEY="${{ secrets.RSA_PRIVATE_KEY_BASE64 || vars.RSA_PRIVATE_KEY_BASE64 }}" + CLEAN_KEY=$(echo "$RAW_KEY" | tr -d '[:space:]') + + if [ -n "$CLEAN_KEY" ]; then + echo "Processing RSA Key (Cleaning spaces and newlines)..." + echo "$CLEAN_KEY" > /tmp/rsa_key.base64 + # Tenta decodificar. Se falhar (já for PEM), usa o original limpo. + base64 -d /tmp/rsa_key.base64 > /tmp/rsa_key.pem 2>/dev/null || cp /tmp/rsa_key.base64 /tmp/rsa_key.pem fi if [ -f /tmp/rsa_key.pem ]; then @@ -98,6 +98,7 @@ jobs: --from-file=private_key.pem=/tmp/rsa_key.pem \ --dry-run=client -o yaml | kubectl apply -f - else + # Fallback caso a chave não exista kubectl create secret generic backend-secrets -n gohorsejobsdev \ --from-literal=MTU="${{ vars.MTU }}" \ --from-literal=DATABASE_URL="${{ vars.DATABASE_URL }}" \ @@ -116,7 +117,6 @@ jobs: --from-literal=AWS_ENDPOINT="${{ vars.AWS_ENDPOINT }}" \ --from-literal=AWS_ACCESS_KEY_ID="${{ vars.AWS_ACCESS_KEY_ID }}" \ --from-literal=AWS_SECRET_ACCESS_KEY="${{ vars.AWS_SECRET_ACCESS_KEY }}" \ - --from-literal=RSA_PRIVATE_KEY_BASE64="${{ vars.RSA_PRIVATE_KEY_BASE64 }}" \ --dry-run=client -o yaml | kubectl apply -f - fi