Skip to content

Adding explicit json output to az commands #409 #513

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

Merged
ganga1980 merged 1 commit into from
Mar 20, 2021
Merged

Adding explicit json output to az commands #409 #513

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 scripts/onboarding/managed/disable-monitoring.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ remove_monitoring_tags()

# validate cluster identity for Azure Arc enabled Kubernetes cluster
if [ "$isArcK8sCluster" = true ] ; then
identitytype=$(az resource show -g ${clusterResourceGroup} -n ${clusterName} --resource-type $resourceProvider --query identity.type)
identitytype=$(az resource show -g ${clusterResourceGroup} -n ${clusterName} --resource-type $resourceProvider --query identity.type -o json)
identitytype=$(echo $identitytype | tr "[:upper:]" "[:lower:]" | tr -d '"')
echo "cluster identity type:" $identitytype
if [[ "$identitytype" != "systemassigned" ]]; then
Expand Down
10 changes: 5 additions & 5 deletions scripts/onboarding/managed/enable-monitoring.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ validate_cluster_identity() {
local rgName="$(echo ${1})"
local clusterName="$(echo ${2})"

local identitytype=$(az resource show -g ${rgName} -n ${clusterName} --resource-type $resourceProvider --query identity.type)
local identitytype=$(az resource show -g ${rgName} -n ${clusterName} --resource-type $resourceProvider --query identity.type -o json)
identitytype=$(echo $identitytype | tr "[:upper:]" "[:lower:]" | tr -d '"')
echo "cluster identity type:" $identitytype

Expand Down Expand Up @@ -454,7 +454,7 @@ create_default_log_analytics_workspace() {
echo "using existing default workspace:"$workspaceName
fi

workspaceResourceId=$(az resource show -g $workspaceResourceGroup -n $workspaceName --resource-type $workspaceResourceProvider --query id)
workspaceResourceId=$(az resource show -g $workspaceResourceGroup -n $workspaceName --resource-type $workspaceResourceProvider --query id -o json)
workspaceResourceId=$(echo $workspaceResourceId | tr -d '"')
echo "workspace resource Id: ${workspaceResourceId}"
}
Expand All @@ -477,12 +477,12 @@ get_workspace_guid_and_key() {
local wsName="$(echo ${resourceId} | cut -d'/' -f9)"

# get the workspace guid
workspaceGuid=$(az resource show -g $rgName -n $wsName --resource-type $workspaceResourceProvider --query properties.customerId)
workspaceGuid=$(az resource show -g $rgName -n $wsName --resource-type $workspaceResourceProvider --query properties.customerId -o json)
workspaceGuid=$(echo $workspaceGuid | tr -d '"')
echo "workspaceGuid:"$workspaceGuid

echo "getting workspace primaryshared key"
workspaceKey=$(az rest --method post --uri $workspaceResourceId/sharedKeys?api-version=2015-11-01-preview --query primarySharedKey)
workspaceKey=$(az rest --method post --uri $workspaceResourceId/sharedKeys?api-version=2015-11-01-preview --query primarySharedKey -o json)
workspaceKey=$(echo $workspaceKey | tr -d '"')
}

Expand Down Expand Up @@ -621,7 +621,7 @@ else
set_azure_subscription $workspaceSubscriptionId
fi

workspaceRegion=$(az resource show --ids ${workspaceResourceId} --query location)
workspaceRegion=$(az resource show --ids ${workspaceResourceId} --query location -o json)
workspaceRegion=$(echo $workspaceRegion | tr -d '"')
echo "Workspace Region:"$workspaceRegion
fi
Expand Down
4 changes: 2 additions & 2 deletions scripts/onboarding/managed/upgrade-monitoring.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ validate_cluster_identity() {
local rgName="$(echo ${1})"
local clusterName="$(echo ${2})"

local identitytype=$(az resource show -g ${rgName} -n ${clusterName} --resource-type $resourceProvider --query identity.type)
local identitytype=$(az resource show -g ${rgName} -n ${clusterName} --resource-type $resourceProvider --query identity.type -o json)
identitytype=$(echo $identitytype | tr "[:upper:]" "[:lower:]" | tr -d '"')
echo "cluster identity type:" $identitytype

Expand All @@ -216,7 +216,7 @@ validate_cluster_identity() {

validate_monitoring_tags() {
echo "get loganalyticsworkspaceResourceId tag on to cluster resource"
logAnalyticsWorkspaceResourceIdTag=$(az resource show --query tags.logAnalyticsWorkspaceResourceId -g $clusterResourceGroup -n $clusterName --resource-type $resourceProvider)
logAnalyticsWorkspaceResourceIdTag=$(az resource show --query tags.logAnalyticsWorkspaceResourceId -g $clusterResourceGroup -n $clusterName --resource-type $resourceProvider -o json)
echo "configured log analytics workspace: ${logAnalyticsWorkspaceResourceIdTag}"
echo "successfully got logAnalyticsWorkspaceResourceId tag on the cluster resource"
if [ -z "$logAnalyticsWorkspaceResourceIdTag" ]; then
Expand Down