Skip to content

Commit ce2bc49

Browse files
azd pipeline changes
1 parent 94623f3 commit ce2bc49

File tree

4 files changed

+14
-21
lines changed

4 files changed

+14
-21
lines changed

.github/workflows/azure-dev.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Azure Template Validation
22
on:
3-
push:
4-
branches:
5-
- dev
6-
- main
3+
workflow_dispatch:
74

85
permissions:
96
contents: read
@@ -20,20 +17,7 @@ jobs:
2017
- name: Checkout code
2118
uses: actions/checkout@v4
2219

23-
# Step 2: Set up Azure CLI
24-
- name: Setup Azure CLI
25-
uses: azure/cli-action@v1
26-
27-
# Step 3: Login to Azure using Service Principal
28-
- name: Login with Azure using Service Principal
29-
uses: azure/login@v1
30-
with:
31-
client-id: ${{ secrets.AZURE_CLIENT_ID }}
32-
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
33-
client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
34-
35-
36-
# Step 4: Validate the Azure template using microsoft/template-validation-action
20+
# Step 2: Validate the Azure template using microsoft/template-validation-action
3721
- name: Validate Azure Template
3822
uses: microsoft/[email protected]
3923
id: validation
@@ -45,6 +29,6 @@ jobs:
4529
AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
4630
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4731

48-
# Step 5: Print the result of the validation
32+
# Step 3: Print the result of the validation
4933
- name: Print result
5034
run: cat ${{ steps.validation.outputs.resultFile }}

azure.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ environment:
22
name: Document-generation-solution-accelerator
33
location: eastus
44

5+
name: Document-generation-solution-accelerator
6+
metadata:
7+
8+
59
parameters:
610
solutionPrefix:
711
type: string

infra/deploy_app_service.bicep

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ param azureOpenAIApiVersion string
4242
param AZURE_OPENAI_RESOURCE string = ''
4343
param USE_CHAT_HISTORY_ENABLED string = ''
4444
param aiSearchService string
45-
param keyvaultName string
45+
46+
@description('Azure Search Key')
47+
@secure()
48+
param AzureSearchKey string = ''
4649

4750
@description('Enable Semantic Search in Azure Search')
4851
param AzureSearchUseSemanticSearch string = ''
@@ -138,7 +141,7 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
138141
}
139142
{
140143
name: 'AZURE_SEARCH_KEY'
141-
value:keyvaultName
144+
value:AzureSearchKey
142145
}
143146
{
144147
name: 'AZURE_SEARCH_USE_SEMANTIC_SEARCH'

infra/main.bicep

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,8 @@ module appserviceModule 'deploy_app_service.bicep' = {
376376
// identity:managedIdentityModule.outputs.managedIdentityOutput.id
377377
solutionName: solutionPrefix
378378
// solutionLocation: solutionLocation
379+
aiSearchService: aifoundry.outputs.aiSearchService
380+
AzureSearchKey: keyVault.getSecret('AZURE-SEARCH-KEY')
379381
AzureOpenAIEndpoint:aifoundry.outputs.aiServicesTarget
380382
AzureOpenAIModel: gptModelName //'gpt-4o-mini'
381383
AzureOpenAIKey:keyVault.getSecret('AZURE-OPENAI-KEY')

0 commit comments

Comments
 (0)