Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace objectId with id for az cli 2.37 #1185

Merged
merged 1 commit into from
May 30, 2022
+16 −16
Merged

Replace objectId with id for az cli 2.37 #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
version: '3.7'
services:
rover:
image: aztfmod/rover-preview:1.2.1-2205.251610
image: aztfmod/rover-preview:1.2.1-2205.300342
user: vscode

labels:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/standalone-regressor-tf100.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}}

container:
image: aztfmod/rover-preview:1.2.1-2205.251610
image: aztfmod/rover-preview:1.2.1-2205.300342
options: --user 0

steps:
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
needs: [testcases]

container:
image: aztfmod/rover-preview:1.2.1-2205.251610
image: aztfmod/rover-preview:1.2.1-2205.300342
options: --user 0

steps:
Expand All @@ -178,7 +178,7 @@ jobs:
run: |
for i in `az monitor diagnostic-settings subscription list -o tsv --query "value[?contains(name, '${{ github.run_id }}' )].name"`; do echo "purging subscription diagnostic-settings: $i" && $(az monitor diagnostic-settings subscription delete --name $i --yes); done
for i in `az monitor log-profiles list -o tsv --query '[].name'`; do az monitor log-profiles delete --name $i; done
for i in `az ad group list --query "[?contains(displayName, '${{ github.run_id }}')].objectId" -o tsv`; do echo "purging Azure AD group: $i" && $(az ad group delete --verbose --group $i || true); done
for i in `az ad group list --query "[?contains(displayName, '${{ github.run_id }}')].id" -o tsv`; do echo "purging Azure AD group: $i" && $(az ad group delete --verbose --group $i || true); done
for i in `az ad app list --query "[?contains(displayName, '${{ github.run_id }}')].appId" -o tsv`; do echo "purging Azure AD app: $i" && $(az ad app delete --verbose --id $i || true); done
for i in `az keyvault list-deleted --query "[?tags.testing_job_id=='${{ github.run_id }}'].name" -o tsv`; do az keyvault purge --name $i; done
for i in `az group list --query "[?tags.testing_job_id=='${{ github.run_id }}'].name" -o tsv`; do echo "purging resource group: $i" && $(az group delete -n $i -y --no-wait || true); done
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/standalone-regressor-tf15.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}}

container:
image: aztfmod/rover-preview:0.15.5-2205.251610
image: aztfmod/rover-preview:0.15.5-2205.300342
options: --user 0

steps:
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
needs: [testcases]

container:
image: aztfmod/rover-preview:0.15.5-2205.251610
image: aztfmod/rover-preview:0.15.5-2205.300342
options: --user 0

steps:
Expand All @@ -178,7 +178,7 @@ jobs:
run: |
for i in `az monitor diagnostic-settings subscription list -o tsv --query "value[?contains(name, '${{ github.run_id }}' )].name"`; do echo "purging subscription diagnostic-settings: $i" && $(az monitor diagnostic-settings subscription delete --name $i --yes); done
for i in `az monitor log-profiles list -o tsv --query '[].name'`; do az monitor log-profiles delete --name $i; done
for i in `az ad group list --query "[?contains(displayName, '${{ github.run_id }}')].objectId" -o tsv`; do echo "purging Azure AD group: $i" && $(az ad group delete --verbose --group $i || true); done
for i in `az ad group list --query "[?contains(displayName, '${{ github.run_id }}')].id" -o tsv`; do echo "purging Azure AD group: $i" && $(az ad group delete --verbose --group $i || true); done
for i in `az ad app list --query "[?contains(displayName, '${{ github.run_id }}')].appId" -o tsv`; do echo "purging Azure AD app: $i" && $(az ad app delete --verbose --id $i || true); done
for i in `az keyvault list-deleted --query "[?tags.testing_job_id=='${{ github.run_id }}'].name" -o tsv`; do az keyvault purge --name $i; done
for i in `az group list --query "[?tags.testing_job_id=='${{ github.run_id }}'].name" -o tsv`; do echo "purging resource group: $i" && $(az group delete -n $i -y --no-wait || true); done
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/standalone-tf100.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}}

container:
image: aztfmod/rover-preview:1.2.1-2205.251610
image: aztfmod/rover-preview:1.2.1-2205.300342
options: --user 0

steps:
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
needs: [testcases]

container:
image: aztfmod/rover-preview:1.2.1-2205.251610
image: aztfmod/rover-preview:1.2.1-2205.300342
options: --user 0

steps:
Expand All @@ -149,7 +149,7 @@ jobs:
run: |
for i in `az monitor diagnostic-settings subscription list -o tsv --query "value[?contains(name, '${{ github.run_id }}' )].name"`; do echo "purging subscription diagnostic-settings: $i" && $(az monitor diagnostic-settings subscription delete --name $i --yes); done
for i in `az monitor log-profiles list -o tsv --query '[].name'`; do az monitor log-profiles delete --name $i; done
for i in `az ad group list --query "[?contains(displayName, '${{ github.run_id }}')].objectId" -o tsv`; do echo "purging Azure AD group: $i" && $(az ad group delete --verbose --group $i || true); done
for i in `az ad group list --query "[?contains(displayName, '${{ github.run_id }}')].id" -o tsv`; do echo "purging Azure AD group: $i" && $(az ad group delete --verbose --group $i || true); done
for i in `az ad app list --query "[?contains(displayName, '${{ github.run_id }}')].appId" -o tsv`; do echo "purging Azure AD app: $i" && $(az ad app delete --verbose --id $i || true); done
for i in `az keyvault list-deleted --query "[?tags.testing_job_id=='${{ github.run_id }}'].name" -o tsv`; do az keyvault purge --name $i; done
for i in `az group list --query "[?tags.testing_job_id=='${{ github.run_id }}'].name" -o tsv`; do echo "purging resource group: $i" && $(az group delete -n $i -y --no-wait || true); done
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/standalone-tf15.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}}

container:
image: aztfmod/rover-preview:0.15.5-2205.251610
image: aztfmod/rover-preview:0.15.5-2205.300342
options: --user 0

steps:
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
needs: [testcases]

container:
image: aztfmod/rover-preview:0.15.5-2205.251610
image: aztfmod/rover-preview:0.15.5-2205.300342
options: --user 0

steps:
Expand All @@ -143,7 +143,7 @@ jobs:
run: |
for i in `az monitor diagnostic-settings subscription list -o tsv --query "value[?contains(name, '${{ github.run_id }}' )].name"`; do echo "purging subscription diagnostic-settings: $i" && $(az monitor diagnostic-settings subscription delete --name $i --yes); done
for i in `az monitor log-profiles list -o tsv --query '[].name'`; do az monitor log-profiles delete --name $i; done
for i in `az ad group list --query "[?contains(displayName, '${{ github.run_id }}')].objectId" -o tsv`; do echo "purging Azure AD group: $i" && $(az ad group delete --verbose --group $i || true); done
for i in `az ad group list --query "[?contains(displayName, '${{ github.run_id }}')].id" -o tsv`; do echo "purging Azure AD group: $i" && $(az ad group delete --verbose --group $i || true); done
for i in `az ad app list --query "[?contains(displayName, '${{ github.run_id }}')].appId" -o tsv`; do echo "purging Azure AD app: $i" && $(az ad app delete --verbose --id $i || true); done
for i in `az keyvault list-deleted --query "[?tags.testing_job_id=='${{ github.run_id }}'].name" -o tsv`; do az keyvault purge --name $i; done
for i in `az group list --query "[?tags.testing_job_id=='${{ github.run_id }}'].name" -o tsv`; do echo "purging resource group: $i" && $(az group delete -n $i -y --no-wait || true); done
Expand Down
2 changes: 1 addition & 1 deletion modules/azuread/applications/scripts/grant_consent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [ "${user_type}" = "user" ]; then

az ad app permission admin-consent --id ${applicationId}
else
resourceId=$(az ad sp show --id "${resourceAppId}" --query "objectId" -o tsv)
resourceId=$(az ad sp show --id "${resourceAppId}" --query "id" -o tsv)
echo " -resourceId: ${resourceId}"

microsoft_graph_endpoint=$(az cloud show | jq -r ".endpoints.microsoftGraphResourceId")
Expand Down
2 changes: 1 addition & 1 deletion modules/azuread/service_principal/scripts/grant_consent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if [ "${user_type}" = "user" ]; then
az ad app permission admin-consent --id ${application_id}

else
resourceId=$(az ad sp show --id "${resourceAppId}" --query "objectId" -o tsv)
resourceId=$(az ad sp show --id "${resourceAppId}" --query "id" -o tsv)
echo " -resourceId: ${resourceId}"

microsoft_graph_endpoint=$(az cloud show | jq -r ".endpoints.microsoftGraphResourceId")
Expand Down
2 changes: 1 addition & 1 deletion modules/compute/aks/scripts/grant_consent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [ ${user_type} == "user" ]; then

else

resourceId=$(az ad sp show --id "${graphId}" --query "objectId" -o tsv)
resourceId=$(az ad sp show --id "${graphId}" --query "id" -o tsv)
echo " -resourceId: ${resourceId}"

URI=$(echo "https://graph.microsoft.com/beta/servicePrincipals/${resourceId}/appRoleAssignments") && echo " - uri: $URI"
Expand Down