fixup! Move to Resource Module

Author: Sheyla Trudo

.pipelines/templates/create-or-update-resource.steps.yaml

@@ -143,10 +143,7 @@ steps:
             --azure-rm-subscription-name "$SUBSCRIPTION_NAME" \
             --azure-rm-tenant-id "$SERVICECONNECTION_TENANTID"\
             --name "SERVICECONNECTION_NAME" \
-            --project "One" \
-            --tags "$ACNCI_BUILDTAG_DEFINITIONID"="$SYSTEM_DEFINITIONID" \
-                   "$ACNCI_BUILDTAG_CREATEDBYBUILDID"="$BUILD_BUILDID" \
-                   "$ACNCI_BUILDTAG_CREATEDBYAPPID"="$servicePrincipalId"
+            --project "One"
 
 
 

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

@@ -52,6 +52,7 @@ steps:
     ${{ elseif eq(parameters.resourceType, 'serviceconnection') }}:
       # Allows use of az devops commands
       AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
+      SERVICECONNECTION_NAME: ${{ parameters.inputs.serviceConnectionName }}
 
   inputs:
     azureSubscription: ${{ parameters.serviceConnection }}
@@ -172,16 +173,12 @@ steps:
         set -eu
         [[ -n $SYSTEM_DEBUG ]] && [[ $SYSTEM_DEBUG =~ $IS_TRUE ]] && set -x || set +x
 
-        R_QUERY="[? tags.\""$BUILDTAG_DEFINITIONID"\" && tags.\""$BUILDTAG_CREATEDBYAPPID"\"]"
+        R_QUERY="[? name == '$SERVICECONNECTION_NAME' ]"
         # JSON of Returned Results
         R_LIST=$(az devops service-endpoint list \
-          --query "$R_QUERY" -ojson | \
-          jq -rc \
-            --arg BUILDTAG_CREATEDBYAPPID "$BUILDTAG_CREATEDBYAPPID" \
-            --arg APPID "$servicePrincipalId" \
-            --arg BUILDTAG_DEFINITIONID "$BUILDTAG_DEFINITIONID" \
-            --arg DEFINITIONID "$SYSTEM_DEFINITIONID" \
-          '[ .[] | select(.tags[$BUILDTAG_DEFINITIONID] == $DEFINITIONID ) | select( .tags[$BUILDTAG_CREATEDBYAPPID] == $APPID) ]')
+          --query "$R_QUERY" \
+          -ojson | \
+        jq -rc '.')
         DEF=$(echo "$R_LIST" | jq -rc .[0])
         DEFS_FOUND=$(echo "$R_LIST" | jq length)