fixup! Move to Resource Module

Author: Sheyla Trudo

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

@@ -149,9 +149,9 @@ steps:
     resourceType: roledefinition
     serviceConnection: $(ACN_TEST_SERVICE_CONNECTION)
     inputs: 
-      roleDefinitionName: $(ACNCI_BUILDUSER_ROLEDEFINITION_NAME)
+      roleName: $(ACNCI_BUILDUSER_ROLE_NAME)
       roleDefinitionFileLocation: ./azure-container-networking/.pipelines/templates/mi-build-role.json
-      subscriptionId: $(build.subscriptionId)
+      subscriptionId: $(build.ACNCI_BUILD_SUBSCRIPTION_ID)
       buildTagDefinitionIdKey: $(ACNCI_BUILDTAG_DEFINITIONID)
       buildTagCreatedByAppIdKey: $(ACNCI_BUILDTAG_CREATEDBYAPPID)
 
@@ -168,11 +168,11 @@ steps:
       and(succeeded(),
           gt(variables.OUT_RESULT_LENGTH, 0))
     inputs:
-      roleDefinitionName: $(ACNCI_BUILDUSER_ROLEDEFINITION_NAME)
+      roleName: $(ACNCI_BUILDUSER_ROLE_NAME)
       roleDefinitionJson: $(OUT_RESULT)
       roleDefinitionFileLocation: ./azure-container-networking/.pipelines/templates/mi-build-role.json
       resourceGroupId: $(resourcegroups.ACNCI_BUILD_RESOURCEGROUP)
-      subscriptionId: $(build.subscriptionId)
+      subscriptionId: $(build.ACNCI_BUILD_SUBSCRIPTION_ID)
       buildTagDefinitionIdKey: $(ACNCI_BUILDTAG_DEFINITIONID)
       buildTagCreatedByAppIdKey: $(ACNCI_BUILDTAG_CREATEDBYAPPID)
       buildTagCreatedByBuildIdKey: $(ACNCI_BUILDTAG_CREATEDBYAPPID)  
@@ -185,7 +185,7 @@ steps:
     resourceType: roleassignments
     serviceConnection: $(ACN_TEST_SERVICE_CONNECTION)
     inputs: 
-      roleName: $(ACNCI_BUILDUSER_ROLEDEFINITION_NAME)
+      roleName: $(ACNCI_BUILDUSER_ROLE_NAME)
       managedIdentityObjectId: $(build.ACNCI_BUILD_SP_APP_OID)
       resourceGroupName: $(resourcegroups.ACNCI_BUILD_RESOURCEGROUP)
       buildTagDefinitionIdKey: $(ACNCI_BUILDTAG_DEFINITIONID)
@@ -202,7 +202,7 @@ steps:
              lt(variables.OUT_RESULT_LENGTH, 1)))
     updateCondition: False
     inputs:
-      roleName: $(ACNCI_BUILDUSER_ROLEDEFINITION_NAME)
+      roleName: $(ACNCI_BUILDUSER_ROLE_NAME)
       managedIdentityObjectId: $(build.ACNCI_BUILD_SP_APP_OID)
       resourceGroupId: $(resourcegroups.ACNCI_BUILD_RESOURCEGROUP_ID)
       resourceGroupName: $(resourcegroups.ACNCI_BUILD_RESOURCEGROUP)

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

@@ -43,7 +43,7 @@ steps:
       BUILDTAG_CREATEDBYAPPID: '${{ parameters.inputs.buildTagCreatedByAppIdKey }}'
       BUILDTAG_CREATEDBYBUILDID: '${{ parameters.inputs.buildTagCreatedByBuildIdKey }}'
       ${{ if eq(parameters.resourceType, 'roleassignments') }}:
-        ROLEDEFINITION_NAME: '${{ parameters.inputs.roleDefinitionName }}'
+        ROLE_NAME: '${{ parameters.inputs.roleName }}'
         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 "$ROLEDEFINITION_NAME" \
+            --role "$ROLE_NAME" \
             --assignee-object-id "$MANAGEDIDENTITY_OBJECTID" \
             --assignee-principal-type ServicePrincipal \
             --scope "$RESOURCEGROUP_ID"
@@ -147,7 +147,7 @@ steps:
             resourceGroupName: '${{ parameters.inputs.resourceGroupName }}'
 
           ${{ elseif eq(parameters.resourceType, 'roledefinition') }}:
-            roleDefinitionName: '${{ parameters.inputs.roleDefinitionName }}'
+            roleName: '${{ parameters.inputs.roleName }}'
             roleDefinitionFileLocation: '${{ parameters.inputs.roleDefinitionFileLocation }}'
             subscriptionId: '${{ parameters.inputs.subscriptionId }}'
 

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

@@ -30,23 +30,23 @@ steps:
     BUILDTAG_CREATEDBYAPPID: '${{ parameters.inputs.buildTagCreatedByAppIdKey }}'
     ${{ if eq(parameters.resourceType, 'roledefinition') }}:
       SUBSCRIPTION_ID: '${{ parameters.inputs.subscriptionId }}'
-      ROLEDEFINITION_NAME: '${{ parameters.inputs.roleDefinitionName }}'
+      ROLE_NAME: '${{ parameters.inputs.roleName }}'
       ROLEDEFINITION_FILEPATH: '${{ parameters.inputs.roleDefinitionFileLocation }}'
 
     ${{ elseif eq(parameters.resourceType, 'roleassignments') }}:
       MANAGEDIDENTITY_OBJECTID: '${{ parameters.inputs.managedIdentityObjectId }}'
-      RESOUCEGROUP_NAME: '${{ parameters.inputs.resourceGroupName }}'
+      RESOURCEGROUP_NAME: '${{ parameters.inputs.resourceGroupName }}'
       ROLE_NAME: '${{ parameters.inputs.roleName }}'
 
     ${{ elseif eq(parameters.resourceType, 'resourcegroups') }}:
       # Allows use of az devops commands
       AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
 
     ${{ elseif eq(parameters.resourceType, 'storageaccounts') }}:
-      RESOUCEGROUP_NAME: '${{ parameters.inputs.resourceGroupName }}'
+      RESOURCEGROUP_NAME: '${{ parameters.inputs.resourceGroupName }}'
 
     ${{ elseif eq(parameters.resourceType, 'managedidentity') }}:
-      RESOUCEGROUP_NAME: '${{ parameters.inputs.resourceGroupName }}'
+      RESOURCEGROUP_NAME: '${{ parameters.inputs.resourceGroupName }}'
 
   inputs:
     azureSubscription: ${{ parameters.serviceConnection }}
@@ -60,7 +60,7 @@ steps:
         [[ -n $SYSTEM_DEBUG ]] && [[ $SYSTEM_DEBUG =~ $IS_TRUE ]] && set -x || set +x
   
         DEF_LIST=$(az role definition list \
-          --name "$ROLEDEFINITION_NAME" \
+          --name "$ROLE_NAME" \
           --custom-role-only \
           -ojson | jq -rc '.')
         DEF=$(echo "$DEF_LIST" | jq -rc .[0])
@@ -141,7 +141,7 @@ steps:
   
         R_QUERY="[? tags.\""$BUILDTAG_DEFINITIONID"\" && tags.\""$BUILDTAG_CREATEDBYAPPID"\"]"
         MI_LIST=$(az identity list \
-          --resource-group "$RESOUCEGROUP_NAME" \
+          --resource-group "$RESOURCEGROUP_NAME" \
           --query "$R_QUERY" -o json | \
           jq -rc \
             --arg BUILDTAG_CREATEDBYAPPID "$BUILDTAG_CREATEDBYAPPID" \