Remove support for Helm v21.1.0

- Remove mapping to helm v2 when version desired is not provided
- Remove Helm v2 clients from container

Issue-ID: SDC-3185
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: I43def179ee35ade76905a88f83bd17b9be787481

3 files changed, 22 insertions, 24 deletions

diff --git a/src/main/java/org/onap/sdc/helmvalidator/helm/versions/ChartBasedVersionProvider.java b/src/main/java/org/onap/sdc/helmvalidator/helm/versions/ChartBasedVersionProvider.java
index b892a33..c3e423f 100644
--- a/src/main/java/org/onap/sdc/helmvalidator/helm/versions/ChartBasedVersionProvider.java
+++ b/src/main/java/org/onap/sdc/helmvalidator/helm/versions/ChartBasedVersionProvider.java
@@ -20,6 +20,7 @@
 
 package org.onap.sdc.helmvalidator.helm.versions;
 
+import java.util.List;
 import org.onap.sdc.helmvalidator.helm.versions.exception.NotSupportedApiVersionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,6 +28,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class ChartBasedVersionProvider {
 
+    private static final List<String> SUPPORTED_API_VERSIONS = List.of("v1", "v2");
+    private static final String HELM_3 = "3";
+
     private final SupportedVersionsProvider supportedVersionsProvider;
     private final ApiVersionsReader apiVersionsReader;
 
@@ -40,18 +44,14 @@ public class ChartBasedVersionProvider {
 
     public String getVersion(String chartPath) {
         String apiVersion = apiVersionsReader.readVersion(chartPath);
-        return mapToChartVersion(apiVersion);
+        return mapToHelmVersion(apiVersion);
     }
 
-    private String mapToChartVersion(String apiVersion) {
-        switch (apiVersion) {
-            case "v1":
-                return supportedVersionsProvider.getLatestVersion("2");
-            case "v2":
-                return supportedVersionsProvider.getLatestVersion("3");
-            default:
-                throw new NotSupportedApiVersionException("Cannot obtain Helm version from API version: " + apiVersion);
+    private String mapToHelmVersion(String apiVersion) {
+        if (!SUPPORTED_API_VERSIONS.contains(apiVersion)) {
+            throw new NotSupportedApiVersionException("Cannot obtain Helm version from API version: " + apiVersion);
         }
+        return supportedVersionsProvider.getLatestVersion(HELM_3);
     }
 
 }
diff --git a/src/test/java/org/onap/sdc/helmvalidator/helm/versions/ApiVersionsReaderTest.java b/src/test/java/org/onap/sdc/helmvalidator/helm/versions/ApiVersionsReaderTest.java
index 79ea56a..2dbb6c1 100644
--- a/src/test/java/org/onap/sdc/helmvalidator/helm/versions/ApiVersionsReaderTest.java
+++ b/src/test/java/org/onap/sdc/helmvalidator/helm/versions/ApiVersionsReaderTest.java
@@ -36,13 +36,12 @@ import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.onap.sdc.helmvalidator.helm.versions.exception.ApiVersionNotFoundException;
 import org.onap.sdc.helmvalidator.helm.versions.exception.ReadFileException;
 
 class ApiVersionsReaderTest {
 
+    private static final String API_VERSION_V2= "v2";
     private static final String TEST_RESOURCES_TMP = "src/test/resources/tmp";
     private static final Path TEST_CHART_PATH = Path.of(TEST_RESOURCES_TMP).resolve(Path.of("Chart.yaml"));
 
@@ -55,14 +54,13 @@ class ApiVersionsReaderTest {
         apiVersionsReader = new ApiVersionsReader();
     }
 
-    @ParameterizedTest
-    @ValueSource(strings = {"v1", "v2"})
-    void shouldCorrectlyReadApiVersionFromTar(String apiVersion) throws IOException {
-        prepareTestTar(apiVersion);
+    @Test
+    void shouldCorrectlyReadApiVersionFromTar() throws IOException {
+        prepareTestTar(API_VERSION_V2);
 
         String helmVersion = apiVersionsReader.readVersion(TEST_TAR_PATH.toString());
 
-        assertThat(helmVersion).isEqualTo(apiVersion);
+        assertThat(helmVersion).isEqualTo(API_VERSION_V2);
     }
 
     @Test
diff --git a/src/test/java/org/onap/sdc/helmvalidator/helm/versions/ChartBasedVersionProviderTest.java b/src/test/java/org/onap/sdc/helmvalidator/helm/versions/ChartBasedVersionProviderTest.java
index 64daf2d..7819aa5 100644
--- a/src/test/java/org/onap/sdc/helmvalidator/helm/versions/ChartBasedVersionProviderTest.java
+++ b/src/test/java/org/onap/sdc/helmvalidator/helm/versions/ChartBasedVersionProviderTest.java
@@ -27,8 +27,6 @@ import static org.mockito.Mockito.when;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -37,6 +35,9 @@ import org.onap.sdc.helmvalidator.helm.versions.exception.NotSupportedApiVersion
 @ExtendWith(MockitoExtension.class)
 class ChartBasedVersionProviderTest {
 
+    private static final String EXPECTED_HELM_VERSION = "3.4.3";
+    private static final String API_VERSION = "v2";
+
     private final String testChartPath = "test/path";
     @Mock
     private SupportedVersionsProvider versionsProvider;
@@ -49,15 +50,14 @@ class ChartBasedVersionProviderTest {
         chartBasedVersionProvider = new ChartBasedVersionProvider(versionsProvider, apiVersionsReader);
     }
 
-    @ParameterizedTest
-    @CsvSource({"v1,2.18", "v2,3.11"})
-    void shouldGetLatestHelmVersionBasedOnApiVersion(String apiVersion, String expectedHelmVersion) {
-        when(apiVersionsReader.readVersion(testChartPath)).thenReturn(apiVersion);
-        when(versionsProvider.getLatestVersion(Mockito.anyString())).thenReturn(expectedHelmVersion);
+    @Test
+    void shouldGetLatestHelmVersionBasedOnApiVersion() {
+        when(apiVersionsReader.readVersion(testChartPath)).thenReturn(API_VERSION);
+        when(versionsProvider.getLatestVersion(Mockito.anyString())).thenReturn(EXPECTED_HELM_VERSION);
 
         String helmVersion = chartBasedVersionProvider.getVersion(testChartPath);
 
-        assertThat(helmVersion).isEqualTo(expectedHelmVersion);
+        assertThat(helmVersion).isEqualTo(EXPECTED_HELM_VERSION);
     }
 
     @Test