From: belen-pruvost-sonarsource <belen.pruvost@sonarsource.com>
Date: Thu, 19 Nov 2020 13:52:57 +0000 (+0100)
Subject: SONAR-14057 Set sqProjectKey and sqProjectName
X-Git-Tag: 8.6.0.39681~66
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7417603c002ea8f534963c75e49777ef5a814cb6;p=sonarqube.git

SONAR-14057 Set sqProjectKey and sqProjectName
---

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
@@ -76,6 +76,11 @@ public class AlmSettingsDbTester {
     return insertProjectAlmSetting(newGitlabProjectAlmSettingDto(gitlabAlmSetting, project));
   }
 
+  @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 {