SLCORE-1116: Token for SonarQube Cloud ITs

The option to log in with username/password will be removed from SonarQube Cloud in the future.

Author: thahnen

.cirrus.yml

@@ -186,7 +186,7 @@ qa_task:
           SQ_VERSION: "SonarCloud"
           JDK_VERSION: "17"
           CATEGORY: "-Dgroups=SonarCloud"
-          SONARCLOUD_IT_PASSWORD: VAULT[development/team/sonarlint/kv/data/sonarcloud-it data.password]
+          SONARCLOUD_IT_TOKEN: VAULT[development/team/sonarlint/kv/data/sonarcloud-it data.token]
           QA_CATEGORY: SonarCloud
       -  env:
           SQ_VERSION: "DEV"

its/README.md

@@ -9,7 +9,7 @@
 
 1. Make sure your Developer Box is properly setup (see xtranet)
 2. Configure Orchestrator settings as described [here](https://github.com/SonarSource/orchestrator#configuration). The Artifactory API key and GitHub token are the only mandatory options. The GH token is a Personal Access Token (classic) with the `repo` scope permission, and SSO properly configured
-3. For SonarCloud ITs, make sure the `SONARCLOUD_IT_PASSWORD` env var is defined (you can find the value in our password management tool)
+3. For SonarCloud ITs, make sure the `SONARCLOUD_IT_TOKEN` env var is defined (you can find the value in our password management tool)
 4. Run `mvn clean install` a first time from this `its` folder so that test resources are built (like custom plugins)
 
 # Running ITs from IntelliJ

its/tests/src/test/java/its/SonarCloudTests.java

@@ -130,14 +130,12 @@ class SonarCloudTests extends AbstractConnectedTests {
   private static final URI SONARCLOUD_STAGING_URL = URI.create("https://sc-staging.io");
   private static final URI SONARCLOUD_WEBSOCKETS_STAGING_URL = URI.create("wss://events-api.sc-staging.io/");
   private static final String SONARCLOUD_ORGANIZATION = "sonarlint-it";
-  private static final String SONARCLOUD_USER = "sonarlint-it";
-  private static final String SONARCLOUD_PASSWORD = System.getenv("SONARCLOUD_IT_PASSWORD");
+  private static final String SONARCLOUD_TOKEN = System.getenv("SONARCLOUD_IT_TOKEN");
 
   private static final String TIMESTAMP = Long.toString(Instant.now().toEpochMilli());
   private static final String TOKEN_NAME = "SLCORE-IT-" + TIMESTAMP;
   private static final String PROJECT_KEY_JAVA = "sample-java";
-
-
+  
   public static final String CONNECTION_ID = "sonarcloud";
 
   private static WsClient adminWsClient;
@@ -195,7 +193,7 @@ static void prepare() throws Exception {
   static void cleanup() throws Exception {
     adminWsClient.userTokens()
       .revoke(new RevokeRequest().setName(TOKEN_NAME));
-
+    
     var request = new PostRequest("api/projects/bulk_delete");
     request.setParam("q", "-" + randomPositiveInt);
     request.setParam("organization", SONARCLOUD_ORGANIZATION);
@@ -277,7 +275,7 @@ void should_use_enterprise_csharp_analyzer_with_sonarcloud() {
   void getAllProjects() {
     provisionProject("foo-bar", "Foo");
     var getAllProjectsParams = new GetAllProjectsParams(new TransientSonarCloudConnectionDto(SONARCLOUD_ORGANIZATION,
-      Either.forRight(new UsernamePasswordDto(SONARCLOUD_USER, SONARCLOUD_PASSWORD))));
+      Either.forLeft(new TokenDto(SONARCLOUD_TOKEN))));
 
     waitAtMost(1, TimeUnit.MINUTES).untilAsserted(() -> assertThat(backend.getConnectionService().getAllProjects(getAllProjectsParams).get().getSonarProjects())
       .extracting(SonarProjectDto::getKey)
@@ -406,14 +404,14 @@ void analysisUseConfiguration() {
   @Test
   void downloadUserOrganizations() throws ExecutionException, InterruptedException {
     var response = backend.getConnectionService()
-      .listUserOrganizations(new ListUserOrganizationsParams(Either.forRight(new UsernamePasswordDto(SONARCLOUD_USER, SONARCLOUD_PASSWORD)))).get();
+      .listUserOrganizations(new ListUserOrganizationsParams(Either.forLeft(new TokenDto(SONARCLOUD_TOKEN)))).get();
     assertThat(response.getUserOrganizations()).hasSize(1);
   }
 
   @Test
   void getOrganization() throws ExecutionException, InterruptedException {
     var response = backend.getConnectionService()
-      .getOrganization(new GetOrganizationParams(Either.forRight(new UsernamePasswordDto(SONARCLOUD_USER, SONARCLOUD_PASSWORD)), SONARCLOUD_ORGANIZATION)).get();
+      .getOrganization(new GetOrganizationParams(Either.forLeft(new TokenDto(SONARCLOUD_TOKEN)), SONARCLOUD_ORGANIZATION)).get();
     var org = response.getOrganization();
     assertThat(org).isNotNull();
     assertThat(org.getKey()).isEqualTo(SONARCLOUD_ORGANIZATION);
@@ -484,13 +482,13 @@ void analysisXml() {
   void testConnection() throws ExecutionException, InterruptedException {
     var successResponse = backend.getConnectionService()
       .validateConnection(
-        new ValidateConnectionParams(new TransientSonarCloudConnectionDto(SONARCLOUD_ORGANIZATION, Either.forRight(new UsernamePasswordDto(SONARCLOUD_USER, SONARCLOUD_PASSWORD)))))
+        new ValidateConnectionParams(new TransientSonarCloudConnectionDto(SONARCLOUD_ORGANIZATION, Either.forLeft(new TokenDto(SONARCLOUD_TOKEN)))))
       .get();
     assertThat(successResponse.isSuccess()).isTrue();
     assertThat(successResponse.getMessage()).isEqualTo("Authentication successful");
 
     var failIfWrongOrg = backend.getConnectionService().validateConnection(
-      new ValidateConnectionParams(new TransientSonarCloudConnectionDto("not-exists", Either.forRight(new UsernamePasswordDto(SONARCLOUD_USER, SONARCLOUD_PASSWORD))))).get();
+      new ValidateConnectionParams(new TransientSonarCloudConnectionDto("not-exists", Either.forLeft(new TokenDto(SONARCLOUD_TOKEN))))).get();
     assertThat(failIfWrongOrg.isSuccess()).isFalse();
     assertThat(failIfWrongOrg.getMessage()).isEqualTo("No organizations found for key: not-exists");
 
@@ -621,7 +619,7 @@ private void setSettingsMultiValue(@Nullable String moduleKey, String key, Strin
   public static WsClient newAdminWsClient() {
     return WsClientFactories.getDefault().newClient(HttpConnector.newBuilder()
       .url(SONARCLOUD_STAGING_URL.toString())
-      .credentials(SONARCLOUD_USER, SONARCLOUD_PASSWORD)
+      .token(SONARCLOUD_TOKEN)
       .build());
   }
 
@@ -675,7 +673,7 @@ private static SonarLintRpcClientDelegate newDummySonarLintClient() {
       @Override
       public Either<TokenDto, UsernamePasswordDto> getCredentials(String connectionId) throws ConnectionNotFoundException {
         if (connectionId.equals(CONNECTION_ID)) {
-          return Either.forRight(new UsernamePasswordDto(SONARCLOUD_USER, SONARCLOUD_PASSWORD));
+          return Either.forLeft(new TokenDto(SONARCLOUD_TOKEN));
         }
         return super.getCredentials(connectionId);
       }