Skip to content

Commit

Permalink
IA-5009: resolve sonarcloud issues (#18)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cpate4
cpate4 authored Jul 3, 2024
1 parent b4da072 commit becbc05
Show file tree
Hide file tree
Showing 4 changed files with 150 additions and 150 deletions.
2 changes: 1 addition & 1 deletion service/src/main/java/bio/terra/appmanager/model/Chart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public record Chart(
// Must follow chart value conventions:
// https://helm.sh/docs/chart_best_practices/conventions/#version-numbers
// Semver conventions, with digits only
static final String chartValueRegex = "^([0-9]\\d*)\\.([0-9]\\d*)\\.([0-9]\\d*)$";
static final String chartValueRegex = "^(\\d+)\\.(\\d+)\\.(\\d+)$";
static final Pattern chartVersionPattern = Pattern.compile(chartValueRegex);

public static boolean isChartNameValid(String chartName) {
Expand Down
14 changes: 7 additions & 7 deletions service/src/test/java/bio/terra/appmanager/api/AdminControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ class AdminControllerTest {

private MockMvc mockMvc;

@Captor ArgumentCaptor<List<bio.terra.appmanager.model.Chart>> capture_Charts;
@Captor ArgumentCaptor<String> capture_chartName;
@Captor ArgumentCaptor<List<bio.terra.appmanager.model.Chart>> captureCharts;
@Captor ArgumentCaptor<String> captureChartName;

private AutoCloseable closeable;

Expand Down Expand Up @@ -82,9 +82,9 @@ void testCreate_204() throws Exception {
+ "}]"))
.andExpect(status().isNoContent());

verify(serviceMock).createCharts(capture_Charts.capture());
assert (capture_Charts.getValue().size() == 1);
verifyChart(capture_Charts.getValue().get(0), chartName, chartVersion, null, null, null);
verify(serviceMock).createCharts(captureCharts.capture());
assert (captureCharts.getValue().size() == 1);
verifyChart(captureCharts.getValue().get(0), chartName, chartVersion, null, null, null);
}

@Test
Expand Down Expand Up @@ -192,8 +192,8 @@ void testDelete_204() throws Exception {
.perform(delete("/api/admin/v1/charts").queryParam("chartName", chartName))
.andExpect(status().isNoContent());

verify(serviceMock).deleteVersion(capture_chartName.capture());
assertEquals(capture_chartName.getValue(), chartName);
verify(serviceMock).deleteVersion(captureChartName.capture());
assertEquals(captureChartName.getValue(), chartName);
}

@Test
Expand Down
191 changes: 97 additions & 94 deletions service/src/test/java/bio/terra/appmanager/dao/ChartDaoTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,86 +58,86 @@ void testMultiVersionUpsert() {

@Test
void testMultiNameGet() {
String chartName1 = "chart-name-here";
String chartVersion1_1 = ChartTestUtils.makeChartVersion(0);
String chartVersion1_2 = ChartTestUtils.makeChartVersion(1);
Chart version1_1 = new Chart(chartName1, chartVersion1_1);
Chart version1_2 = new Chart(chartName1, chartVersion1_2);

String chartName2 = "chart-name-here-too";
String chartVersion2_1 = ChartTestUtils.makeChartVersion(2);
String chartVersion2_2 = ChartTestUtils.makeChartVersion(3);
Chart version2_1 = new Chart(chartName2, chartVersion2_1);
Chart version2_2 = new Chart(chartName2, chartVersion2_2);

String chartName3 = "chart-name";
String chartVersion3_1 = ChartTestUtils.makeChartVersion(4);
String chartVersion3_2 = ChartTestUtils.makeChartVersion(5);
Chart version3_1 = new Chart(chartName3, chartVersion3_1);
Chart version3_2 = new Chart(chartName3, chartVersion3_2);

chartDao.upsert(version1_1);
chartDao.upsert(version1_2);
chartDao.upsert(version2_1);
chartDao.upsert(version2_2);
chartDao.upsert(version3_1);
chartDao.upsert(version3_2);

List<Chart> storedVersions = chartDao.get((List.of(chartName1, chartName2)));
String chart1Name = "chart-name-here";
String chart1Version1 = ChartTestUtils.makeChartVersion(0);
String chart1Version2 = ChartTestUtils.makeChartVersion(1);
Chart oldChart1 = new Chart(chart1Name, chart1Version1);
Chart newChart1 = new Chart(chart1Name, chart1Version2);

String chart2Name = "chart-name-here-too";
String chart2Version1 = ChartTestUtils.makeChartVersion(2);
String chart2Version2 = ChartTestUtils.makeChartVersion(3);
Chart oldChart2 = new Chart(chart2Name, chart2Version1);
Chart newChart2 = new Chart(chart2Name, chart2Version2);

String chart3Name = "chart-name";
String chart3Version1 = ChartTestUtils.makeChartVersion(4);
String chart3Version2 = ChartTestUtils.makeChartVersion(5);
Chart oldChart3 = new Chart(chart3Name, chart3Version1);
Chart newChart3 = new Chart(chart3Name, chart3Version2);

chartDao.upsert(oldChart1);
chartDao.upsert(newChart1);
chartDao.upsert(oldChart2);
chartDao.upsert(newChart2);
chartDao.upsert(oldChart3);
chartDao.upsert(newChart3);

List<Chart> storedVersions = chartDao.get((List.of(chart1Name, chart2Name)));
assertEquals(2, storedVersions.size());

List<Chart> targetCharts =
storedVersions.stream().filter(version -> chartName1.equals(version.name())).toList();
storedVersions.stream().filter(version -> chart1Name.equals(version.name())).toList();
assertEquals(1, targetCharts.size());
Chart targetVersion = targetCharts.get(0);
assertEquals(chartVersion1_2, targetVersion.version());
assertEquals(chart1Version2, targetVersion.version());

targetCharts =
storedVersions.stream().filter(version -> chartName2.equals(version.name())).toList();
storedVersions.stream().filter(version -> chart2Name.equals(version.name())).toList();
assertEquals(1, targetCharts.size());
targetVersion = targetCharts.get(0);
assertEquals(chartVersion2_2, targetVersion.version());
assertEquals(chart2Version2, targetVersion.version());
}

@Test
void testGetAll() {
String chartName1 = "chart-name-here";
String chartVersion1_1 = ChartTestUtils.makeChartVersion(0);
String chartVersion1_2 = ChartTestUtils.makeChartVersion(1);
Chart version1_1 = new Chart(chartName1, chartVersion1_1);
Chart version1_2 = new Chart(chartName1, chartVersion1_2);

String chartName2 = "chart-name-here-too";
String chartVersion2_1 = ChartTestUtils.makeChartVersion(3);
String chartVersion2_2 = ChartTestUtils.makeChartVersion(4);
Chart version2_1 = new Chart(chartName2, chartVersion2_1);
Chart version2_2 = new Chart(chartName2, chartVersion2_2);

String chartName3 = "chart-name-here-again";
String chartVersion3_1 = ChartTestUtils.makeChartVersion(5);
String chartVersion3_2 = ChartTestUtils.makeChartVersion(6);
Chart version3_1 = new Chart(chartName3, chartVersion3_1);
Chart version3_2 = new Chart(chartName3, chartVersion3_2);

chartDao.upsert(version1_1);
chartDao.upsert(version1_2);
chartDao.upsert(version2_1);
chartDao.upsert(version2_2);
chartDao.upsert(version3_1);
chartDao.upsert(version3_2);
String chart1Name = "chart-name-here";
String chart1Version1 = ChartTestUtils.makeChartVersion(0);
String chart1Version2 = ChartTestUtils.makeChartVersion(1);
Chart oldChart1 = new Chart(chart1Name, chart1Version1);
Chart newChart1 = new Chart(chart1Name, chart1Version2);

String chart2Name = "chart-name-here-too";
String chart2Version1 = ChartTestUtils.makeChartVersion(3);
String chart2Version2 = ChartTestUtils.makeChartVersion(4);
Chart oldChart2 = new Chart(chart2Name, chart2Version1);
Chart newChart2 = new Chart(chart2Name, chart2Version2);

String chart3Name = "chart-name-here-again";
String chart3Version1 = ChartTestUtils.makeChartVersion(5);
String chart3Version2 = ChartTestUtils.makeChartVersion(6);
Chart oldChart3 = new Chart(chart3Name, chart3Version1);
Chart newChart3 = new Chart(chart3Name, chart3Version2);

chartDao.upsert(oldChart1);
chartDao.upsert(newChart1);
chartDao.upsert(oldChart2);
chartDao.upsert(newChart2);
chartDao.upsert(oldChart3);
chartDao.upsert(newChart3);

List<Chart> storedVersions = chartDao.get(true);
assertEquals(6, storedVersions.size());
}

@Test
void testDelete() {
String chartName1 = "chart-name-here";
String chartVersion1_1 = ChartTestUtils.makeChartVersion(0);
Chart version1_1 = new Chart(chartName1, chartVersion1_1);
String chart1Name = "chart-name-here";
String chart1Version1 = ChartTestUtils.makeChartVersion(0);
Chart chart1 = new Chart(chart1Name, chart1Version1);

chartDao.upsert(version1_1);
chartDao.delete(List.of(chartName1));
chartDao.upsert(chart1);
chartDao.delete(List.of(chart1Name));
List<Chart> deletedVersions = chartDao.get(true);

assertEquals(1, deletedVersions.size());
Expand All @@ -147,61 +147,64 @@ void testDelete() {

@Test
void testDelete_noNames() {
final String chartName1 = "chart-name-here";
String chartVersion1_1 = ChartTestUtils.makeChartVersion(0);
Chart version1_1 = new Chart(chartName1, chartVersion1_1);
final String chart1Name = "chart-name-here";
String chart1Version1 = ChartTestUtils.makeChartVersion(0);
Chart chart1 = new Chart(chart1Name, chart1Version1);

chartDao.upsert(version1_1);
chartDao.upsert(chart1);
chartDao.delete(List.of());
List<Chart> versions = chartDao.get();

assertNotNull(versions);
assertEquals(1, versions.size());
assertEquals(chartName1, versions.get(0).name());
assertEquals(chartVersion1_1, versions.get(0).version());
assertEquals(chart1Name, versions.get(0).name());
assertEquals(chart1Version1, versions.get(0).version());
}

@Test
void testMultiDelete() {
final String chartName1 = "chart-name-here";
String chartVersion1_1 = ChartTestUtils.makeChartVersion(0);
String chartVersion1_2 = ChartTestUtils.makeChartVersion(1);
Chart version1_1 = new Chart(chartName1, chartVersion1_1);
Chart version1_2 = new Chart(chartName1, chartVersion1_2);

final String chartName2 = "chart-name-here-too";
String chartVersion2_1 = ChartTestUtils.makeChartVersion(2);
String chartVersion2_2 = ChartTestUtils.makeChartVersion(3);
Chart version2_1 = new Chart(chartName2, chartVersion2_1);
Chart version2_2 = new Chart(chartName2, chartVersion2_2);

final String chartName3 = "chart-version-name-again";
String chartVersion3_1 = ChartTestUtils.makeChartVersion(4);
String chartVersion3_2 = ChartTestUtils.makeChartVersion(5);
Chart version3_1 = new Chart(chartName3, chartVersion3_1);
Chart version3_2 = new Chart(chartName3, chartVersion3_2);

chartDao.upsert(version1_1);
chartDao.upsert(version1_2);
chartDao.upsert(version2_1);
chartDao.upsert(version2_2);
chartDao.upsert(version3_1);
chartDao.upsert(version3_2);

chartDao.delete(List.of(chartName1, chartName2));
final String chart1Name = "chart-name-here";
String chart1Version1 = ChartTestUtils.makeChartVersion(0);
String chart1Version2 = ChartTestUtils.makeChartVersion(1);
Chart oldChart1 = new Chart(chart1Name, chart1Version1);
Chart newChart1 = new Chart(chart1Name, chart1Version2);

final String chart2Name = "chart-name-here-too";
String chart2Version1 = ChartTestUtils.makeChartVersion(2);
String chart2Version2 = ChartTestUtils.makeChartVersion(3);
Chart oldChart2 = new Chart(chart2Name, chart2Version1);
Chart newChart2 = new Chart(chart2Name, chart2Version2);

final String chart3Name = "chart-version-name-again";
String chart3Version1 = ChartTestUtils.makeChartVersion(4);
String chart3Version2 = ChartTestUtils.makeChartVersion(5);
Chart oldChart3 = new Chart(chart3Name, chart3Version1);
Chart newChart3 = new Chart(chart3Name, chart3Version2);

chartDao.upsert(oldChart1);
chartDao.upsert(newChart1);
chartDao.upsert(oldChart2);
chartDao.upsert(newChart2);
chartDao.upsert(oldChart3);
chartDao.upsert(newChart3);

chartDao.delete(List.of(chart1Name, chart2Name));

List<Chart> allVersions = chartDao.get(true);
for (Chart version : allVersions) {
switch (version.name()) {
case chartName1, chartName2:
case chart1Name, chart2Name:
assertNotNull(version.inactiveAt());
break;
case chartName3:
if (chartVersion3_2.equals(version.version())) {
case chart3Name:
if (chart3Version2.equals(version.version())) {
assertNull(version.inactiveAt());
} else {
assertNotNull(version.inactiveAt());
}
break;
default:
throw new IllegalStateException("unexpected chartName encountered");
}
}
}
Expand Down
Loading

0 comments on commit becbc05

Please sign in to comment.