diff options
4 files changed, 23 insertions, 0 deletions
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ALM.java b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ALM.java index c0dbdde23b0..4a8ba01fe24 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ALM.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ALM.java @@ -24,6 +24,7 @@ import java.util.Locale; public enum ALM { GITHUB, BITBUCKET, + BITBUCKET_CLOUD, AZURE_DEVOPS, GITLAB; diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java index 63df89088d4..8b27ec27dea 100644 --- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java +++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java @@ -29,6 +29,7 @@ import static java.util.Arrays.stream; import static org.sonar.db.almsettings.AlmSettingsTesting.newAzureAlmSettingDto; import static org.sonar.db.almsettings.AlmSettingsTesting.newAzureProjectAlmSettingDto; import static org.sonar.db.almsettings.AlmSettingsTesting.newBitbucketAlmSettingDto; +import static org.sonar.db.almsettings.AlmSettingsTesting.newBitbucketCloudAlmSettingDto; import static org.sonar.db.almsettings.AlmSettingsTesting.newBitbucketProjectAlmSettingDto; import static org.sonar.db.almsettings.AlmSettingsTesting.newGithubAlmSettingDto; import static org.sonar.db.almsettings.AlmSettingsTesting.newGithubProjectAlmSettingDto; @@ -64,6 +65,11 @@ public class AlmSettingsDbTester { } @SafeVarargs + public final AlmSettingDto insertBitbucketCloudAlmSetting(Consumer<AlmSettingDto>... populators) { + return insert(newBitbucketCloudAlmSettingDto(), populators); + } + + @SafeVarargs public final ProjectAlmSettingDto insertGitHubProjectAlmSetting(AlmSettingDto githubAlmSetting, ProjectDto project, Consumer<ProjectAlmSettingDto>... populators) { return insertProjectAlmSetting(newGithubProjectAlmSettingDto(githubAlmSetting, project), populators); } diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsTesting.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsTesting.java index 654dd0b61ff..bb3ce347d9a 100644 --- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsTesting.java +++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsTesting.java @@ -62,6 +62,14 @@ public class AlmSettingsTesting { .setAlm(ALM.BITBUCKET); } + public static AlmSettingDto newBitbucketCloudAlmSettingDto() { + return new AlmSettingDto() + .setKey(randomAlphanumeric(200)) + .setClientId(randomAlphanumeric(50)) + .setClientSecret(randomAlphanumeric(50)) + .setAlm(ALM.BITBUCKET_CLOUD); + } + public static ProjectAlmSettingDto newGithubProjectAlmSettingDto(AlmSettingDto githubAlmSetting, ProjectDto project) { return new ProjectAlmSettingDto() .setAlmSettingUuid(githubAlmSetting.getUuid()) diff --git a/sonar-ws/src/main/protobuf/ws-alm_settings.proto b/sonar-ws/src/main/protobuf/ws-alm_settings.proto index 57de78e8170..05453664077 100644 --- a/sonar-ws/src/main/protobuf/ws-alm_settings.proto +++ b/sonar-ws/src/main/protobuf/ws-alm_settings.proto @@ -30,6 +30,7 @@ message ListDefinitionsWsResponse { repeated AlmSettingAzure azure = 2; repeated AlmSettingBitbucket bitbucket = 3; repeated AlmSettingGitlab gitlab = 4; + repeated AlmSettingBitbucketCloud bitbucketCloud = 5; } message AlmSettingGithub { @@ -53,6 +54,12 @@ message AlmSettingBitbucket { optional string personalAccessToken = 3; } +message AlmSettingBitbucketCloud { + optional string key = 1; + optional string clientId = 2; + optional string clientSecret = 3; +} + message AlmSettingGitlab { optional string key = 1; optional string personalAccessToken = 2; @@ -75,6 +82,7 @@ enum Alm { azure = 1; bitbucket = 2; gitlab = 3; + bitbucketcloud = 4; } // WS api/alm_settings/list |