Update logged_in_user following az cli 2.37.0

aztfmod · May 25, 2022 · a3874df · a3874df
1 parent 7d85693
commit a3874df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.devcontainer/.zshrc b/.devcontainer/.zshrc
@@ -52,7 +52,7 @@ ZSH_THEME="agnoster"
 # Uncomment the following line if you want to disable marking untracked files
 # under VCS as dirty. This makes repository status check for large repositories
 # much, much faster.
-# DISABLE_UNTRACKED_FILES_DIRTY="true"
+DISABLE_UNTRACKED_FILES_DIRTY="true"
 
 # Uncomment the following line if you want to change the command execution time
 # stamp shown in the history command output.
@@ -102,3 +102,4 @@ export LANG=en_US.UTF-8
 alias rover=/tf/rover/rover.sh
 alias t=/usr/bin/terraform
 alias k=/usr/bin/kubectl
+cd /tf/caf || true
diff --git a/scripts/functions.sh b/scripts/functions.sh
@@ -624,7 +624,7 @@ function get_logged_user_object_id {
         unset TF_VAR_logged_aad_app_objectId
 
         export ARM_TENANT_ID=$(az account show -o json --only-show-errors | jq -r .tenantId)
-        export TF_VAR_logged_user_objectId=$(az ad signed-in-user show --query objectId -o tsv --only-show-errors)
+        export TF_VAR_logged_user_objectId=$(az ad signed-in-user show --query id -o tsv --only-show-errors)
         export logged_user_upn=$(az ad signed-in-user show --query userPrincipalName -o tsv --only-show-errors)
         echo " - logged in user objectId: ${TF_VAR_logged_user_objectId} (${logged_user_upn})"