fixup! User Service Connections

Author: Sheyla Trudo

.pipelines/templates/artifact-storage.steps.yaml

@@ -86,15 +86,6 @@ steps:
 
 ## MI Service Connection
 
-- template: get-resources.steps.yaml
-  parameters:
-    resourceType: serviceconnection
-    serviceConnection: $(ACN_TEST_SERVICE_CONNECTION)
-    inputs: 
-      serviceConnectionName: $(ACNCI_BUILDUSER_SERVICECONNECTION_NAME)
-      resourceGroupName: $(resourcegroups.ACNCI_BUILD_RESOURCEGROUP)
-      buildTagDefinitionIdKey: $(ACNCI_BUILDTAG_DEFINITIONID)
-      buildTagCreatedByAppIdKey: $(ACNCI_BUILDTAG_CREATEDBYAPPID)
 #        SERVICECONNECTION_PRINCIPALID: ${{ parameters.inputs.serviceConnectionPrincipalId }}
 #        SUBSCRIPTION_ID: ${{ parameters.inputs.subscriptionId }}
 #        SUBSCRIPTION_NAME: ${{ parameters.inputs.subscriptionName }}
@@ -200,6 +191,7 @@ steps:
       serviceConnectionName: $(ACNCI_BUILDUSER_SERVICECONNECTION_NAME)
       resourceGroupName: $(resourcegroups.ACNCI_BUILD_RESOURCEGROUP)
       buildTagDefinitionIdKey: $(ACNCI_BUILDTAG_DEFINITIONID)
+      buildTagCreatedByAppIdKey: $(ACNCI_BUILDTAG_CREATEDBYAPPID)
 
 - task: AzureCLI@2
   name: serviceconnection

.pipelines/templates/get-resources.steps.yaml

@@ -186,21 +186,18 @@ steps:
         set -eu
         [[ -n $SYSTEM_DEBUG ]] && [[ $SYSTEM_DEBUG =~ $IS_TRUE ]] && set -x || set +x
 
-        R_QUERY="[? name == '$SERVICECONNECTION_NAME' ]"
-        echo $R_QUERY
-
-        az devops service-endpoint list \
+        az devops service-endpoint show \
+          --id "$SERVICECONNECTION_ID" \
           --org "https://dev.azure.com/msazure/" \
           --project One \
-          --query "$R_QUERY" \
-          -ojson
+          -ojson --debug
         # JSON of Returned Results
-        R_LIST=$(az devops service-endpoint list \
+        R_LIST=$(az devops service-endpoint show \
+          --id "$SERVICECONNECTION_ID" \
           --org "https://dev.azure.com/msazure/" \
           --project One \
-          --query "$R_QUERY" \
           -ojson | \
-          jq -rc '.')
+          jq -rc '[.]')
         DEFS_FOUND=$(echo "$R_LIST" | jq length)
         echo "$R_LIST" | jq '.'