@hed-hog/cli 0.0.93 → 0.0.94

package/dist/src/templates/deployment/DEPLOYMENT.md.ejs

@@ -142,22 +142,13 @@ kubectl rollout status deployment/<%= config.appName %>-api -n <%= config.namesp
 
 <% } %><% if (config.apps.includes('admin')) { %>docker build -t <%= config.containerRegistry %>/<%= config.appName %>-admin:latest \
   --build-arg NEXT_PUBLIC_API_BASE_URL=<%= config.apiDomain || '' %> \
-  --build-arg NEXT_PUBLIC_API_URL=<%= config.apiDomain || '' %> \
   --build-arg INTERNAL_API_URL=http://<%= config.appName %>-api:<%= config.appPorts?.api || 3000 %> \
-  --build-arg ADMIN_API_BASE_URL=<%= config.apiDomain || '' %> \
-  --build-arg ADMIN_API_URL=<%= config.apiDomain || '' %> \
-  --build-arg ADMIN_INTERNAL_API_URL=http://<%= config.appName %>-api:<%= config.appPorts?.api || 3000 %> \
   -f apps/admin/Dockerfile .
 docker push <%= config.containerRegistry %>/<%= config.appName %>-admin:latest
 kubectl create configmap <%= config.appName %>-admin-config \
   -n <%= config.namespace %> \
-  --from-literal=ADMIN_API_BASE_URL='<%= config.apiDomain || '' %>' \
-  --from-literal=ADMIN_API_URL='<%= config.apiDomain || '' %>' \
-  --from-literal=ADMIN_INTERNAL_API_URL='http://<%= config.appName %>-api:<%= config.appPorts?.api || 3000 %>' \
   --from-literal=NEXT_PUBLIC_API_BASE_URL='<%= config.apiDomain || '' %>' \
-  --from-literal=NEXT_PUBLIC_API_URL='<%= config.apiDomain || '' %>' \
   --from-literal=INTERNAL_API_URL='http://<%= config.appName %>-api:<%= config.appPorts?.api || 3000 %>' \
-  --from-literal=FRONTEND_URLS='<%= config.frontendUrls || (config.domain ? `https://${config.domain}` : '') %>' \
   --dry-run=client -o yaml | kubectl apply -f -
 kubectl set image deployment/<%= config.appName %>-admin <%= config.appName %>-admin=<%= config.containerRegistry %>/<%= config.appName %>-admin:latest -n <%= config.namespace %>
 kubectl rollout status deployment/<%= config.appName %>-admin -n <%= config.namespace %>

package/dist/src/templates/deployment/k8s.deployment.yaml.ejs

@@ -24,21 +24,6 @@ spec:
             - name: NODE_ENV
               value: production
 <% if (app === 'admin') { %>
-            - name: ADMIN_INTERNAL_API_URL
-              valueFrom:
-                configMapKeyRef:
-                  name: <%= config.appName %>-<%= app %>-config
-                  key: ADMIN_INTERNAL_API_URL
-            - name: ADMIN_API_BASE_URL
-              valueFrom:
-                configMapKeyRef:
-                  name: <%= config.appName %>-<%= app %>-config
-                  key: ADMIN_API_BASE_URL
-            - name: ADMIN_API_URL
-              valueFrom:
-                configMapKeyRef:
-                  name: <%= config.appName %>-<%= app %>-config
-                  key: ADMIN_API_URL
             - name: INTERNAL_API_URL
               valueFrom:
                 configMapKeyRef:
@@ -49,11 +34,6 @@ spec:
                 configMapKeyRef:
                   name: <%= config.appName %>-<%= app %>-config
                   key: NEXT_PUBLIC_API_BASE_URL
-            - name: NEXT_PUBLIC_API_URL
-              valueFrom:
-                configMapKeyRef:
-                  name: <%= config.appName %>-<%= app %>-config
-                  key: NEXT_PUBLIC_API_URL
 <% } else { %>
 <%
 const secretEnvKeys = new Set(['DATABASE_URL', 'ENCRYPTION_SECRET', 'JWT_SECRET', 'PEPPER']);

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

@@ -10,16 +10,13 @@ env:
   K8S_CLUSTER_ID: <%= config.k8sClusterId || config.clusterName %>
 <% if ((config.apps || []).includes('api')) { %>
   # API environment
-  API_FRONTEND_URL: <%= config.domain ? 'https://' + config.domain : '' %>
-  API_JWT_EXPIRES_IN: <%= config.jwtExpiresIn || '7d' %>
+  FRONTEND_URL: <%= config.frontendUrls || (config.domain ? 'https://' + config.domain : '' ) %>
+  JWT_EXPIRES_IN: <%= config.jwtExpiresIn || '7d' %>
 <% } %>
 <% if ((config.apps || []).includes('admin')) { %>
-  # Admin environment (used in image build args and mirrored to runtime ConfigMap)
-  ADMIN_API_BASE_URL: <%= config.apiDomain || '' %>
-  ADMIN_API_URL: <%= config.apiDomain || '' %>
-  ADMIN_INTERNAL_API_URL: <%= config.apiDomain || '' %>
+  # Admin environment
+  NEXT_PUBLIC_API_BASE_URL: <%= config.apiDomain || '' %>
   INTERNAL_API_URL: <%= config.apiDomain || '' %>
-  FRONTEND_URLS: <%= config.frontendUrls || (config.domain ? 'https://' + config.domain : '') %>
 <% } %>
 jobs:
   apply-cluster-config:
@@ -64,8 +61,8 @@ jobs:
     # - DIGITALOCEAN_ACCESS_TOKEN: DigitalOcean API token
     #
     # Auto-configured (via env vars in this workflow):
-    # - JWT_EXPIRES_IN: JWT expiration (currently: ${{ env.API_JWT_EXPIRES_IN }})
-    # - FRONTEND_URL: Frontend URL (currently: ${{ env.API_FRONTEND_URL }})
+    # - JWT_EXPIRES_IN: JWT expiration (currently: ${{ env.JWT_EXPIRES_IN }})
+    # - FRONTEND_URL: Frontend URL (currently: ${{ env.FRONTEND_URL }})
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
@@ -177,8 +174,8 @@ jobs:
         run: |
           kubectl create configmap <%= config.appName %>-api-config \
             -n ${{ env.NAMESPACE }} \
-            --from-literal=FRONTEND_URL='${{ env.API_FRONTEND_URL }}' \
-            --from-literal=JWT_EXPIRES_IN='${{ env.API_JWT_EXPIRES_IN }}' \
+            --from-literal=FRONTEND_URL='${{ env.FRONTEND_URL }}' \
+            --from-literal=JWT_EXPIRES_IN='${{ env.JWT_EXPIRES_IN }}' \
             --dry-run=client -o yaml | kubectl apply -f -
       - name: Ensure API secrets exist
         run: |
@@ -400,57 +397,40 @@ jobs:
           docker pull hello-world
           docker tag hello-world ${{ env.REGISTRY }}/ci-auth-probe-admin:${{ github.run_id }}
           docker push ${{ env.REGISTRY }}/ci-auth-probe-admin:${{ github.run_id }}
-      - name: Validate admin API URLs
+      - name: Validate admin API environment
         run: |
           set -eu
 
-          if [ -z "${{ env.ADMIN_API_URL }}" ]; then
-            echo "::error::ADMIN_API_URL is empty. Set it in workflow env before building admin image."
+          if [ -z "${{ env.NEXT_PUBLIC_API_BASE_URL }}" ]; then
+            echo "::error::NEXT_PUBLIC_API_BASE_URL is empty. Set it in workflow env before building the admin image."
             exit 1
           fi
 
-          if [ -z "${{ env.ADMIN_API_BASE_URL }}" ]; then
-            echo "::error::ADMIN_API_BASE_URL is empty. Set it in workflow env before building admin image."
+          if [ -z "${{ env.INTERNAL_API_URL }}" ]; then
+            echo "::error::INTERNAL_API_URL is empty. Set it in workflow env before building the admin image."
             exit 1
           fi
 
-          if [ -z "${{ env.ADMIN_INTERNAL_API_URL }}" ]; then
-            echo "::error::ADMIN_INTERNAL_API_URL is empty. Set it in workflow env before building admin image."
-            exit 1
-          fi
-
-          case "${{ env.ADMIN_API_URL }}" in
-            http://*|https://*) ;;
-            *)
-              echo "::error::ADMIN_API_URL must be an absolute URL (http/https). Current value: ${{ env.ADMIN_API_URL }}"
-              exit 1
-              ;;
-          esac
-
-          case "${{ env.ADMIN_API_BASE_URL }}" in
-            http://*|https://*) ;;
+          case "${{ env.NEXT_PUBLIC_API_BASE_URL }}" in
+            http://*|https://*|/*) ;;
             *)
-              echo "::error::ADMIN_API_BASE_URL must be an absolute URL (http/https). Current value: ${{ env.ADMIN_API_BASE_URL }}"
+              echo "::error::NEXT_PUBLIC_API_BASE_URL must be an absolute URL (http/https) or a root-relative path like /api. Current value: ${{ env.NEXT_PUBLIC_API_BASE_URL }}"
               exit 1
               ;;
           esac
 
-          case "${{ env.ADMIN_INTERNAL_API_URL }}" in
+          case "${{ env.INTERNAL_API_URL }}" in
             http://*|https://*) ;;
             *)
-              echo "::error::ADMIN_INTERNAL_API_URL must be an absolute URL (http/https). Current value: ${{ env.ADMIN_INTERNAL_API_URL }}"
+              echo "::error::INTERNAL_API_URL must be an absolute URL (http/https). Current value: ${{ env.INTERNAL_API_URL }}"
               exit 1
               ;;
           esac
       - name: Build Docker image
         run: |
           docker build -t ${{ env.REGISTRY }}/<%= config.appName %>-admin:${{ github.sha }} \
-            --build-arg NEXT_PUBLIC_API_BASE_URL=${{ env.ADMIN_API_BASE_URL }} \
-            --build-arg NEXT_PUBLIC_API_URL=${{ env.ADMIN_API_URL }} \
-            --build-arg INTERNAL_API_URL=${{ env.ADMIN_INTERNAL_API_URL }} \
-            --build-arg ADMIN_API_BASE_URL=${{ env.ADMIN_API_BASE_URL }} \
-            --build-arg ADMIN_API_URL=${{ env.ADMIN_API_URL }} \
-            --build-arg ADMIN_INTERNAL_API_URL=${{ env.ADMIN_INTERNAL_API_URL }} \
+            --build-arg NEXT_PUBLIC_API_BASE_URL=${{ env.NEXT_PUBLIC_API_BASE_URL }} \
+            --build-arg INTERNAL_API_URL=${{ env.INTERNAL_API_URL }} \
             -f apps/admin/Dockerfile .
       - name: Push Docker image (sha)
         run: |
@@ -466,13 +446,8 @@ jobs:
         run: |
           kubectl create configmap <%= config.appName %>-admin-config \
             -n ${{ env.NAMESPACE }} \
-            --from-literal=ADMIN_API_BASE_URL='${{ env.ADMIN_API_BASE_URL }}' \
-            --from-literal=ADMIN_API_URL='${{ env.ADMIN_API_URL }}' \
-            --from-literal=ADMIN_INTERNAL_API_URL='${{ env.ADMIN_INTERNAL_API_URL }}' \
-            --from-literal=NEXT_PUBLIC_API_BASE_URL='${{ env.ADMIN_API_BASE_URL }}' \
-            --from-literal=NEXT_PUBLIC_API_URL='${{ env.ADMIN_API_URL }}' \
-            --from-literal=INTERNAL_API_URL='${{ env.ADMIN_INTERNAL_API_URL }}' \
-            --from-literal=FRONTEND_URLS='${{ env.FRONTEND_URLS }}' \
+            --from-literal=NEXT_PUBLIC_API_BASE_URL='${{ env.NEXT_PUBLIC_API_BASE_URL }}' \
+            --from-literal=INTERNAL_API_URL='${{ env.INTERNAL_API_URL }}' \
             --dry-run=client -o yaml | kubectl apply -f -
       - name: Deploy to Kubernetes
         run: |