resolve conflicts

Author: h1manshu98

.github/workflows/AWSSSMSendCommand.yml

@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
 
       - name: Execute Remote Command via AWS SSM
         uses: peterkimzz/aws-ssm-send-command@master

.github/workflows/RemoteSSHCommand.yml

@@ -1,5 +1,5 @@
 ---
-name: "remote ssh command"
+name: "🔐 Remote SSH Command"
 on:
   workflow_call:
     inputs:
@@ -82,10 +82,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout git repo
-        uses: actions/checkout@v4
+      - name: 📦 Checkout git repo
+        uses: actions/checkout@v5
 
-      - name: executing remote ssh commands using ssh key
+      - name: 🔐 Executing remote SSH commands using SSH key
         uses: appleboy/[email protected]
         with:
           host: ${{ secrets.HOST }}
@@ -97,7 +97,7 @@ jobs:
           script: |
             ${{ inputs.script }}
 
-      - name: slack notification
+      - name: 📣 Slack notification
         if: ${{ inputs.slack-notification == 'true' && always() }}
         uses: rtCamp/action-slack-notify@v2
         env:

.github/workflows/cf-lint.yml

@@ -13,15 +13,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - name: 📦 Checkout
+        uses: actions/checkout@v5
 
-      - name: cfn-lint-action
+      - name: 🧪 cfn-lint-action
         uses: ScottBrenner/cfn-lint-action@v2
         with:
           command: cfn-lint -t ${{ inputs.cf_file_path }}
 
-      - name: cfn security checks
+      - name: 🔒 cfn security checks
         uses: minchao/[email protected]
         with:
           args: '--input-path ${{ inputs.cf_file_path }}'

.github/workflows/changelog.yml

@@ -17,12 +17,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
+      - name: 📦 Checkout Code
+        uses: actions/checkout@v5
         with:
           token: ${{ secrets.GITHUB }}
 
-      - name: Update CHANGELOG
+      - name: 📝 Update CHANGELOG
         id: changelog
         uses: requarks/changelog-action@v1
         with:
@@ -31,7 +31,7 @@ jobs:
           includeInvalidCommits: false
           tag: ${{ github.ref_name }}
 
-      - name: Create Release
+      - name: 🚀 Create Release
         uses: ncipollo/[email protected]
         with:
           allowUpdates: true
@@ -42,7 +42,7 @@ jobs:
           body: ${{ steps.changelog.outputs.changes }}
           token: '${{ secrets.GITHUB }}'
 
-      - name: Commit CHANGELOG.md
+      - name: ✅ Commit CHANGELOG.md
         uses: stefanzweifel/git-auto-commit-action@v6
         with:
           branch: ${{ inputs.branch}}

.github/workflows/checkov.yml

@@ -38,13 +38,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - name: 📦 Checkout
+        uses: actions/checkout@v5
 
-      - name: Cleanup Old SARIF
+      - name: 🧹 Cleanup Old SARIF
         run: rm -f results.sarif || true
 
-      - name: Run Checkov (Docker-based)
+      - name: 🛡️ Run Checkov (Docker-based)
         id: checkov
         continue-on-error: true
         uses: bridgecrewio/checkov-action@v12
@@ -58,21 +58,21 @@ jobs:
           output_format: ${{ inputs.output_format }}
           output_file_path: ${{ inputs.output_file_path }}
 
-      - name: Upload SARIF to GitHub Security
+      - name: 📤 Upload SARIF to GitHub Security
         if: always() && !cancelled()
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: results.sarif
           category: checkov
 
-      - name: Comment on PR with Checkov results
+      - name: 💬 Comment on PR with Checkov results
         if: github.event_name == 'pull_request'
         uses: clouddrove/[email protected]
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           sarif_file: results.sarif
 
-      - name: Fail if Issues Found
+      - name: ❌ Fail if Issues Found
         if: always() && github.event_name == 'pull_request'
         run: |
           ISSUE_COUNT=$(jq '.runs[0].results | length' results.sarif)

.github/workflows/deploy-cloudformation-stackset.yml

@@ -74,10 +74,10 @@ jobs:
   deploy-cf-stackset:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code from master branch
-        uses: actions/checkout@v4
+      - name: 📦 Checkout code from master branch
+        uses: actions/checkout@v5
 
-      - name: Configure AWS Credentials
+      - name: 🔐 Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID}}
@@ -86,7 +86,7 @@ jobs:
           aws-region: ${{ inputs.aws-region }}
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
 
-      - name: Check if StackSet exists or not-exist then create/update stack-set
+      - name: 🔄 Check if StackSet exists or not-exist then create/update stack-set
         id: check-stackset
         run: |
           set +e
@@ -147,7 +147,7 @@ jobs:
             sleep 50s
           fi
 
-      - name: Create or Update StackSet-instance
+      - name: 🧱 Create or Update StackSet-instance
         run: |
           stack_instance_list=$(aws cloudformation list-stack-instances --region ${{ inputs.aws-region }} --stack-set-name ${{ inputs.stack-set-name }})
           if [ "${{ inputs.permission-model }}" == "SERVICE_MANAGED" ]; then

.github/workflows/deploy-cloudformation.yml

@@ -80,18 +80,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout code from master branch
-        uses: actions/checkout@v4
+      - name: 📦 Checkout code from master branch
+        uses: actions/checkout@v5
 
-      - name: Checkout code from another Repo
-        uses: actions/checkout@v4
+      - name: 📥 Checkout code from another Repo
+        uses: actions/checkout@v5
         with:
           repository: ${{ inputs.organization-name }}/${{ inputs.GitHub-repo-name }}
           ref: ${{ inputs.GitHub-branch }}
           token: ${{ secrets.GITHUB }}
           path: ${{ inputs.GitHub-repo-name }}
 
-      - name: Configure AWS Credentials
+      - name: 🔐 Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID}}
@@ -100,14 +100,14 @@ jobs:
           aws-region: ${{ inputs.aws-region }}
           role-to-assume: ${{ inputs.ROLE-TO-ASSUME }}
 
-      - name: Src folder code convert into zip and upload to S3
+      - name: 📦 Src folder code convert into zip and upload to S3
         run: |
             cd ${{ inputs.GitHub-repo-name }}/${{ inputs.code-folder }}
             find . -maxdepth 1 -type f -exec zip  ${{inputs.zip-file-name}} {} +
             run: |
             aws s3 cp  ${{inputs.zip-file-name}} s3://${{ inputs.s3-bucket }}/${{ inputs.bucket-prefix }}/
 
-      - name: Deploy cloudformation stack using template
+      - name: 🚀 Deploy cloudformation stack using template
         uses: aws-actions/aws-cloudformation-github-deploy@v1
         with:
           name: ${{ inputs.stack-name }}

.github/workflows/docker-scanner.yml

@@ -1,5 +1,5 @@
 ---
-name: docker-scanner
+name: 🐳 docker-scanner
 
 on:
   workflow_call:
@@ -23,21 +23,21 @@ on:
 
 jobs:
   build-image:
-    name: Build Images
+    name: 🔧 Build Images
     runs-on: ubuntu-latest
 
     steps:
 
-      - name: Checkout git repo
-        uses: actions/checkout@v4
+      - name: 📥 Checkout git repo
+        uses: actions/checkout@v5
 
-      - name: Set up QEMU
+      - name: 🛠️ Set up QEMU
         uses: docker/setup-qemu-action@v3
 
-      - name: Set up Docker Buildx
+      - name: 🛠️ Set up Docker Buildx
         uses: docker/[email protected]
 
-      - name: Build and export to Docker
+      - name: 🏗️ Build and export to Docker
         id: build-id
         uses: docker/build-push-action@v6
         with:
@@ -47,7 +47,7 @@ jobs:
           platforms: linux/amd64
           file: ${{inputs.dockerfile-path}}
 
-      - name: Docker Scan with trivy (non-blocking)
+      - name: 🔍 Docker Scan with trivy (non-blocking)
         uses: aquasecurity/trivy-action@master
         env:
           tags: ${{ github.sha }}
@@ -57,13 +57,13 @@ jobs:
           format: 'sarif'
           output: 'trivy-results.sarif'
 
-      - name: Upload Trivy scan results to GitHub Security tab
+      - name: ☁️ Upload Trivy scan results to GitHub Security tab
         if: ${{ inputs.security-upload == 'true' }}
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: 'trivy-results.sarif'
 
-      - name: Docker Scan with trivy (blocking)
+      - name: 🚨 Docker Scan with trivy (blocking)
         if: ${{ inputs.block_action == true }}
         uses: aquasecurity/trivy-action@master
         with:

.github/workflows/docker-scout.yml

@@ -1,5 +1,6 @@
 ---
-name: docker-scout
+name: 🔍 docker-scout
+
 on:
   workflow_call:
     inputs:
@@ -48,30 +49,30 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout git repo
-        uses: actions/checkout@v4
+      - name: 📥 Checkout git repo
+        uses: actions/checkout@v5
 
-      - name: Setup Docker buildx
+      - name: ⚙️ Setup Docker buildx
         uses: docker/[email protected]
         with:
           driver-opts: |
             image=moby/buildkit:v0.10.6
 
-      - name: Login to Docker Hub
+      - name: 🔐 Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
-      - name: Build docker image
+      - name: 🛠️ Build docker image
         env:
           IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
           images: ${{ inputs.IMAGES }}
         run: |
           docker build -t $images:$IMAGE_TAG .
           # docker push $images:$IMAGE_TAG
 
-      - name: Docker Scout
+      - name: 🕵️ Docker Scout
         id: docker-scout
         uses: docker/scout-action@v1
         with:

.github/workflows/docker.yml

@@ -1,5 +1,5 @@
 ---
-name: docker-build-push
+name: 🐳 docker-build-push
 
 on:
   workflow_call:
@@ -51,22 +51,22 @@ on:
 
 jobs:
   build-image:
-    name: Build Images
+    name: 🏗️ Build Images
     runs-on: ubuntu-latest
 
     steps:
 
-      - name: Checkout git repo
-        uses: actions/checkout@v4
+      - name: 📦 Checkout git repo
+        uses: actions/checkout@v5
 
-      - name: Login to Docker Hub
+      - name: 🔑 Login to Docker Hub
         if: ${{ inputs.provider == 'DOCKERHUB' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
-      - name: Push docker image to DOCKERHUB
+      - name: 🚀 Push docker image to DOCKERHUB
         if: ${{ inputs.provider == 'DOCKERHUB' }}
         env:
           IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
@@ -76,7 +76,7 @@ jobs:
           docker build -t $images:$IMAGE_TAG $BUILD_PATH
           docker push $images:$IMAGE_TAG
 
-      - name: Configure AWS credentials
+      - name: 🔧 Configure AWS credentials
         if: ${{ inputs.provider == 'aws' }}
         uses: aws-actions/configure-aws-credentials@v4
         with:
@@ -88,18 +88,18 @@ jobs:
           role-duration-seconds: ${{ inputs.role-duration-seconds }}
           role-skip-session-tagging: true
 
-      - name: Verify awscli
+      - name: 🕵️ Verify awscli
         if: ${{ inputs.provider == 'aws' }}
         run: |
           aws sts get-caller-identity
 
 
-      - name: Login to Amazon ECR
+      - name: 🔑 Login to Amazon ECR
         if: ${{ inputs.provider == 'aws' }}
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v2
 
-      - name: Push docker image to Amazon ECR
+      - name: 🚢 Push docker image to Amazon ECR
         if: ${{ inputs.provider == 'aws' }}
         id: docker-build
         env:
@@ -112,7 +112,7 @@ jobs:
           docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG $BUILD_PATH
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
 
-      - name: Push docker image to Amazon ECR and DOCKERHUB
+      - name: 🚀🚢 Push docker image to Amazon ECR and DOCKERHUB
         if: ${{ inputs.provider == 'DOCKERHUB,aws' }}
         env:
           ## For ECR env variable