@hed-hog/cli 0.0.63 → 0.0.65

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hed-hog/cli",
-    "version": "0.0.63",
+    "version": "0.0.65",
     "description": "HedHog CLI tool",
     "author": "HedHog",
     "private": false,

package/dist/src/templates/deployment/workflow.deploy.yml.ejs

@@ -131,7 +131,7 @@ jobs:
           # Check DATABASE_URL
           if [ -z "$DATABASE_URL" ]; then
             echo "::error::GitHub secret DATABASE_URL is not set. Configure it in Settings > Secrets and variables > Actions."
-            echo "::error::Expected format: postgresql://postgres:<password>@postgresql-hub:5432/hub"
+              echo "::error::Expected format: postgresql://postgres:<password>@postgresql-<%= config.appName %>:5432/<%= config.appName %>"
             MISSING_SECRETS="$MISSING_SECRETS DATABASE_URL"
           fi
           
@@ -235,10 +235,10 @@ jobs:
           sleep 5
           
           # Get the newest pod
-          POD_NAME=$(kubectl get pods -l app=hub-api -n ${{ env.NAMESPACE }} --sort-by=.metadata.creationTimestamp -o name | tail -n 1 | cut -d/ -f2)
+          POD_NAME=$(kubectl get pods -l app=<%= config.appName %>-api -n ${{ env.NAMESPACE }} --sort-by=.metadata.creationTimestamp -o name | tail -n 1 | cut -d/ -f2)
           
           if [ -z "$POD_NAME" ]; then
-            echo "::error::No hub-api pod found in namespace ${{ env.NAMESPACE }}"
+            echo "::error::No <%= config.appName %>-api pod found in namespace ${{ env.NAMESPACE }}"
             exit 1
           fi
           
@@ -252,9 +252,10 @@ jobs:
           
           for ENV_VAR in "${REQUIRED_ENVS[@]}"; do
             # Check if env var is set and not empty in the container
-            ENV_VALUE=$(kubectl exec "$POD_NAME" -n ${{ env.NAMESPACE }} -- sh -c "echo \${ENV_VAR}" 2>/dev/null || echo "")
+            # Use 'printenv' to safely retrieve the environment variable value
+            ENV_VALUE=$(kubectl exec "$POD_NAME" -n ${{ env.NAMESPACE }} -- printenv "$ENV_VAR" 2>/dev/null || echo "")
             
-            if [ -z "$ENV_VALUE" ] || [ "$ENV_VALUE" = "\${ENV_VAR}" ]; then
+            if [ -z "$ENV_VALUE" ]; then
               echo "✗ FAIL: $ENV_VAR is not set or empty in the container"
               VERIFICATION_FAILED=1
             else
@@ -273,6 +274,51 @@ jobs:
           fi
           
           echo "✓ All environment variables verified successfully in the container"
+      - name: Cleanup old registry manifests (API)
+        run: |
+          set -eu
+          REGISTRY_NAME="${REGISTRY##*/}"
+          
+          cleanup_repository() {
+            REPOSITORY="$1"
+            
+            echo "Inspecting repository ${REPOSITORY} in registry ${REGISTRY_NAME}"
+            
+            TAG_ROWS="$(doctl registry repository list-tags "${REPOSITORY}" --registry "${REGISTRY_NAME}" --format Tag,ManifestDigest --no-header || true)"
+            
+            if [ -z "${TAG_ROWS}" ]; then
+              echo "No tags found for ${REPOSITORY}; skipping cleanup."
+              return 0
+            fi
+            
+            CURRENT_DIGEST="$(printf '%s\n' "${TAG_ROWS}" | awk -v target="${{ github.sha }}" '$1 == target { print $2; exit }')"
+            
+            if [ -z "${CURRENT_DIGEST}" ]; then
+              echo "::error::Unable to determine current manifest digest for ${REPOSITORY}:${{ github.sha }}"
+              exit 1
+            fi
+            
+            OLD_DIGESTS="$(printf '%s\n' "${TAG_ROWS}" | awk -v keep="${CURRENT_DIGEST}" 'NF >= 2 && $2 != keep { print $2 }' | sort -u)"
+            
+            if [ -z "${OLD_DIGESTS}" ]; then
+              echo "No old manifests to delete for ${REPOSITORY}."
+              return 0
+            fi
+            
+            echo "Deleting old manifests from ${REPOSITORY}:"
+            printf '%s\n' "${OLD_DIGESTS}"
+            
+            printf '%s\n' "${OLD_DIGESTS}" | while IFS= read -r DIGEST; do
+              if [ -z "${DIGEST}" ]; then
+                continue
+              fi
+              
+              doctl registry repository delete-manifest "${REPOSITORY}" "${DIGEST}" --registry "${REGISTRY_NAME}" --force
+            done
+          }
+          
+          cleanup_repository "<%= config.appName %>-api"
+          cleanup_repository "<%= config.appName %>-api-migrate"
 <% } %>
 <% if ((config.apps || []).includes('admin')) { %>
   deploy-admin:
@@ -360,4 +406,43 @@ jobs:
             kubectl logs -l app=<%= config.appName %>-admin -n ${{ env.NAMESPACE }} --tail=50 --previous 2>/dev/null || true
             exit 1
           )
+      - name: Cleanup old registry manifests (ADMIN)
+        run: |
+          set -eu
+          REGISTRY_NAME="${REGISTRY##*/}"
+          REPOSITORY="<%= config.appName %>-admin"
+          
+          echo "Inspecting repository ${REPOSITORY} in registry ${REGISTRY_NAME}"
+          
+          TAG_ROWS="$(doctl registry repository list-tags "${REPOSITORY}" --registry "${REGISTRY_NAME}" --format Tag,ManifestDigest --no-header || true)"
+          
+          if [ -z "${TAG_ROWS}" ]; then
+            echo "No tags found for ${REPOSITORY}; skipping cleanup."
+            exit 0
+          fi
+          
+          CURRENT_DIGEST="$(printf '%s\n' "${TAG_ROWS}" | awk -v target="${{ github.sha }}" '$1 == target { print $2; exit }')"
+          
+          if [ -z "${CURRENT_DIGEST}" ]; then
+            echo "::error::Unable to determine current manifest digest for ${REPOSITORY}:${{ github.sha }}"
+            exit 1
+          fi
+          
+          OLD_DIGESTS="$(printf '%s\n' "${TAG_ROWS}" | awk -v keep="${CURRENT_DIGEST}" 'NF >= 2 && $2 != keep { print $2 }' | sort -u)"
+          
+          if [ -z "${OLD_DIGESTS}" ]; then
+            echo "No old manifests to delete for ${REPOSITORY}."
+            exit 0
+          fi
+          
+          echo "Deleting old manifests from ${REPOSITORY}:"
+          printf '%s\n' "${OLD_DIGESTS}"
+          
+          printf '%s\n' "${OLD_DIGESTS}" | while IFS= read -r DIGEST; do
+            if [ -z "${DIGEST}" ]; then
+              continue
+            fi
+            
+            doctl registry repository delete-manifest "${REPOSITORY}" "${DIGEST}" --registry "${REGISTRY_NAME}" --force
+          done
 <% } %>