@@ -122,11 +122,6 @@ steps:
122122 "$ACNCI_BUILDTAG_CREATEDBYBUILDID"="$BUILD_BUILDID" \
123123 "$ACNCI_BUILDTAG_CREATEDBYAPPID"="$servicePrincipalId"
124124 #--enable-files-aadds true
125- az role assignment create \
126- --role "Contributor" \
127- --assignee-principal-type ServicePrincipal \
128- --assignee-object-id "$SP_APP_OID" \
129- --scope "$RG_ID"/providers/Microsoft.Storage/storageAccounts/"$SA_NAME"
130125 env :
131126 ACNCI_UNIQUE_ID : $(ACNCI_UNIQUE_ID)
132127 RG_NAME : $(resourcegroups.ACNCI_BUILD_RESOURCEGROUP)
@@ -187,6 +182,9 @@ steps:
187182 # Storage Account Location
188183 SA_LOCATION=$(echo "$SA_DATA" | jq -r '.location')
189184 echo >&2 "##vso[task.setvariable variable=ACNCI_STORAGEACCOUNT_LOCATION;isoutput=true]$SA_LOCATION"
185+ # - Local Use Only -
186+ # SA Object
187+ echo >&2 "##vso[task.setvariable variable=ACNCI_STORAGEACCOUNT]$SA_DATA"
190188 else
191189 echo >&2 "##[error]No storage accounts available for use."
192190 exit 1
@@ -208,7 +206,9 @@ steps:
208206 set -e
209207 [[ -n $SYSTEM_DEBUG ]] && [[ $SYSTEM_DEBUG =~ $IS_TRUE ]] && set -x || set +x
210208
211- az storage account update --user-identity-id "$servicePrincipalId" --ids "$ACNCI_STORAGEACCOUNT_ID"
209+ UPDATE_IDENTITY=$(echo "$ACNCI_STORAGEACCOUNT" | jq -r '.identity')
210+ [[ -z $UPDATE_IDENTITY ]] && \
211+ az storage account update --user-identity-id "$servicePrincipalId" --ids "$ACNCI_STORAGEACCOUNT_ID"
212212 env :
213213 ACNCI_STORAGEACCOUNT_ID : $(artifact_storage.ACNCI_STORAGEACCOUNT_ID)
214214
0 commit comments