Merge pull request #280 from microsoft/az-search-params

refactor - azd pipeline changes

Author: blessing-sanusi

.github/workflows/azure-dev.yml

@@ -1,9 +1,6 @@
 name: Azure Template Validation
 on:
-  push:
-    branches:
-      - dev
-      - main 
+   workflow_dispatch: 
 
 permissions:
   contents: read
@@ -20,20 +17,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # Step 2: Set up Azure CLI
-      - name: Setup Azure CLI
-        uses: azure/cli-action@v1
-
-      # Step 3: Login to Azure using Service Principal
-      - name: Login with Azure using Service Principal
-        uses: azure/login@v1
-        with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
-
-
-      # Step 4: Validate the Azure template using microsoft/template-validation-action
+      # Step 2: Validate the Azure template using microsoft/template-validation-action
       - name: Validate Azure Template
         uses: microsoft/[email protected]
         id: validation
@@ -45,6 +29,6 @@ jobs:
           AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # Step 5: Print the result of the validation
+      # Step 3: Print the result of the validation
       - name: Print result
         run: cat ${{ steps.validation.outputs.resultFile }}

azure.yaml

@@ -2,6 +2,10 @@ environment:
   name: Document-generation-solution-accelerator
   location: eastus
 
+name: Document-generation-solution-accelerator
+metadata:
+  template: [email protected]
+
 parameters:
   solutionPrefix:
     type: string

infra/deploy_app_service.bicep

@@ -42,7 +42,10 @@ param azureOpenAIApiVersion string
 param AZURE_OPENAI_RESOURCE string = ''
 param USE_CHAT_HISTORY_ENABLED string = ''
 param aiSearchService string
-param keyvaultName string
+
+@description('Azure Search Key')
+@secure()
+param AzureSearchKey string = ''
 
 @description('Enable Semantic Search in Azure Search')
 param AzureSearchUseSemanticSearch string = ''
@@ -138,7 +141,7 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
         }
         {
           name: 'AZURE_SEARCH_KEY'
-          value:keyvaultName
+          value:AzureSearchKey
         }
         {
           name: 'AZURE_SEARCH_USE_SEMANTIC_SEARCH'

infra/main.bicep

@@ -376,6 +376,8 @@ module appserviceModule 'deploy_app_service.bicep' = {
     // identity:managedIdentityModule.outputs.managedIdentityOutput.id
     solutionName: solutionPrefix
     // solutionLocation: solutionLocation
+    aiSearchService: aifoundry.outputs.aiSearchService
+    AzureSearchKey: keyVault.getSecret('AZURE-SEARCH-KEY')
     AzureOpenAIEndpoint:aifoundry.outputs.aiServicesTarget
     AzureOpenAIModel: gptModelName //'gpt-4o-mini'
     AzureOpenAIKey:keyVault.getSecret('AZURE-OPENAI-KEY')