@@ -43,6 +43,9 @@ export function getEntityIdentifierInput(entity: Issue | PullRequest | Launchpad
43
43
provider = EntityIdentifierProviderType . GitlabSelfHosted ;
44
44
domain = entity . provider . domain ;
45
45
}
46
+ if ( provider === EntityIdentifierProviderType . AzureDevOpsServer ) {
47
+ domain = entity . provider . domain ;
48
+ }
46
49
47
50
let projectId = null ;
48
51
let resourceId = null ;
@@ -55,7 +58,10 @@ export function getEntityIdentifierInput(entity: Issue | PullRequest | Launchpad
55
58
56
59
projectId = entity . project . id ;
57
60
resourceId = entity . project . resourceId ;
58
- } else if ( provider === EntityIdentifierProviderType . Azure ) {
61
+ } else if (
62
+ provider === EntityIdentifierProviderType . Azure ||
63
+ provider === EntityIdentifierProviderType . AzureDevOpsServer
64
+ ) {
59
65
const project = isLaunchpadItem ( entity ) ? entity . underlyingPullRequest ?. project : entity . project ;
60
66
if ( project == null ) {
61
67
throw new Error ( 'Azure issues and PRs must have a project to be encoded' ) ;
@@ -75,7 +81,10 @@ export function getEntityIdentifierInput(entity: Issue | PullRequest | Launchpad
75
81
}
76
82
77
83
let entityId = isLaunchpadItem ( entity ) ? entity . graphQLId ! : entity . nodeId ! ;
78
- if ( provider === EntityIdentifierProviderType . Azure ) {
84
+ if (
85
+ provider === EntityIdentifierProviderType . Azure ||
86
+ provider === EntityIdentifierProviderType . AzureDevOpsServer
87
+ ) {
79
88
entityId = isLaunchpadItem ( entity ) ? entity . underlyingPullRequest ?. id : entity . id ;
80
89
}
81
90
@@ -113,6 +122,8 @@ export function getProviderIdFromEntityIdentifier(
113
122
return IssuesCloudHostIntegrationId . Jira ;
114
123
case EntityIdentifierProviderType . Azure :
115
124
return GitCloudHostIntegrationId . AzureDevOps ;
125
+ case EntityIdentifierProviderType . AzureDevOpsServer :
126
+ return GitSelfManagedHostIntegrationId . AzureDevOpsServer ;
116
127
case EntityIdentifierProviderType . Bitbucket :
117
128
return GitCloudHostIntegrationId . Bitbucket ;
118
129
case EntityIdentifierProviderType . BitbucketServer :
@@ -139,8 +150,9 @@ function fromStringToEntityIdentifierProviderType(str: string): EntityIdentifier
139
150
case 'azure' :
140
151
case 'azureDevOps' :
141
152
case 'azure-devops' :
142
- case GitSelfManagedHostIntegrationId . AzureDevOpsServer :
143
153
return EntityIdentifierProviderType . Azure ;
154
+ case GitSelfManagedHostIntegrationId . AzureDevOpsServer :
155
+ return EntityIdentifierProviderType . AzureDevOpsServer ;
144
156
case 'bitbucket' :
145
157
return EntityIdentifierProviderType . Bitbucket ;
146
158
case 'bitbucket-server' :
@@ -246,6 +258,7 @@ export async function getIssueFromGitConfigEntityIdentifier(
246
258
identifier . provider !== EntityIdentifierProviderType . GitlabSelfHosted &&
247
259
identifier . provider !== EntityIdentifierProviderType . Bitbucket &&
248
260
identifier . provider !== EntityIdentifierProviderType . BitbucketServer &&
261
+ identifier . provider !== EntityIdentifierProviderType . AzureDevOpsServer &&
249
262
identifier . provider !== EntityIdentifierProviderType . Azure
250
263
) {
251
264
return undefined ;
0 commit comments