fixup! Artifacts

Author: Sheyla Trudo

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

@@ -23,9 +23,6 @@ steps:
       # App OID
       SP_APP_OID=$(az ad sp show --id "$servicePrincipalId" | jq -rc '.id') 
       # Get Subscription ID.
-      #SC_DATA_JSON=$(az devops service-endpoint list --organization msazure --project One | \
-      #  jq -rc --arg SP_APP_OID "$SP_APP_OID" \
-      #  '[ .[] | { name: .name, data: .data } | select((.serviceEndpointReferences | length) > 0) | select(.data.appObjectId == $SP_APP_OID) ][0]')
       SUBSCRIPTION_ID=$(az account show | jq -rc '.id')
 
       # Get Pipeline Build Subscriptions.
@@ -47,7 +44,9 @@ steps:
         az group create \
           --name "$RG_NAME" \
           --location "$ACNCI_SA_LOCATION" \
-          --tags Pipelines.CreatedBy="$servicePrincipalId" Pipelines.DefinitionID="$SYSTEM_DEFINITIONID"
+          --tags "$ACNCI_BUILDTAG_DEFINITIONID"="$SYSTEM_DEFINITIONID" \
+                 "$ACNCI_BUILDTAG_CREATEDBYBUILDID"="$BUILD_BUILDID" \
+                 "$ACNCI_BUILDTAG_CREATEDBYAPPID"="$servicePrincipalId"
         # Storage Blob Data Contributor on RG
         RG_ID="/subscriptions/${SUBSCRIPTION_ID}/resourceGroups/${RG_NAME}"
         az role assignment create \

.pipelines/templates/get-storage-accounts.steps.yaml

@@ -30,12 +30,15 @@ steps:
       R_QUERY="[? type == 'Microsoft.Storage/storageAccounts' && resourceGroup == '$RG_NAME']"
       az resource list \
         --query "$R_QUERY" \
-        --tag "$ACNCI_BUILDTAG_DEFINITIONID"="$SYSTEM_DEFINITIONID" -o json
+        --tag "$ACNCI_BUILDTAG_DEFINITIONID"="$SYSTEM_DEFINITIONID" \
+        --tag "$ACNCI_BUILDTAG_CREATEDBYAPPID"="$servicePrincipalId" -o json
       echo $R_QUERY
+
       # JSON of Returned Results
       R_LIST=$(az resource list \
         --query "$R_QUERY" \
-        --tag "$ACNCI_BUILDTAG_DEFINITIONID"="$SYSTEM_DEFINITIONID" -o json)
+        --tag "$ACNCI_BUILDTAG_DEFINITIONID"="$SYSTEM_DEFINITIONID" \
+        --tag "$ACNCI_BUILDTAG_CREATEDBYAPPID"="$servicePrincipalId" -o json)
       echo $R_LIST
       # Length of resource list
       R_LIST_LENGTH=$(echo "$R_LIST" | jq length)