From d2b635636fd6718a8ca3b5b3f96816318c28a7b6 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sun, 12 May 2019 16:01:58 +0200 Subject: SONAR-11950 autoconfig of SCM revision on DroneCI --- .../java/org/sonar/scanner/ci/vendors/DroneCi.java | 54 ++++++++++++++++++ .../sonar/scanner/scan/ProjectScanContainer.java | 2 + .../org/sonar/scanner/ci/vendors/DroneCiTest.java | 64 ++++++++++++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 sonar-scanner-engine/src/main/java/org/sonar/scanner/ci/vendors/DroneCi.java create mode 100644 sonar-scanner-engine/src/test/java/org/sonar/scanner/ci/vendors/DroneCiTest.java diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/ci/vendors/DroneCi.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/ci/vendors/DroneCi.java new file mode 100644 index 00000000000..0b601ce9c4e --- /dev/null +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/ci/vendors/DroneCi.java @@ -0,0 +1,54 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.scanner.ci.vendors; + +import org.sonar.api.utils.System2; +import org.sonar.scanner.ci.CiConfiguration; +import org.sonar.scanner.ci.CiConfigurationImpl; +import org.sonar.scanner.ci.CiVendor; + +/** + * Support https://drone.io + * + * Environment variables are documented at https://docs.drone.io/reference/environ/ + */ +public class DroneCi implements CiVendor { + private final System2 system; + + public DroneCi(System2 system) { + this.system = system; + } + + @Override + public String getName() { + return "DroneCI"; + } + + @Override + public boolean isDetected() { + return "true".equals(system.envVariable("CI")) && "true".equals(system.envVariable("DRONE")); + } + + @Override + public CiConfiguration loadConfiguration() { + String revision = system.envVariable("DRONE_COMMIT_SHA"); + return new CiConfigurationImpl(revision); + } +} diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java index 72c661b876b..02532a425a6 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java @@ -49,6 +49,7 @@ import org.sonar.scanner.bootstrap.ProcessedScannerProperties; import org.sonar.scanner.ci.CiConfigurationProvider; import org.sonar.scanner.ci.vendors.BitbucketPipelines; import org.sonar.scanner.ci.vendors.CirrusCi; +import org.sonar.scanner.ci.vendors.DroneCi; import org.sonar.scanner.ci.vendors.SemaphoreCi; import org.sonar.scanner.cpd.CpdExecutor; import org.sonar.scanner.cpd.CpdSettings; @@ -270,6 +271,7 @@ public class ProjectScanContainer extends ComponentContainer { new CiConfigurationProvider(), BitbucketPipelines.class, CirrusCi.class, + DroneCi.class, SemaphoreCi.class, AnalysisObservers.class); diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/ci/vendors/DroneCiTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/ci/vendors/DroneCiTest.java new file mode 100644 index 00000000000..1d148f018b0 --- /dev/null +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/ci/vendors/DroneCiTest.java @@ -0,0 +1,64 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.scanner.ci.vendors; + +import javax.annotation.Nullable; +import org.junit.Test; +import org.sonar.api.utils.System2; +import org.sonar.scanner.ci.CiVendor; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class DroneCiTest { + + private System2 system = mock(System2.class); + private CiVendor underTest = new DroneCi(system); + + @Test + public void getName() { + assertThat(underTest.getName()).isEqualTo("DroneCI"); + } + + @Test + public void isDetected() { + setEnvVariable("CI", "true"); + setEnvVariable("DRONE", "true"); + assertThat(underTest.isDetected()).isTrue(); + + setEnvVariable("CI", "true"); + setEnvVariable("DRONE", null); + assertThat(underTest.isDetected()).isFalse(); + } + + @Test + public void loadConfiguration() { + setEnvVariable("CI", "true"); + setEnvVariable("DRONE", "true"); + setEnvVariable("DRONE_COMMIT_SHA", "abd12fc"); + + assertThat(underTest.loadConfiguration().getScmRevision()).hasValue("abd12fc"); + } + + private void setEnvVariable(String key, @Nullable String value) { + when(system.envVariable(key)).thenReturn(value); + } +} -- cgit v1.2.3