Merge pull request #1 from LeadingEDJE/setup-azure

Updates login method, changes P1 SKUs to B1, defaults to Qdrant for m…
LeadingEDJE · Sep 28, 2023 · c8f7de7 · c8f7de7
2 parents 91dbfea + 1b91b5c
commit c8f7de7
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 33 deletions.
diff --git a/.github/workflows/copilot-deploy-backend.yml b/.github/workflows/copilot-deploy-backend.yml
@@ -52,13 +52,13 @@ jobs:
         run: ls -R
         working-directory: "${{ github.workspace }}/${{inputs.ARTIFACT_NAME}}"
 
-      - name: Azure login
-        uses: azure/login@v1
-        with:
-          client-id: ${{secrets.AZURE_CLIENT_ID}}
-          tenant-id: ${{secrets.AZURE_TENANT_ID}}
-          subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}}
-          enable-AzPSSession: false
+      - name: Login to Azure
+        env:
+          AZURE_APP_ID_URI: ${{ secrets.AZURE_CLIENT_ID }}
+          AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+        run: |
+          az login --service-principal --username "$AZURE_APP_ID_URI" --password "$AZURE_CLIENT_SECRET" --tenant "$AZURE_TENANT_ID"
 
       - name: Get app name
         id: app-name

diff --git a/.github/workflows/copilot-deploy-frontend.yml b/.github/workflows/copilot-deploy-frontend.yml
@@ -50,13 +50,13 @@ jobs:
       - name: "Install SWA CLI"
         run: npm install -g @azure/static-web-apps-cli
 
-      - name: Azure login
-        uses: azure/login@v1
-        with:
-          client-id: ${{secrets.AZURE_CLIENT_ID}}
-          tenant-id: ${{secrets.AZURE_TENANT_ID}}
-          subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}}
-          enable-AzPSSession: false
+      - name: Login to Azure
+        env:
+          AZURE_APP_ID_URI: ${{ secrets.AZURE_CLIENT_ID }}
+          AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+        run: |
+          az login --service-principal --username "$AZURE_APP_ID_URI" --password "$AZURE_CLIENT_SECRET" --tenant "$AZURE_TENANT_ID"
 
       - name: "Get and Mask SWA Deployment Token"
         uses: azure/CLI@v1

diff --git a/.github/workflows/copilot-deploy-infra.yml b/.github/workflows/copilot-deploy-infra.yml
@@ -44,13 +44,13 @@ jobs:
         with:
           clean: true
 
-      - name: Azure login
-        uses: azure/login@v1
-        with:
-          client-id: ${{secrets.AZURE_CLIENT_ID}}
-          tenant-id: ${{secrets.AZURE_TENANT_ID}}
-          subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}}
-          enable-AzPSSession: false
+      - name: Login to Azure
+        env:
+          AZURE_APP_ID_URI: ${{ secrets.AZURE_CLIENT_ID }}
+          AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+        run: |
+          az login --service-principal --username "$AZURE_APP_ID_URI" --password "$AZURE_CLIENT_SECRET" --tenant "$AZURE_TENANT_ID"
 
       - name: deploy-infra
         uses: azure/CLI@v1

diff --git a/.github/workflows/copilot-deploy-memorypipeline.yml b/.github/workflows/copilot-deploy-memorypipeline.yml
@@ -49,13 +49,13 @@ jobs:
         run: ls -R
         working-directory: "${{ github.workspace }}/${{inputs.ARTIFACT_NAME}}"
 
-      - name: Azure login
-        uses: azure/login@v1
-        with:
-          client-id: ${{secrets.AZURE_CLIENT_ID}}
-          tenant-id: ${{secrets.AZURE_TENANT_ID}}
-          subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}}
-          enable-AzPSSession: false
+      - name: Login to Azure
+        env:
+          AZURE_APP_ID_URI: ${{ secrets.AZURE_CLIENT_ID }}
+          AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+        run: |
+          az login --service-principal --username "$AZURE_APP_ID_URI" --password "$AZURE_CLIENT_SECRET" --tenant "$AZURE_TENANT_ID"
 
       - name: Get app name
         run: |

diff --git a/scripts/deploy/deploy-azure.sh b/scripts/deploy/deploy-azure.sh
@@ -193,7 +193,7 @@ az account set -s "$SUBSCRIPTION"
 : "${WEB_APP_SVC_SKU:="B1"}"
 : "${WEB_APP_REGION:="westus2"}"
 : "${AZURE_AD_INSTANCE:="https://login.microsoftonline.com"}"
-: "${MEMORY_STORE:="AzureCognitiveSearch"}"
+: "${MEMORY_STORE:="Qdrant"}"
 : "${NO_COSMOS_DB:=false}"
 : "${NO_SPEECH_SERVICES:=false}"
 

diff --git a/scripts/deploy/main.bicep b/scripts/deploy/main.bicep
@@ -678,7 +678,7 @@ resource appServicePlanQdrant 'Microsoft.Web/serverfarms@2022-03-01' = if (memor
   location: location
   kind: 'linux'
   sku: {
-    name: 'P1v3'
+    name: 'B1'
   }
   properties: {
     reserved: true

diff --git a/scripts/deploy/main.json b/scripts/deploy/main.json
@@ -844,7 +844,7 @@
       "location": "[parameters('location')]",
       "kind": "linux",
       "sku": {
-        "name": "P1v3"
+        "name": "B1"
       },
       "properties": {
         "reserved": true
@@ -1327,7 +1327,7 @@
       "name": "[format('cog-speech-{0}', variables('uniqueName'))]",
       "location": "[parameters('location')]",
       "sku": {
-        "name": "S0"
+        "name": "F0"
       },
       "kind": "SpeechServices",
       "identity": {
@@ -1347,7 +1347,7 @@
       "name": "[format('cog-ocr-{0}', variables('uniqueName'))]",
       "location": "[parameters('location')]",
       "sku": {
-        "name": "S0"
+        "name": "F0"
       },
       "kind": "FormRecognizer",
       "identity": {