File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -91,4 +91,33 @@ describe("detectSourceControlProviderFromRemoteUrl", () => {
9191 baseUrl : "https://self-hosted.example.test:8443" ,
9292 } ) ;
9393 } ) ;
94+
95+ it ( "matches self-hosted providers by complete DNS labels" , ( ) => {
96+ expect (
97+ detectSourceControlProviderFromRemoteUrl ( "https://github.example.com/owner/repo.git" ) ?. kind ,
98+ ) . toBe ( "github" ) ;
99+ expect (
100+ detectSourceControlProviderFromRemoteUrl ( "https://gitlab.example.com/group/repo.git" ) ?. kind ,
101+ ) . toBe ( "gitlab" ) ;
102+ expect (
103+ detectSourceControlProviderFromRemoteUrl ( "https://bitbucket.example.com/workspace/repo.git" )
104+ ?. kind ,
105+ ) . toBe ( "bitbucket" ) ;
106+ } ) ;
107+
108+ it ( "does not match provider names embedded in unrelated DNS labels" , ( ) => {
109+ expect (
110+ detectSourceControlProviderFromRemoteUrl ( "https://notgithub.example.com/owner/repo.git" )
111+ ?. kind ,
112+ ) . toBe ( "unknown" ) ;
113+ expect (
114+ detectSourceControlProviderFromRemoteUrl ( "https://notgitlab.example.com/group/repo.git" )
115+ ?. kind ,
116+ ) . toBe ( "unknown" ) ;
117+ expect (
118+ detectSourceControlProviderFromRemoteUrl (
119+ "https://notbitbucket.example.com/workspace/repo.git" ,
120+ ) ?. kind ,
121+ ) . toBe ( "unknown" ) ;
122+ } ) ;
94123} ) ;
Original file line number Diff line number Diff line change @@ -167,12 +167,16 @@ function toBaseUrl(host: string): string {
167167 return `https://${ host } ` ;
168168}
169169
170+ function hasDnsLabel ( host : string , label : string ) : boolean {
171+ return host . split ( "." ) . includes ( label ) ;
172+ }
173+
170174function isGitHubHost ( host : string ) : boolean {
171- return host === "github.com" || host . includes ( "github" ) ;
175+ return host === "github.com" || hasDnsLabel ( host , "github" ) ;
172176}
173177
174178function isGitLabHost ( host : string ) : boolean {
175- return host === "gitlab.com" || host . includes ( "gitlab" ) ;
179+ return host === "gitlab.com" || hasDnsLabel ( host , "gitlab" ) ;
176180}
177181
178182function isAzureDevOpsHost ( host : string ) : boolean {
@@ -188,7 +192,7 @@ function isAzureDevOpsHost(host: string): boolean {
188192}
189193
190194function isBitbucketHost ( host : string ) : boolean {
191- return host === "bitbucket.org" || host . includes ( "bitbucket" ) ;
195+ return host === "bitbucket.org" || hasDnsLabel ( host , "bitbucket" ) ;
192196}
193197
194198export function detectSourceControlProviderFromRemoteUrl (
You can’t perform that action at this time.
0 commit comments