Skip to content

Commit bde916d

Browse files
ESRP federated credential update (move to AME) (#3261) (#3266)
1 parent 3e0b444 commit bde916d

File tree

2 files changed

+40
-18
lines changed

2 files changed

+40
-18
lines changed

eng/pipelines/common/templates/steps/esrp-code-signing-step.yml

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ parameters:
1717
type: string
1818
default: $(artifactDirectory)
1919

20+
- name: ESRPConnectedServiceName
21+
type: string
22+
default: $(ESRPConnectedServiceName)
23+
2024
- name: appRegistrationClientId
2125
type: string
2226
default: $(appRegistrationClientId)
@@ -25,29 +29,42 @@ parameters:
2529
type: string
2630
default: $(appRegistrationTenantId)
2731

32+
- name: AuthAKVName
33+
type: string
34+
default: $(AuthAKVName)
35+
36+
- name: AuthSignCertName
37+
type: string
38+
default: $(AuthSignCertName)
39+
40+
- name: EsrpClientId
41+
type: string
42+
default: $(EsrpClientId)
43+
2844
steps:
2945
- ${{ if eq(parameters.artifactType, 'dll') }}:
3046
- task: EsrpMalwareScanning@5
3147
displayName: 'ESRP MalwareScanning'
3248
inputs:
33-
ConnectedServiceName: 'ESRP Workload Identity federation service-ADO.Net'
49+
ConnectedServiceName: '${{parameters.ESRPConnectedServiceName }}'
3450
AppRegistrationClientId: '${{parameters.appRegistrationClientId }}'
3551
AppRegistrationTenantId: '${{parameters.appRegistrationTenantId }}'
36-
AuthAKVName: SqlClientDrivers
37-
AuthCertName: 'ESRP-Release-Auth'
52+
EsrpClientId: '${{parameters.EsrpClientId }}'
53+
UseMSIAuthentication: true
3854
FolderPath: '${{parameters.sourceRoot }}'
3955
Pattern: '*.dll'
4056
CleanupTempStorage: 1
4157
VerboseLogin: 1
4258
- task: EsrpCodeSigning@5
4359
displayName: 'ESRP CodeSigning'
4460
inputs:
45-
ConnectedServiceName: 'ESRP Workload Identity federation service-ADO.Net'
61+
ConnectedServiceName: '${{parameters.ESRPConnectedServiceName }}'
4662
AppRegistrationClientId: '${{parameters.appRegistrationClientId }}'
4763
AppRegistrationTenantId: '${{parameters.appRegistrationTenantId }}'
48-
AuthAKVName: SqlClientDrivers
49-
AuthCertName: 'ESRP-Release-Auth'
50-
AuthSignCertName: 'ESRP-Release-Sign2'
64+
EsrpClientId: '${{parameters.EsrpClientId }}'
65+
UseMSIAuthentication: true
66+
AuthAKVName: '${{parameters.AuthAKVName }}'
67+
AuthSignCertName: '${{parameters.AuthSignCertName }}'
5168
FolderPath: '${{parameters.sourceRoot }}'
5269
Pattern: '*.dll'
5370
signConfigType: inlineSignParams
@@ -94,24 +111,25 @@ steps:
94111
- task: EsrpMalwareScanning@5
95112
displayName: 'ESRP MalwareScanning Nuget Package'
96113
inputs:
97-
ConnectedServiceName: 'ESRP Workload Identity federation service-ADO.Net'
114+
ConnectedServiceName: '${{parameters.ESRPConnectedServiceName }}'
98115
AppRegistrationClientId: '${{parameters.appRegistrationClientId }}'
99116
AppRegistrationTenantId: '${{parameters.appRegistrationTenantId }}'
100-
AuthAKVName: SqlClientDrivers
101-
AuthCertName: 'ESRP-Release-Auth'
117+
EsrpClientId: '${{parameters.EsrpClientId }}'
118+
UseMSIAuthentication: true
102119
FolderPath: '${{parameters.artifactDirectory }}'
103120
Pattern: '*.*nupkg'
104121
CleanupTempStorage: 1
105122
VerboseLogin: 1
106123
- task: EsrpCodeSigning@5
107124
displayName: 'ESRP CodeSigning Nuget Package'
108125
inputs:
109-
ConnectedServiceName: 'ESRP Workload Identity federation service-ADO.Net'
126+
ConnectedServiceName: '${{parameters.ESRPConnectedServiceName }}'
110127
AppRegistrationClientId: '${{parameters.appRegistrationClientId }}'
111128
AppRegistrationTenantId: '${{parameters.appRegistrationTenantId }}'
112-
AuthAKVName: SqlClientDrivers
113-
AuthCertName: 'ESRP-Release-Auth'
114-
AuthSignCertName: 'ESRP-Release-Sign2'
129+
EsrpClientId: '${{parameters.EsrpClientId }}'
130+
UseMSIAuthentication: true
131+
AuthAKVName: '${{parameters.AuthAKVName }}'
132+
AuthSignCertName: '${{parameters.AuthSignCertName }}'
115133
FolderPath: '${{parameters.artifactDirectory }}'
116134
Pattern: '*.*nupkg'
117135
signConfigType: inlineSignParams

eng/pipelines/libraries/common-variables.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
#################################################################################
66

77
variables:
8+
- group: ESRP Federated Creds (AME)
9+
# ESRPConnectedServiceName
10+
# ESRPClientId
11+
# AppRegistrationClientId
12+
# AppRegistrationTenantId
13+
# AuthAKVName
14+
# AuthSignCertName
15+
816
- name: Configuration
917
value: Release
1018
- name: CommitHead
@@ -17,7 +25,3 @@ variables:
1725
value: $(REPOROOT)/symbols
1826
- name: artifactDirectory
1927
value: '$(REPOROOT)/packages'
20-
- name: appRegistrationClientId
21-
value: 'a0d18a38-fde1-4ba7-92e1-15be16cb6a8e'
22-
- name: appRegistrationTenantId
23-
value: '72f988bf-86f1-41af-91ab-2d7cd011db47'

0 commit comments

Comments
 (0)