Merge branch 'master' into fix-release-step

Author: dilip0515

.github/workflows/pipeline.yaml

@@ -138,7 +138,6 @@ jobs:
       - name: Configure AWS Namespace
         env:
           PR_NUMBER: ${{ github.event.number }}
-          # This is the branch name, or the git tag name
           NS_BRANCH_OR_TAG: ${{ github.ref_name }}
         run: |
           echo "PR_NUMBER=${{ env.PR_NUMBER }}"
@@ -161,8 +160,6 @@ jobs:
           test $(shasum -a 256 ./dce_linux_amd64.zip | awk '{print $1}') == "${expected_sha}"
           unzip ./dce_linux_amd64.zip -d ./
 
-        # Lease a DCE account, to use for deploying our PR environment
-        # (deploy DCE in DCE)
       - name: Lease DCE Account
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -201,18 +198,16 @@ jobs:
           ./dce --config=dce.yml leases login ${lease_id}
           echo "${lease_id}" > ./lease_id.txt
 
-        # Install Terraform
       - name: Install Terraform
         uses: hashicorp/setup-terraform@v2
         with:
           terraform_version: ${{ inputs.terraform_version }}
 
-        # Configure the Terraform backend
       - name: Configure Terraform Backend
         run: |
           lease_id=$(cat lease_id.txt)
           ./scripts/create-tf-backend.sh ${lease_id}
-        # terraform init
+
       - name: Terraform Init/Apply
         env:
           NAMESPACE: ${{ env.namespace }}
@@ -223,7 +218,7 @@ jobs:
           set -ex
           cd modules
           terraform init -input=false
-           
+          
           export TF_VAR_global_tags='${{ vars.TF_VAR_GLOBAL_TAGS}}'
           export TF_VAR_required_bucket_prefix="${TF_VAR_required_bucket_prefix}"
 
@@ -245,6 +240,41 @@ jobs:
 
       - name: Build artifacts
         run: ./scripts/build.sh
+      
+      - name: Validate Build Artifacts
+        run: |
+          echo "Validating build artifacts..."
+          [ -f "./bin/build_artifacts.zip" ] && echo "build_artifacts.zip created" || (echo "build_artifacts.zip missing" && exit 1)
+          [ -f "./bin/terraform_artifacts.zip" ] && echo "terraform_artifacts.zip created" || (echo "terraform_artifacts.zip missing" && exit 1)
+          [ -f "./scripts/deploy.sh" ] && echo "deploy.sh exists" || (echo "deploy.sh missing" && exit 1)
+          [ -f "./scripts/restore_db.sh" ] && echo "restore_db.sh exists" || (echo "restore_db.sh missing" && exit 1)
+          
+          # Validate file sizes
+          build_size=$(stat -c%s "./bin/build_artifacts.zip" 2>/dev/null || echo "0")
+          terraform_size=$(stat -c%s "./bin/terraform_artifacts.zip" 2>/dev/null || echo "0")
+          
+          [ "$build_size" -gt 0 ] && echo "build_artifacts.zip has content ($build_size bytes)" || (echo "build_artifacts.zip is empty" && exit 1)
+          [ "$terraform_size" -gt 0 ] && echo "terraform_artifacts.zip has content ($terraform_size bytes)" || (echo "terraform_artifacts.zip is empty" && exit 1)
+      
+      - name: Upload Build Artifacts for Release
+        uses: actions/upload-artifact@v4
+        with:
+          name: release_build_artifacts
+          path: ./bin/build_artifacts.zip
+
+      - name: Upload Terraform Artifacts for Release
+        uses: actions/upload-artifact@v4
+        with:
+          name: release_terraform_artifacts
+          path: ./bin/terraform_artifacts.zip
+
+      - name: Upload Deploy Scripts for Release
+        uses: actions/upload-artifact@v4
+        with:
+          name: release_deploy_scripts
+          path: |
+            ./scripts/deploy.sh
+            ./scripts/restore_db.sh
 
       - name: DCE Lease Login
         env:
@@ -313,26 +343,6 @@ jobs:
             "${NAMESPACE}" \
             "${ARTIFACTS_BUCKET}"
 
-      # Functional Tests --> TODO need to fix the test failures
-
-      # - name: Functional Tests
-      #   run: |
-      #     set -euxo pipefail
-      #     mkdir -p junit-report
-
-      #     go get github.com/jstemmer/go-junit-report
-      #     go test -v ./tests/... -test.timeout 50m 2>&1 | tee >(go-junit-report > junit-report/functional.xml)
-    
-       # Publish junit test results (for unit and functional tests) -- > TODO need to fix the test failures
-
-      # - name: Publish Test Results
-      #   if: always()
-      #   uses: actions/upload-artifact@v4
-      #   with: 
-      #     name: Functional-Test-Results
-      #     path: junit-report/functional.xml
-      #     retention-days: 7
-
       - name: Upload dce-cli Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -397,7 +407,6 @@ jobs:
           cp ${{ github.workspace }}/backend-tf/backend.tf ./modules/
           chmod +x ./dce
 
-        # Cleanup the PR environment
       - name: Terraform for Cleanup
         uses: hashicorp/setup-terraform@v2
         with:
@@ -419,7 +428,6 @@ jobs:
           terraform init -input=false
           terraform destroy -auto-approve
           
-        # End the DCE lease
       - name: End DCE Lease
         env:
           AWS_DEFAULT_REGION: us-east-1