fixup! Move to Resource Module

Author: Sheyla Trudo

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

@@ -149,7 +149,7 @@ steps:
     resourceType: roledefinition
     serviceConnection: $(ACN_TEST_SERVICE_CONNECTION)
     inputs: 
-      roleDefinitionName: $(ACNCI_BUILDUSER_ROLE_NAME)
+      roleDefinitionName: $(ACNCI_BUILDUSER_ROLEDEFINITION_NAME)
       roleDefinitionFileLocation: ./azure-container-networking/.pipelines/templates/mi-build-role.json
       subscriptionId: $(build.subscriptionId)
       buildTagDefinitionIdKey: $(ACNCI_BUILDTAG_DEFINITIONID)
@@ -161,8 +161,10 @@ steps:
     resourceType: roledefinition
     refreshAfterCreation: True 
     inputs:
-      roleName: $(ACNCI_BUILDUSER_ROLE_NAME)
+      roleDefinitionName: $(ACNCI_BUILDUSER_ROLEDEFINITION_NAME)
       roleDefinitionJson: $(OUT_RESULT)
+      roleDefinitionFileLocation: ./azure-container-networking/.pipelines/templates/mi-build-role.json
+      resourceGroupId: $(resourcegroups.ACNCI_BUILD_RESOURCEGROUP)
       subscriptionId: $(build.subscriptionId)
       buildTagDefinitionIdKey: $(ACNCI_BUILDTAG_DEFINITIONID)
       buildTagCreatedByAppIdKey: $(ACNCI_BUILDTAG_CREATEDBYAPPID)
@@ -183,7 +185,7 @@ steps:
     resourceType: roleassignments
     serviceConnection: $(ACN_TEST_SERVICE_CONNECTION)
     inputs: 
-      roleName: $(ACNCI_BUILDUSER_ROLE_NAME)
+      roleName: $(ACNCI_BUILDUSER_ROLEDEFINITION_NAME)
       managedIdentityObjectId: $(build.ACNCI_BUILD_SP_APP_OID)
       resourceGroupName: $(resourcegroups.ACNCI_BUILD_RESOURCEGROUP)
       buildTagDefinitionIdKey: $(ACNCI_BUILDTAG_DEFINITIONID)
@@ -194,7 +196,7 @@ steps:
     serviceConnection: $(ACN_TEST_SERVICE_CONNECTION)
     resourceType: roleassignments
     inputs:
-      roleName: $(ACNCI_BUILDUSER_ROLE_NAME)
+      roleName: $(ACNCI_BUILDUSER_ROLEDEFINITION_NAME)
       managedIdentityObjectId: $(build.ACNCI_BUILD_SP_APP_OID)
       resourceGroupId: $(resourcegroups.ACNCI_BUILD_RESOURCEGROUP_ID)
       buildTagDefinitionIdKey: $(ACNCI_BUILDTAG_DEFINITIONID)
@@ -237,13 +239,6 @@ steps:
                lt(variables.OUT_RESULT_LENGTH, 1)))
       updateCondition: False
 
-    
-- template: get-storage-accounts.steps.yaml
-  parameters:
-    STORAGE_ACCOUNT_SERVICE_CONNECTION: $(ACN_TEST_SERVICE_CONNECTION)
-    condition: and(succeeded(), eq(variables.SA_LIST_LENGTH, 0))
-    resourceGroupName: $(resourcegroups.ACNCI_BUILD_RESOURCEGROUP)
-
 - task: AzureCLI@2
   name: artifact_storage
   displayName: "[Output] Storage Account Data"

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

@@ -35,15 +35,15 @@ steps:
 
 - ${{ if parameters.createCondition }}:
   - task: AzureCLI@2
-    displayName: "[CREATE] ARM Details - (${{ parameters.resourceType }})"
+    displayName: "[Create] ARM Details - (${{ parameters.resourceType }})"
     condition: ${{ parameters.createCondition }}
 
     env:
       BUILDTAG_DEFINITIONID: '${{ parameters.inputs.buildTagDefinitionIdKey }}'
       BUILDTAG_CREATEDBYAPPID: '${{ parameters.inputs.buildTagCreatedByAppIdKey }}'
       BUILDTAG_CREATEDBYBUILDID: '${{ parameters.inputs.buildTagCreatedByBuildIdKey }}'
       ${{ if eq(parameters.resourceType, 'roleassignments') }}:
-        ROLE_NAME: '${{ parameters.inputs.roleName }}'
+        ROLEDEFINITION_NAME: '${{ parameters.inputs.roleDefinitionName }}'
         RESOURCEGROUP_ID: '${{ parameters.inputs.resourceGroupId }}'
         MANAGEDIDENTITY_OBJECTID: '${{ parameters.inputs.managedIdentityObjectId }}'
 
@@ -76,7 +76,7 @@ steps:
           [[ -n $SYSTEM_DEBUG ]] && [[ $SYSTEM_DEBUG =~ $IS_TRUE ]] && set -x || set +x
     
           az role assignment create \
-            --role "$ROLE_NAME" \
+            --role "$ROLEDEFINITION_NAME" \
             --assignee-object-id "$MANAGEDIDENTITY_OBJECTID" \
             --assignee-principal-type ServicePrincipal \
             --scope "$RESOURCEGROUP_ID"
@@ -157,7 +157,7 @@ steps:
 
 - ${{ if and(parameters.updateCondition, eq(parameters.resourceType, 'roledefinition')) }}:
   - task: AzureCLI@2
-    displayName: "[UPDATE] ARM Details - (${{ parameters.resourceType }})"
+    displayName: "[Update] ARM Details - (${{ parameters.resourceType }})"
     condition: ${{ parameters.updateCondition }}
 
     env:

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

@@ -22,15 +22,15 @@ parameters:
 
 steps:
 - task: AzureCLI@2
-  displayName: "[GET] ARM Details - (${{ parameters.resourceType }})"
+  displayName: "[Get] ARM Details - (${{ parameters.resourceType }})"
 
   env:
     VAR_NAME: '${{ parameters.outputVariableName }}'
     BUILDTAG_DEFINITIONID: '${{ parameters.inputs.buildTagDefinitionIdKey }}'
     BUILDTAG_CREATEDBYAPPID: '${{ parameters.inputs.buildTagCreatedByAppIdKey }}'
     ${{ if eq(parameters.resourceType, 'roledefinition') }}:
       SUBSCRIPTION_ID: '${{ parameters.inputs.subscriptionId }}'
-      ROLE_NAME: '${{ parameters.inputs.roleName }}'
+      ROLEDEFINITION_NAME: '${{ parameters.inputs.roleDefinitionName }}'
       ROLEDEFINITION_FILEPATH: '${{ parameters.inputs.roleDefinitionFileLocation }}'
 
     ${{ elseif eq(parameters.resourceType, 'roleassignments') }}:
@@ -65,7 +65,7 @@ steps:
             '.assignableScopes[] = $RESOURCEID')
 
         DEFS_FOUND=$(az role definition list \
-          --name "$ROLE_NAME" \
+          --name "$ROLEDEFINITION_NAME" \
           --custom-role-only \
           -ojson | \
         jq length)