From 8c17ce32532e7ae3134619f2b9c05da75024f04f Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Fri, 11 Oct 2024 15:42:06 -0700 Subject: [PATCH 1/2] Configure Azure Developer Pipeline From d4de27d65c22b4ff241c5ba09d99faf393c3e637 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Fri, 11 Oct 2024 15:47:03 -0700 Subject: [PATCH 2/2] Fix it for GitHub --- infra/main.bicep | 7 ++++++- infra/main.parameters.json | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/infra/main.bicep b/infra/main.bicep index 2652dfc..0783020 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -53,6 +53,11 @@ param gptDeploymentCapacity int = 30 @description('Id of the user or app to assign application roles') param principalId string = '' +@description('Non-empty if the deployment is running on GitHub Actions') +param runningOnGitHub string = '' + +var principalType = empty(runningOnGitHub) ? 'User' : 'ServicePrincipal' + var resourceToken = toLower(uniqueString(subscription().id, environmentName, location)) var prefix = '${environmentName}${resourceToken}' var tags = { 'azd-env-name': environmentName } @@ -97,7 +102,7 @@ module openAi 'br/public:avm/res/cognitive-services/account:0.7.1' = { { principalId: principalId roleDefinitionIdOrName: 'Cognitive Services OpenAI User' - principalType: 'User' + principalType: principalType } ] } diff --git a/infra/main.parameters.json b/infra/main.parameters.json index 7896fc2..e64bb88 100644 --- a/infra/main.parameters.json +++ b/infra/main.parameters.json @@ -10,6 +10,9 @@ }, "principalId": { "value": "${AZURE_PRINCIPAL_ID}" + }, + "runningOnGitHub": { + "value": "${GITHUB_ACTIONS}" } } }