From a5db69112b1f2ac607d5adb91f4d03f8832aa7b9 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sun, 12 May 2019 15:22:57 +0200 Subject: [PATCH] SONAR-11950 autoconfig of SCM revision on SemaphoreCI --- .../sonar/scanner/ci/vendors/SemaphoreCi.java | 54 ++++++++++++++ .../scanner/scan/ProjectScanContainer.java | 2 + .../scanner/ci/vendors/SemaphoreCiTest.java | 72 +++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 sonar-scanner-engine/src/main/java/org/sonar/scanner/ci/vendors/SemaphoreCi.java create mode 100644 sonar-scanner-engine/src/test/java/org/sonar/scanner/ci/vendors/SemaphoreCiTest.java diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/ci/vendors/SemaphoreCi.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/ci/vendors/SemaphoreCi.java new file mode 100644 index 00000000000..34d4b083f6f --- /dev/null +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/ci/vendors/SemaphoreCi.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; + +import static org.apache.commons.lang.StringUtils.isNotEmpty; + +/** + * Support https://semaphoreci.com + */ +public class SemaphoreCi implements CiVendor { + private final System2 system; + + public SemaphoreCi(System2 system) { + this.system = system; + } + + @Override + public String getName() { + return "SemaphoreCI"; + } + + @Override + public boolean isDetected() { + return "true".equals(system.envVariable("SEMAPHORE")) && isNotEmpty(system.envVariable("SEMAPHORE_PROJECT_ID")); + } + + @Override + public CiConfiguration loadConfiguration() { + String revision = system.envVariable("SEMAPHORE_GIT_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 edb43371cd2..72c661b876b 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.SemaphoreCi; import org.sonar.scanner.cpd.CpdExecutor; import org.sonar.scanner.cpd.CpdSettings; import org.sonar.scanner.cpd.index.SonarCpdBlockIndex; @@ -269,6 +270,7 @@ public class ProjectScanContainer extends ComponentContainer { new CiConfigurationProvider(), BitbucketPipelines.class, CirrusCi.class, + SemaphoreCi.class, AnalysisObservers.class); diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/ci/vendors/SemaphoreCiTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/ci/vendors/SemaphoreCiTest.java new file mode 100644 index 00000000000..726a86f6f0e --- /dev/null +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/ci/vendors/SemaphoreCiTest.java @@ -0,0 +1,72 @@ +/* + * 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 SemaphoreCiTest { + + private System2 system = mock(System2.class); + private CiVendor underTest = new SemaphoreCi(system); + + @Test + public void getName() { + assertThat(underTest.getName()).isEqualTo("SemaphoreCI"); + } + + @Test + public void isDetected() { + setEnvVariable("SEMAPHORE", "true"); + setEnvVariable("SEMAPHORE_PROJECT_ID", "d782a107-aaf9-494d-8153-206b1a6bc8e9"); + assertThat(underTest.isDetected()).isTrue(); + + setEnvVariable("SEMAPHORE", "true"); + setEnvVariable("SEMAPHORE_PROJECT_ID", null); + assertThat(underTest.isDetected()).isFalse(); + + setEnvVariable("SEMAPHORE", null); + setEnvVariable("SEMAPHORE_PROJECT_ID", "d782a107-aaf9-494d-8153-206b1a6bc8e9"); + assertThat(underTest.isDetected()).isFalse(); + + setEnvVariable("SEMAPHORE", "foo"); + setEnvVariable("SEMAPHORE_PROJECT_ID", "d782a107-aaf9-494d-8153-206b1a6bc8e9"); + assertThat(underTest.isDetected()).isFalse(); + } + + @Test + public void loadConfiguration() { + setEnvVariable("SEMAPHORE", "true"); + setEnvVariable("SEMAPHORE_PROJECT_ID", "d782a107-aaf9-494d-8153-206b1a6bc8e9"); + setEnvVariable("SEMAPHORE_GIT_SHA", "abd12fc"); + + assertThat(underTest.loadConfiguration().getScmRevision()).hasValue("abd12fc"); + } + + private void setEnvVariable(String key, @Nullable String value) { + when(system.envVariable(key)).thenReturn(value); + } +} -- 2.39.5