Skip to content

Commit d56f098

Browse files
fix: Auth type set default to rbac and removed resource group from bicep (#1538)
1 parent 1ae5e9c commit d56f098

File tree

4 files changed

+172
-181
lines changed

4 files changed

+172
-181
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ jobs:
5252
env:
5353
AZURE_ENV_NAME: ${{ github.run_id }}
5454
AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
55-
AZURE_RESOURCE_GROUP: ${{ vars.AZURE_RESOURCE_GROUP }}
5655
with:
5756
imageName: ghcr.io/azure-samples/chat-with-your-data-solution-accelerator
5857
cacheFrom: ghcr.io/azure-samples/chat-with-your-data-solution-accelerator
@@ -66,15 +65,12 @@ jobs:
6665
AZURE_SUBSCRIPTION_ID
6766
AZURE_ENV_NAME
6867
AZURE_LOCATION
69-
AZURE_RESOURCE_GROUP
70-
7168
- name: Tidy up
7269
uses: devcontainers/[email protected]
7370
if: always()
7471
env:
7572
AZURE_ENV_NAME: ${{ github.run_id }}
7673
AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
77-
AZURE_RESOURCE_GROUP: ${{ vars.AZURE_RESOURCE_GROUP }}
7874
with:
7975
push: never
8076
imageName: ghcr.io/azure-samples/chat-with-your-data-solution-accelerator
@@ -87,8 +83,7 @@ jobs:
8783
AZURE_SUBSCRIPTION_ID
8884
AZURE_ENV_NAME
8985
AZURE_LOCATION
90-
AZURE_RESOURCE_GROUP
91-
86+
9287
- name: Send Notification on Failure
9388
if: failure()
9489
run: |

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,10 @@ azd-login: ## 🔑 Login to Azure with azd and a SPN
5757
@echo -e "\e[34m$@\e[0m" || true
5858
@azd auth login --client-id ${AZURE_CLIENT_ID} --client-secret ${AZURE_CLIENT_SECRET} --tenant-id ${AZURE_TENANT_ID}
5959

60-
az-login: ## 🔑 Login to Azure with az and a SPN
61-
az login --service-principal -u ${AZURE_CLIENT_ID} -p ${AZURE_CLIENT_SECRET} --tenant ${AZURE_TENANT_ID}
62-
63-
deploy: azd-login az-login ## 🚀 Deploy everything to Azure
60+
deploy: azd-login ## 🚀 Deploy everything to Azure
6461
@echo -e "\e[34m$@\e[0m" || true
6562
@azd env new ${AZURE_ENV_NAME}
6663
@azd env set AZURE_APP_SERVICE_HOSTING_MODEL code --no-prompt
67-
@az group create --name ${AZURE_RESOURCE_GROUP} --location ${AZURE_LOCATION}
6864
@azd provision --no-prompt
6965
@azd deploy web --no-prompt
7066
@azd deploy function --no-prompt

infra/main.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ param principalId string = ''
277277
'rbac'
278278
'keys'
279279
])
280-
param authType string = 'keys'
280+
param authType string = 'rbac'
281281

282282
@description('Hosting model for the web apps. Containers are prebuilt and can be deployed faster, but code allows for more customization.')
283283
@allowed([

0 commit comments

Comments
 (0)