Merge pull request #3 from SheplX/stage

Stage

Author: SheblMohamed

.github/workflows/Backend.CI.yaml

@@ -1,4 +1,4 @@
-name: TODO-FRONTEND-TEST
+name: TODO-FRONTEND-CI
 on:
   push:
     # paths:
@@ -17,14 +17,12 @@ on:
 
 env:
   BACKEND_IMAGE: backend
-  SHORT_SHA: ${GITHUB_SHA::7}
 
 jobs:
   TODO-BACKEND-CI:
     runs-on: ubuntu-latest
-    env:
-      SHA12: ${GITHUB_SHA::12}
     steps:
+
       - name: Checkout code
         uses: actions/checkout@v2
 
@@ -57,7 +55,6 @@ jobs:
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
 
       - name: Push Image Tag
-        id: push_image_tag
         run: |
           IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$BACKEND_IMAGE
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
@@ -66,40 +63,40 @@ jobs:
           echo VERSION=$VERSION
           docker tag $BACKEND_IMAGE $IMAGE_ID:$VERSION
           docker push $IMAGE_ID:$VERSION
-          echo "::set-output name=VERSION::$VERSION"
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Update Helm Chart Values at Main
         if: ${{ github.ref == 'refs/heads/main'}} 
         uses: Nextdoor/helm-set-image-tag-action@main
         with:
           values_files: charts/values.yaml
           tag_keys: .backend.tag      
-          tag_value: ${{ steps.push_image_tag.outputs.VERSION }}
+          tag_value: ${{ env.VERSION }}
           commit_branch: ${{ github.ref }}
-          commit_tag: Todo-Main-Charts-V-${{ steps.push_image_tag.outputs.VERSION }}
-          commit_message: "Backend update: Tag '${{ steps.push_image_tag.outputs.VERSION }}' added"
+          commit_tag: Todo-Main-Charts-V-${{ env.VERSION }}
+          commit_message: "Backend update: Tag '${{ env.VERSION }}' added"
 
       - name: Update Helm Chart Values at Stage
         if: ${{ github.ref == 'refs/heads/stage'}} 
         uses: Nextdoor/helm-set-image-tag-action@main
         with:
           values_files: charts/values.yaml
           tag_keys: .backend.tag          
-          tag_value: ${{ steps.push_image_tag.outputs.VERSION }}
+          tag_value: ${{ env.VERSION }}
           commit_branch: ${{ github.ref }}
-          commit_tag: Todo-Stage-Charts-V-${{ steps.push_image_tag.outputs.VERSION }}
-          commit_message: "Backend update: Tag '${{ steps.push_image_tag.outputs.VERSION }}' added"
+          commit_tag: Todo-Stage-Charts-V-${{ env.VERSION }}
+          commit_message: "Backend update: Tag '${{ env.VERSION }}' added"
 
       - name: Update Helm Chart Values at Dev
         if: ${{ github.ref == 'refs/heads/dev'}} 
         uses: Nextdoor/helm-set-image-tag-action@main
         with:
           values_files: charts/values.yaml
           tag_keys: .backend.tag          
-          tag_value: ${{ steps.push_image_tag.outputs.VERSION }}
+          tag_value: ${{ env.VERSION }}
           commit_branch: ${{ github.ref }}
-          commit_tag: Todo-Dev-Charts-V-${{ steps.push_image_tag.outputs.VERSION }}
-          commit_message: "Backend update: Tag '${{ steps.push_image_tag.outputs.VERSION }}' added"
+          commit_tag: Todo-Dev-Charts-V-${{ env.VERSION }}
+          commit_message: "Backend update: Tag '${{ env.VERSION }}' added"
 
       # - name: 'Updating Helm Charts values on branch main'
       #   if: ${{ github.ref == 'refs/heads/main' }}

.github/workflows/Frontend.CI.yaml

@@ -1,8 +1,8 @@
 name: TODO-FRONTEND-CI
 on:
   push:
-    paths:
-      - 'frontend/**'
+    # paths:
+    #   - 'frontend/**'
     branches:
       - main
       - dev
@@ -11,41 +11,42 @@ on:
     branches:
       - main
       - dev
-    paths:
-      - 'frontend/**'
+      - stage
+    # paths:
+    #   - 'frontend/**'
 
 env:
   FRONTEND_IMAGE: frontend
 
 jobs:
   TODO-FRONTEND-CI:
     runs-on: ubuntu-latest
+
     steps:
+    
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Get changed files in the Frontend folder
+      - name: Check Changed Files In Frontend Folder
         id: frontend
         uses: tj-actions/changed-files@v35
         with:
           files: ${{ env.FRONTEND_IMAGE }}/**
 
-      - name: Frontend changed files
+      - name: Changed Files
         if: steps.frontend.outputs.any_changed == 'true'
         run: |
           echo "Changed Files: ${{ steps.frontend.outputs.all_changed_files }}"
 
-      - name: Build Docker image
-        working-directory: frontend/
+      - name: Build Frontend Docker Image
+        working-directory: frontend/events
         run: docker build -t $FRONTEND_IMAGE .
 
       - name: Scan Frontend Image
-        if: steps.frontend.outputs.any_changed == 'true'
         uses: aquasecurity/trivy-action@master
         with:
           image-ref: ${{ env.FRONTEND_IMAGE }}
-          format: sarif
-          output: 'console'
+          format: 'table'
           exit-code: '0'
           ignore-unfixed: true
           vuln-type: 'os,library'
@@ -55,49 +56,49 @@ jobs:
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
 
       - name: Push Image Tag
+        id: tag
         run: |
           IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$FRONTEND_IMAGE
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-          VERSION=$GITHUB_SHA
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+          VERSION=${GITHUB_SHA:0:7}
           echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$GITHUB_SHA
+          echo VERSION=$VERSION
           docker tag $FRONTEND_IMAGE $IMAGE_ID:$VERSION
           docker push $IMAGE_ID:$VERSION
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
 
-      - name: Update Frontend Helm chart values if main
-        if: github.ref == 'refs/heads/main'
+      - name: Update Helm Chart Values at Main
+        if: ${{ github.ref == 'refs/heads/main'}} 
         uses: Nextdoor/helm-set-image-tag-action@main
         with:
           values_files: charts/values.yaml
-          tag_keys: .backend.tag      
-          tag_value: ${{ github.sha }}
+          tag_keys: .frontend.tag      
+          tag_value: ${{ env.VERSION }}
           commit_branch: ${{ github.ref }}
-          commit_tag: ${{ github.ref }}-chart
-          commit_message: Tag ${{ github.sha }} Updated On Charts !
-
-      - name: Update Frontend Helm chart values if stage
-        if: github.ref == 'refs/heads/stage'
+          commit_tag: Todo-Main-Charts-V-${{ env.VERSION }}
+          commit_message: "Frontend update: Tag '${{ env.VERSION }}' added"
+          
+      - name: Update Helm Chart Values at Stage
+        if: ${{ github.ref == 'refs/heads/stage'}} 
         uses: Nextdoor/helm-set-image-tag-action@main
         with:
           values_files: charts/values.yaml
           tag_keys: .frontend.tag          
-          tag_value: ${{ github.sha }}
+          tag_value: ${{ env.VERSION }}
           commit_branch: ${{ github.ref }}
-          commit_tag: ${{ github.ref }}-chart
-          commit_message: Tag ${{ github.sha }} Updated On Charts !
+          commit_tag: Todo-Stage-Charts-V-${{ env.VERSION }}
+          commit_message: "Frontend update: Tag '${{ env.VERSION }}' added"
 
-      - name: Update Frontend Helm chart values if dev
-        if: github.ref == 'refs/heads/dev'
+      - name: Update Helm Chart Values at Dev
+        if: ${{ github.ref == 'refs/heads/dev'}} 
         uses: Nextdoor/helm-set-image-tag-action@main
         with:
           values_files: charts/values.yaml
           tag_keys: .frontend.tag          
-          tag_value: ${{ github.sha }}
+          tag_value: ${{ env.VERSION }}
           commit_branch: ${{ github.ref }}
-          commit_tag: ${{ github.ref }}-chart
-          commit_message: Tag ${{ github.sha }} Updated On Charts !
+          commit_tag: Todo-Dev-Charts-V-${{ env.VERSION }}
+          commit_message: "Frontend update: Tag '${{ env.VERSION }}' added"
 
       # - name: 'Updating Helm Charts values on branch main'
       #   if: ${{ github.ref == 'refs/heads/main' }}

backend/.gitignore

@@ -1 +1,2 @@
 dist/
+node_modules/

charts/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: 1.16.0
 description: Todo app Helm chart
 name: Todo app
 type: application
-version: 0.1.87
+version: 0.1.94

charts/README.md

@@ -1,6 +1,6 @@
 # Todo app
 
-![Version: 0.1.87](https://img.shields.io/badge/Version-0.1.87-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
+![Version: 0.1.94](https://img.shields.io/badge/Version-0.1.94-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
 
 Todo app Helm chart
 
@@ -10,9 +10,9 @@ Todo app Helm chart
 |-----|------|---------|-------------|
 | DBname.name | string | `"db"` |  |
 | backend.repository | string | `"docker.pkg.github.com/Todo-Full-Stack-Deployment/sheplx/backend"` |  |
-| backend.tag | string | `"cd43314"` |  |
+| backend.tag | string | `"a8105cf"` |  |
 | frontend.repository | string | `"docker.pkg.github.com/Todo-Full-Stack-Deployment/sheplx/frontend"` |  |
-| frontend.tag | string | `"c8dd64edf28cdfa5c7c8b95b581e2549857a5ee8"` |  |
+| frontend.tag | string | `"d4fb2b4"` |  |
 | ingress.tls[0].hosts[0] | string | `"todo.devops.com"` |  |
 | spec.replicas | int | `3` |  |
 

charts/values.yaml

@@ -4,10 +4,10 @@ ingress:
         - todo.devops.com
 backend:
   repository: docker.pkg.github.com/Todo-Full-Stack-Deployment/sheplx/backend
-  tag: "cd43314"
+  tag: "a8105cf"
 frontend:
   repository: docker.pkg.github.com/Todo-Full-Stack-Deployment/sheplx/frontend
-  tag: c8dd64edf28cdfa5c7c8b95b581e2549857a5ee8
+  tag: d4fb2b4
 spec:
   replicas: 3
 DBname:

frontend/events/.gitignore

@@ -1,6 +1,6 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
-# Compiled output
+# Compiled 
 /dist
 /tmp
 /out-tsc