aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbelen-pruvost-sonarsource <belen.pruvost@sonarsource.com>2020-11-19 14:52:57 +0100
committersonartech <sonartech@sonarsource.com>2020-11-25 20:06:27 +0000
commit7417603c002ea8f534963c75e49777ef5a814cb6 (patch)
tree605cc95eb23b52b015b83f93ecbbf69370921632
parent3e08957f66e0ed39f936a5d23d245490d68ddeb3 (diff)
downloadsonarqube-7417603c002ea8f534963c75e49777ef5a814cb6.tar.gz
sonarqube-7417603c002ea8f534963c75e49777ef5a814cb6.zip
SONAR-14057 Set sqProjectKey and sqProjectName
-rw-r--r--server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java5
-rw-r--r--sonar-ws/src/main/protobuf/ws-alm_integrations.proto2
2 files changed, 6 insertions, 1 deletions
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 23413febddf..eaf489cb074 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
@@ -77,6 +77,11 @@ public class AlmSettingsDbTester {
}
@SafeVarargs
+ public final ProjectAlmSettingDto insertAzureProjectAlmSetting(AlmSettingDto azureAlmSetting, ProjectDto project, Consumer<ProjectAlmSettingDto>... populators) {
+ return insertProjectAlmSetting(newAzureProjectAlmSettingDto(azureAlmSetting, project), populators);
+ }
+
+ @SafeVarargs
public final ProjectAlmSettingDto insertGitlabProjectAlmSetting(AlmSettingDto gitlabAlmSetting, ProjectDto project, Consumer<ProjectAlmSettingDto>... populators) {
return insertProjectAlmSetting(newGitlabProjectAlmSettingDto(gitlabAlmSetting, project), populators);
}
diff --git a/sonar-ws/src/main/protobuf/ws-alm_integrations.proto b/sonar-ws/src/main/protobuf/ws-alm_integrations.proto
index adcd0197e3a..68ad17281da 100644
--- a/sonar-ws/src/main/protobuf/ws-alm_integrations.proto
+++ b/sonar-ws/src/main/protobuf/ws-alm_integrations.proto
@@ -59,7 +59,7 @@ message AzureRepo {
optional string name = 1;
optional string projectName = 2;
optional string sqProjectKey = 3;
- optional string projectKey = 4;
+ optional string sqProjectName = 4;
}
message AlmProject {