Merge pull request #188 from microsoft/dev

build: Merging Dev changes to Main branch
microsoft · Jan 6, 2025 · 4635ad1 · 4635ad1
2 parents 474d6c1 + 0ec816e
commit 4635ad1
Show file tree

Hide file tree

Showing 31 changed files with 5,814 additions and 17,294 deletions.
diff --git a/.flake8 b/.flake8
@@ -1,4 +1,5 @@
 [flake8]
-max-line-length = 120
-exclude = .venv, _pycache_, migrations
-ignore = E501,F401,F811,F841,E203,E231,W503
+max-line-length = 88
+extend-ignore = E501
+exclude = venv, frontend
+ignore = E203, W503
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -0,0 +1,190 @@
+name: CI-Validate Deployment
+
+on:
+    push:
+      branches:
+        - main
+    schedule:
+      - cron: '0 6,18 * * *'  # Runs at 6:00 AM and 6:00 PM GMT
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Setup Azure CLI
+        run: |
+          curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
+          az --version  # Verify installation
+
+      - name: Login to Azure
+        run: |
+          az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
+
+      - name: Install Bicep CLI
+        run: az bicep install
+
+      - name: Generate Resource Group Name
+        id: generate_rg_name
+        run: |
+          echo "Generating a unique resource group name..."
+          TIMESTAMP=$(date +%Y%m%d%H%M%S)
+          COMMON_PART="pslautomationRes"
+          UNIQUE_RG_NAME="${COMMON_PART}${TIMESTAMP}"
+          echo "RESOURCE_GROUP_NAME=${UNIQUE_RG_NAME}" >> $GITHUB_ENV
+          echo "Generated Resource_GROUP_PREFIX: ${UNIQUE_RG_NAME}" 
+      
+      - name: Check and Create Resource Group
+        id: check_create_rg
+        run: |
+          set -e  
+          echo "Checking if resource group exists..."
+          rg_exists=$(az group exists --name ${{ env.RESOURCE_GROUP_NAME }})
+          if [ "$rg_exists" = "false" ]; then
+            echo "Resource group does not exist. Creating..."
+            az group create --name ${{ env.RESOURCE_GROUP_NAME }} --location northcentralus || { echo "Error creating resource group"; exit 1; }
+          else
+            echo "Resource group already exists."
+          fi
+
+      - name: Generate Unique Solution Prefix
+        id: generate_solution_prefix
+        run: |
+          set -e
+          COMMON_PART="pslr"
+          TIMESTAMP=$(date +%s)  
+          UPDATED_TIMESTAMP=$(echo $TIMESTAMP | tail -c 3) 
+          UNIQUE_SOLUTION_PREFIX="${COMMON_PART}${UPDATED_TIMESTAMP}"
+          echo "SOLUTION_PREFIX=${UNIQUE_SOLUTION_PREFIX}" >> $GITHUB_ENV
+          echo "Generated SOLUTION_PREFIX: ${UNIQUE_SOLUTION_PREFIX}" 
+
+      - name: Deploy Bicep Template
+        id: deploy
+        run: |
+          set -e
+          az deployment group create \
+            --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
+            --template-file infrastructure/deployment.json \
+            --parameters \
+                HostingPlanName="${{ env.SOLUTION_PREFIX }}-plan" \
+                ApplicationInsightsName="appins-${{ env.SOLUTION_PREFIX }}" \
+                WebsiteName="webapp-${{ env.SOLUTION_PREFIX }}" \
+                CosmosDBName="db-cosmos-${{ env.SOLUTION_PREFIX }}" \
+                CosmosDBRegion="NorthCentralUS" \
+                AzureSearchService="search-${{ env.SOLUTION_PREFIX }}" \
+                AzureOpenAIResource="aoai-${{ env.SOLUTION_PREFIX }}" \
+                WorkspaceName="worksp-${{ env.SOLUTION_PREFIX }}" 
+      
+      - name: Delete Bicep Deployment
+        if: success()
+        run: |
+          set -e  
+          echo "Checking if resource group exists..."
+          rg_exists=$(az group exists --name ${{ env.RESOURCE_GROUP_NAME }})
+          if [ "$rg_exists" = "true" ]; then
+            echo "Resource group exists. Cleaning..."
+            az group delete \
+                --name ${{ env.RESOURCE_GROUP_NAME }} \
+                --yes \
+                --no-wait
+            echo "Resource group deleted...  ${{ env.RESOURCE_GROUP_NAME }}"
+          else
+            echo "Resource group does not exist."
+          fi
+
+      - name: Wait for Resource Deletion to Complete
+        run: |
+          # List of resources to check based on SOLUTION_PREFIX
+          resources_to_check=(
+            "aoai-${{ env.SOLUTION_PREFIX }}"
+            "appins-${{ env.SOLUTION_PREFIX }}"
+            "db-cosmos-${{ env.SOLUTION_PREFIX }}"
+            "${{ env.SOLUTION_PREFIX }}-plan"
+            "search-${{ env.SOLUTION_PREFIX }}"
+            "webapp-${{ env.SOLUTION_PREFIX }}"
+            "worksp-${{ env.SOLUTION_PREFIX }}"
+          )
+
+          # Get the list of resources in YAML format
+          resource_list=$(az resource list --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }} --output yaml)
+          
+          # Maximum number of retries and retry intervals
+          max_retries=3
+          retry_intervals=(30 60 120)
+          retries=0
+          
+          while true; do
+            resource_found=false
+            # Iterate through the resources to check
+            for resource in "${resources_to_check[@]}"; do
+              echo "Checking resource: $resource"
+              if echo "$resource_list" | grep -q "name: $resource"; then
+                echo "Resource '$resource' exists in the subscription."
+                resource_found=true
+              else
+                echo "Resource '$resource' does not exist in the subscription."
+              fi
+            done
+
+            # If any resource exists, retry
+            if [ "$resource_found" = true ]; then
+              retries=$((retries + 1))
+              if [ "$retries" -ge "$max_retries" ]; then
+                echo "Maximum retry attempts reached. Exiting."
+                break
+              else
+                echo "Waiting for ${retry_intervals[$retries-1]} seconds before retrying..."
+                sleep ${retry_intervals[$retries-1]}
+              fi
+            else
+              echo "No resources found. Exiting."
+              break
+            fi
+          done
+
+      - name: Purging the Resources
+        if: success()
+        run: |
+          set -e
+          # Purging resources based on solution prefix
+          echo "Purging resources..."
+
+          # List of resources to purge
+          resources_to_purge=(
+            "aoai-${{ env.SOLUTION_PREFIX }}"
+            "appins-${{ env.SOLUTION_PREFIX }}"
+            "db-cosmos-${{ env.SOLUTION_PREFIX }}"
+            "${{ env.SOLUTION_PREFIX }}-plan"
+            "search-${{ env.SOLUTION_PREFIX }}"
+            "webapp-${{ env.SOLUTION_PREFIX }}"
+            "worksp-${{ env.SOLUTION_PREFIX }}"
+          )
+          
+          for resource in "${resources_to_purge[@]}"; do
+            echo "Purging resource: $resource"
+            if ! az resource delete --ids /subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/providers/Microsoft.CognitiveServices/locations/uksouth/deletedAccounts/$resource --verbose; then
+              echo "Failed to purge resource: $resource"
+            else
+              echo "Purged the resource: $resource"
+            fi
+          done
+
+          echo "Resource purging completed successfully"
+
+      - name: Send Notification on Failure
+        if: failure()
+        run: |
+          RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+
+          EMAIL_BODY=$(cat <<EOF
+          {
+            "body": "<p>Dear Team,</p><p>We would like to inform you that the Research Assistant Automation process has encountered an issue and has failed to complete successfully.</p><p><strong>Build URL:</strong> ${RUN_URL}<br> ${OUTPUT}</p><p>Please investigate the matter at your earliest convenience.</p><p>Best regards,<br>Your Automation Team</p>"
+          }
+          EOF
+          )
+
+          curl -X POST "${{ secrets.LOGIC_APP_URL }}" \
+            -H "Content-Type: application/json" \
+            -d "$EMAIL_BODY" || echo "Failed to send notification"
diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
@@ -5,6 +5,8 @@ on:
     types: [closed]
     branches:
       - main
+      - dev
+      - demo
   workflow_dispatch: # Add this line to enable manual triggering
 
 jobs:
@@ -20,13 +22,41 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Log in to Azure Container Registry
-        uses: azure/docker-login@v1
+        if: ${{ github.ref_name == 'main' }}
+        uses: azure/docker-login@v2
         with:
           login-server: ${{ secrets.ACR_LOGIN_SERVER }}
           username: ${{ secrets.ACR_USERNAME }}
           password: ${{ secrets.ACR_PASSWORD }}
 
+      - name: Log in to Azure Container Registry (Dev/Demo)
+        if: ${{ github.ref_name == 'dev' || github.ref_name == 'demo' }}
+        uses: azure/docker-login@v2
+        with:
+          login-server: ${{ secrets.ACR_DEV_LOGIN_SERVER }}
+          username: ${{ secrets.ACR_DEV_USERNAME }}
+          password: ${{ secrets.ACR_DEV_PASSWORD }}
+
+      - name: Set Docker image tag
+        id: docker_tag
+        run: |
+          if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
+            echo "TAG=latest" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
+            echo "TAG=dev" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/demo" ]]; then
+            echo "TAG=demo" >> $GITHUB_ENV
+          fi
+
       - name: Build and push Docker image
+        if: ${{ github.ref_name == 'main' }}
+        run: |
+          docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }} -f WebApp.Dockerfile .
+          docker push ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }}
+
+      - name: Build and push Docker image (Dev/Demo)
+        if: ${{ github.ref_name == 'dev' || github.ref_name == 'demo' }}
         run: |
           docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/webapp:latest -f WebApp.Dockerfile .
-          docker push ${{ secrets.ACR_LOGIN_SERVER }}/webapp:latest
+          docker push ${{ secrets.ACR_LOGIN_SERVER }}/webapp:latest
+          
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -18,7 +18,7 @@ jobs:
         working-directory: frontend
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x, 21.x]
+        node-version: [16.x, 18.x, 21.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -20,16 +20,14 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      # Step 3: Run all code quality checks
-      - name: Run Code Quality Checks
+      - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          echo "Fixing imports with Isort..."
-          python -m isort --verbose .
-          echo "Formatting code with Black..."
-          python -m black --verbose .
-          echo "Running Flake8..."
-          python -m flake8 --config=.flake8 --verbose .
+          pip install -r requirements-dev.txt
+          
+      # Step 3: Run all code quality checks
+      - name: Pylint
+        run: |
           echo "Running Pylint..."
-          python -m pylint --rcfile=.pylintrc --verbose .
+          python -m flake8 --config=.flake8 --verbose .
+