Skip to content

Commit 500f869

Browse files
author
Sheyla Trudo
committed
fixup! Move to Resource Module
1 parent 812b470 commit 500f869

File tree

3 files changed

+35
-36
lines changed

3 files changed

+35
-36
lines changed

‎.pipelines/run-pipeline.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ stages:
6060
## artifact_storage.ACNCI_STORAGEACCOUNT_LOCATION
6161
##
6262
- job: resources
63-
displayName: "[Infra] Retrieve Artifact Storage Information"
63+
displayName: "[Infra] Configure Artifact Resources"
6464
variables:
6565
ACNCI_BUILDUSER_ROLE_NAME: "ACN CI/CD Build Environment Owner"
6666
ACNCI_MANAGEDIDENTITY_PREFIX: acnci-builds-
@@ -97,7 +97,6 @@ stages:
9797
SA_NAME: $[ stageDependencies.setup.resources.outputs['artifact_storage.ACNCI_STORAGEACCOUNT_NAME'] ]
9898
CONTAINER_NAME: $[ stageDependencies.setup.resources.outputs['artifact_container.ACNCI_STORAGEACCOUNT_ARTIFACT_CONTAINER'] ]
9999
BLOB_PATH: $[ stageDependencies.setup.resources.outputs['artifact_blob.ACNCI_STORAGEACCOUNT_BLOBPATH'] ]
100-
SYSTEM_DEBUG: $[ coalesce(variables.SYSTEM_DEBUG, 'False') ]
101100
jobs:
102101
- job: build
103102
displayName: Build Binaries

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,30 +39,30 @@ steps:
3939
condition: ${{ parameters.createCondition }}
4040

4141
env:
42-
BUILDTAG_DEFINITIONID: '${{ parameters.inputs.buildTagDefinitionIdKey }}'
43-
BUILDTAG_CREATEDBYAPPID: '${{ parameters.inputs.buildTagCreatedByAppIdKey }}'
44-
BUILDTAG_CREATEDBYBUILDID: '${{ parameters.inputs.buildTagCreatedByBuildIdKey }}'
42+
BUILDTAG_DEFINITIONID: ${{ parameters.inputs.buildTagDefinitionIdKey }}
43+
BUILDTAG_CREATEDBYAPPID: ${{ parameters.inputs.buildTagCreatedByAppIdKey }}
44+
BUILDTAG_CREATEDBYBUILDID: ${{ parameters.inputs.buildTagCreatedByBuildIdKey }}
4545
${{ if eq(parameters.resourceType, 'roleassignments') }}:
46-
ROLE_NAME: '${{ parameters.inputs.roleName }}'
47-
RESOURCEGROUP_ID: '${{ parameters.inputs.resourceGroupId }}'
48-
MANAGEDIDENTITY_OBJECTID: '${{ parameters.inputs.managedIdentityObjectId }}'
46+
ROLE_NAME: ${{ parameters.inputs.roleName }}
47+
RESOURCEGROUP_ID: ${{ parameters.inputs.resourceGroupId }}
48+
MANAGEDIDENTITY_OBJECTID: ${{ parameters.inputs.managedIdentityObjectId }}
4949

5050
${{ elseif eq(parameters.resourceType, 'resourcegroups') }}:
51-
RESOURCEGROUP_NAME: '${{ parameters.inputs.resourceGroupName }}'
52-
RESOURCEGROUP_LOCATION: '${{ parameters.inputs.resourceGroupLocation }}'
51+
RESOURCEGROUP_NAME: ${{ parameters.inputs.resourceGroupName }}
52+
RESOURCEGROUP_LOCATION: ${{ parameters.inputs.resourceGroupLocation }}
5353

5454
${{ elseif eq(parameters.resourceType, 'storageaccounts') }}:
55-
MANAGEDIDENTITY_ARMID: '${{ parameters.inputs.managedIdentityResourceId }}'
56-
RESOURCEGROUP_NAME: '${{ parameters.inputs.resourceGroupName }}'
57-
RESOURCEGROUP_LOCATION: '${{ parameters.inputs.resourceGroupLocation }}'
55+
MANAGEDIDENTITY_ARMID: ${{ parameters.inputs.managedIdentityResourceId }}
56+
RESOURCEGROUP_NAME: ${{ parameters.inputs.resourceGroupName }}
57+
RESOURCEGROUP_LOCATION: ${{ parameters.inputs.resourceGroupLocation }}
5858

5959
${{ elseif eq(parameters.resourceType, 'roledefinition') }}:
60-
ROLEDEFINITION_JSON: '${{ parameters.inputs.roleDefinitionJson }}'
60+
ROLEDEFINITION_JSON: ${{ parameters.inputs.roleDefinitionJson }}
6161

6262
${{ elseif eq(parameters.resourceType, 'managedidentity') }}:
63-
MANAGEDIDENTITY_NAME: '${{ parameters.inputs.managedIdentityName }}'
64-
MANAGEDIDENTITY_LOCATION: '${{ parameters.inputs.managedIdentityLocation }}'
65-
RESOURCEGROUP_NAME: '${{ parameters.inputs.resourceGroupName }}'
63+
MANAGEDIDENTITY_NAME: ${{ parameters.inputs.managedIdentityName }}
64+
MANAGEDIDENTITY_LOCATION: ${{ parameters.inputs.managedIdentityLocation }}
65+
RESOURCEGROUP_NAME: ${{ parameters.inputs.resourceGroupName }}
6666

6767
inputs:
6868
azureSubscription: ${{ parameters.serviceConnection }}
@@ -143,18 +143,18 @@ steps:
143143
resourceType: ${{ parameters.resourceType }}
144144
serviceConnection: ${{ parameters.serviceConnection }}
145145
inputs:
146-
buildTagDefinitionIdKey: '${{ parameters.inputs.buildTagDefinitionIdKey }}'
147-
buildTagCreatedByAppIdKey: '${{ parameters.inputs.buildTagCreatedByAppIdKey }}'
146+
buildTagDefinitionIdKey: ${{ parameters.inputs.buildTagDefinitionIdKey }}
147+
buildTagCreatedByAppIdKey: ${{ parameters.inputs.buildTagCreatedByAppIdKey }}
148148
${{ if eq(parameters.resourceType, 'managedidentity') }}:
149-
resourceGroupName: '${{ parameters.inputs.resourceGroupName }}'
149+
resourceGroupName: ${{ parameters.inputs.resourceGroupName }}
150150

151151
${{ elseif eq(parameters.resourceType, 'roledefinition') }}:
152-
roleName: '${{ parameters.inputs.roleName }}'
153-
roleDefinitionFileLocation: '${{ parameters.inputs.roleDefinitionFileLocation }}'
154-
subscriptionId: '${{ parameters.inputs.subscriptionId }}'
152+
roleName: ${{ parameters.inputs.roleName }}
153+
roleDefinitionFileLocation: ${{ parameters.inputs.roleDefinitionFileLocation }}
154+
subscriptionId: ${{ parameters.inputs.subscriptionId }}
155155

156156
${{ elseif eq(parameters.resourceType, 'storageaccounts') }}:
157-
resourceGroupName: '${{ parameters.inputs.resourceGroupName }}'
157+
resourceGroupName: ${{ parameters.inputs.resourceGroupName }}
158158

159159

160160
- ${{ if and(parameters.updateCondition, eq(parameters.resourceType, 'roledefinition')) }}:
@@ -164,7 +164,7 @@ steps:
164164

165165
env:
166166
${{ if eq(parameters.resourceType, 'roledefinition') }}:
167-
ROLEDEFINITION_JSON: '${{ parameters.inputs.roleDefinitionJson }}'
167+
ROLEDEFINITION_JSON: ${{ parameters.inputs.roleDefinitionJson }}
168168

169169
inputs:
170170
azureSubscription: ${{ parameters.serviceConnection }}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,28 @@ steps:
2525
displayName: "[Get] ARM Details - (${{ parameters.resourceType }})"
2626

2727
env:
28-
VAR_NAME: '${{ parameters.outputVariableName }}'
29-
BUILDTAG_DEFINITIONID: '${{ parameters.inputs.buildTagDefinitionIdKey }}'
30-
BUILDTAG_CREATEDBYAPPID: '${{ parameters.inputs.buildTagCreatedByAppIdKey }}'
28+
VAR_NAME: ${{ parameters.outputVariableName }}
29+
BUILDTAG_DEFINITIONID: ${{ parameters.inputs.buildTagDefinitionIdKey }}
30+
BUILDTAG_CREATEDBYAPPID: ${{ parameters.inputs.buildTagCreatedByAppIdKey }}
3131
${{ if eq(parameters.resourceType, 'roledefinition') }}:
32-
SUBSCRIPTION_ID: '${{ parameters.inputs.subscriptionId }}'
33-
ROLE_NAME: '${{ parameters.inputs.roleName }}'
34-
ROLEDEFINITION_FILEPATH: '${{ parameters.inputs.roleDefinitionFileLocation }}'
32+
SUBSCRIPTION_ID: ${{ parameters.inputs.subscriptionId }}
33+
ROLE_NAME: ${{ parameters.inputs.roleName }}
34+
ROLEDEFINITION_FILEPATH: ${{ parameters.inputs.roleDefinitionFileLocation }}
3535

3636
${{ elseif eq(parameters.resourceType, 'roleassignments') }}:
37-
MANAGEDIDENTITY_OBJECTID: '${{ parameters.inputs.managedIdentityObjectId }}'
38-
RESOURCEGROUP_NAME: '${{ parameters.inputs.resourceGroupName }}'
39-
ROLE_NAME: '${{ parameters.inputs.roleName }}'
37+
MANAGEDIDENTITY_OBJECTID: ${{ parameters.inputs.managedIdentityObjectId }}
38+
RESOURCEGROUP_NAME: ${{ parameters.inputs.resourceGroupName }}
39+
ROLE_NAME: ${{ parameters.inputs.roleName }}
4040

4141
${{ elseif eq(parameters.resourceType, 'resourcegroups') }}:
4242
# Allows use of az devops commands
4343
AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
4444

4545
${{ elseif eq(parameters.resourceType, 'storageaccounts') }}:
46-
RESOURCEGROUP_NAME: '${{ parameters.inputs.resourceGroupName }}'
46+
RESOURCEGROUP_NAME: ${{ parameters.inputs.resourceGroupName }}
4747

4848
${{ elseif eq(parameters.resourceType, 'managedidentity') }}:
49-
RESOURCEGROUP_NAME: '${{ parameters.inputs.resourceGroupName }}'
49+
RESOURCEGROUP_NAME: ${{ parameters.inputs.resourceGroupName }}
5050

5151
inputs:
5252
azureSubscription: ${{ parameters.serviceConnection }}

0 commit comments

Comments
 (0)