From 306f60a2ffd1a35e5ee5c51f383fb3a4ca1287e3 Mon Sep 17 00:00:00 2001 From: Bryce Tompkins Date: Thu, 25 Jul 2024 18:58:17 -0400 Subject: [PATCH] fix: Rename RepositoryScmType.AZURE_DEVOPS_SERVICES to RepositoryScmType.AZURE_DEVOPS --- README.md | 2 +- src/main/java/io/moderne/organizations/ScmConfiguration.java | 2 +- src/main/resources/application.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e4b854b..c867cdf 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ file is included in this repository. ### Mapping repositories -Edit [application.yaml](src/main/resources/application.yaml) to list all the origins (host + context path) for the SCM providers listed in the repos.csv, and provide a type: `[GITHUB,GITLAB,BITBUCKET_CLOUD,BITBUCKET,AZURE_DEVOPS_SERVICES]`. +Edit [application.yaml](src/main/resources/application.yaml) to list all the origins (host + context path) for the SCM providers listed in the repos.csv, and provide a type: `[GITHUB,GITLAB,BITBUCKET_CLOUD,BITBUCKET,AZURE_DEVOPS]`. This will be used to split the clone url into an origin and path. Note that for an on-premise Bitbucket (server) we should not have the `scm/` path segment in the origin or the path. This will automatically be stripped off if you configure this as explained above. diff --git a/src/main/java/io/moderne/organizations/ScmConfiguration.java b/src/main/java/io/moderne/organizations/ScmConfiguration.java index 0e825db..3a462b6 100644 --- a/src/main/java/io/moderne/organizations/ScmConfiguration.java +++ b/src/main/java/io/moderne/organizations/ScmConfiguration.java @@ -31,7 +31,7 @@ public void setType(Type type) { } public enum Type { - GITHUB, BITBUCKET_CLOUD, GITLAB, BITBUCKET, AZURE_DEVOPS_SERVICES + GITHUB, BITBUCKET_CLOUD, GITLAB, BITBUCKET, AZURE_DEVOPS } } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 83eb920..69c6e28 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -14,4 +14,4 @@ moderne: - origin: https://bitbucket.example.com/stash type: BITBUCKET - origin: dev.azure.com - type: AZURE_DEVOPS_SERVICES + type: AZURE_DEVOPS