From 1599d6c8a045cb8b79c5dce36fb2f46fac06cc15 Mon Sep 17 00:00:00 2001 From: XiaoYun Zhang Date: Thu, 22 Feb 2024 14:13:17 -0800 Subject: [PATCH 1/7] fix pipeline --- .github/workflows/azure-dev.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml index b6b65e5b..4020eaf0 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -35,9 +35,11 @@ env: AZURE_REDIS_CACHE: ${{ vars.AZURE_REDIS_CACHE }} AZURE_REDIS_CACHE_RESOURCE_GROUP: ${{ vars.AZURE_REDIS_CACHE_RESOURCE_GROUP }} AZURE_PRINCIPAL_TYPE: 'ServicePrincipal' + dotEnvString: ${{ secrets.DOTENVSTRING }} jobs: build: + environment: azure-search runs-on: ubuntu-latest container: image: mcr.microsoft.com/azure-dev-cli-apps:latest @@ -78,18 +80,15 @@ jobs: shell: pwsh env: AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }} - + - name: create azure-search-csharp env + run: | + azd env new azure-search-csharp + - name: write .env file + run: | + touch .azure/azure-search-csharp/.env + echo ${{ env.dotEnvString }} > .azure/azure-search-csharp/.env - name: Provision Infrastructure run: azd provision --no-prompt --debug - env: - AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }} - AZURE_LOCATION: ${{ vars.AZURE_LOCATION }} - AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }} - AZURE_TAGS: ${{ secrets.AZURE_TAGS }} - name: Deploy Application run: azd deploy --no-prompt --debug - env: - AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }} - AZURE_LOCATION: ${{ vars.AZURE_LOCATION }} - AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }} From 26786f394dbdbe70266594d1912119bddb52270e Mon Sep 17 00:00:00 2001 From: XiaoYun Zhang Date: Thu, 22 Feb 2024 14:50:03 -0800 Subject: [PATCH 2/7] update' --- .github/workflows/azure-dev.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml index 4020eaf0..aa3ac124 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -66,6 +66,9 @@ jobs: --federated-credential-provider "github" ` --tenant-id "$Env:AZURE_TENANT_ID" --debug shell: pwsh + env: + AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} + AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} - name: Log in with Azure (Client Credentials) if: ${{ env.AZURE_CREDENTIALS != '' }} From 6823eeb8e91ec98843725814682865365a355000 Mon Sep 17 00:00:00 2001 From: XiaoYun Zhang Date: Thu, 22 Feb 2024 14:57:28 -0800 Subject: [PATCH 3/7] fix pipeline --- .github/workflows/azure-dev.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml index aa3ac124..474af4d3 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -1,3 +1,4 @@ +name: Deploy to Azure on: workflow_dispatch: inputs: @@ -86,10 +87,15 @@ jobs: - name: create azure-search-csharp env run: | azd env new azure-search-csharp - - name: write .env file + + - name: write each variable from .env using azd env set run: | - touch .azure/azure-search-csharp/.env - echo ${{ env.dotEnvString }} > .azure/azure-search-csharp/.env + $envs = $Env:dotEnvString -split "\n" + foreach ($env in $envs) { + $keyValue = $env -split "="; + azd env set $keyValue[0] $keyValue[1]; + } + - name: Provision Infrastructure run: azd provision --no-prompt --debug From f04349b7932feb4c5f52aa38624b962bd5beab5a Mon Sep 17 00:00:00 2001 From: XiaoYun Zhang Date: Thu, 22 Feb 2024 15:03:32 -0800 Subject: [PATCH 4/7] fix pipeline --- .github/workflows/azure-dev.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml index 474af4d3..f564f4c8 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -87,14 +87,18 @@ jobs: - name: create azure-search-csharp env run: | azd env new azure-search-csharp - + - name: write each variable from .env using azd env set run: | $envs = $Env:dotEnvString -split "\n" foreach ($env in $envs) { + echo $env $keyValue = $env -split "="; azd env set $keyValue[0] $keyValue[1]; } + shell: pwsh + env: + dotEnvString: ${{ secrets.DOTENVSTRING }} - name: Provision Infrastructure run: azd provision --no-prompt --debug From d235c0c9a338cfd978fc4b8150ff1b2c0ad7e30d Mon Sep 17 00:00:00 2001 From: XiaoYun Zhang Date: Thu, 22 Feb 2024 16:29:57 -0800 Subject: [PATCH 5/7] fix pipeline --- .github/workflows/azure-dev.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml index f564f4c8..e1d9c6b7 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -96,12 +96,15 @@ jobs: $keyValue = $env -split "="; azd env set $keyValue[0] $keyValue[1]; } + + # cat .env + azd env get-values shell: pwsh env: dotEnvString: ${{ secrets.DOTENVSTRING }} - name: Provision Infrastructure - run: azd provision --no-prompt --debug + run: azd provision --no-prompt - name: Deploy Application run: azd deploy --no-prompt --debug From bfee3cd403f903d20120c0a5d706159062a54738 Mon Sep 17 00:00:00 2001 From: XiaoYun Zhang Date: Thu, 22 Feb 2024 16:35:22 -0800 Subject: [PATCH 6/7] fix pipeline --- .github/workflows/azure-dev.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml index e1d9c6b7..5525f416 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -93,8 +93,12 @@ jobs: $envs = $Env:dotEnvString -split "\n" foreach ($env in $envs) { echo $env - $keyValue = $env -split "="; - azd env set $keyValue[0] $keyValue[1]; + $keyValue = $env -split "=" + $keyName = $keyValue[0] + + # keyvalue will be the second element without quotes + $keyValue = $keyValue[1].Trim('"') + azd env set $keyName $keyValue } # cat .env From 0409f24fbe8c9edbc98dda1d83f1532c3a8869ad Mon Sep 17 00:00:00 2001 From: XiaoYun Zhang Date: Thu, 22 Feb 2024 16:40:44 -0800 Subject: [PATCH 7/7] fix pipeline --- infra/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/main.bicep b/infra/main.bicep index 1700ca7f..49e004e7 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -158,7 +158,7 @@ param webImageName string = '' param useAOAI bool @description('OpenAI API Key') -param openAIApiKey string +param openAIApiKey string = '' @description('OpenAI Model') param openAiChatGptDeployment string