Merge branch 'master' into kustomize-enable-helm

spinnaker · Sep 28, 2023 · 2a79f27 · 2a79f27
2 parents 95eec80 + 70a06b0
commit 2a79f27
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-korkVersion=7.182.1
+korkVersion=7.191.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.31.0
 targetJava11=true

diff --git a/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/ManifestTestUtils.java b/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/ManifestTestUtils.java
@@ -16,7 +16,6 @@
 
 package com.netflix.spinnaker.rosco.manifests;
 
-import com.netflix.spinnaker.kork.retrofit.exceptions.RetrofitException;
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException;
 import okhttp3.MediaType;
 import okhttp3.ResponseBody;
@@ -48,6 +47,6 @@ public static SpinnakerHttpException makeSpinnakerHttpException(int status) {
  .addConverterFactory(JacksonConverterFactory.create())
  .build();
 
- return new SpinnakerHttpException(RetrofitException.httpError(retrofit2Response, retrofit));
+ return new SpinnakerHttpException(retrofit2Response, retrofit);
  }
 }
diff --git a/...c/test/java/com/netflix/spinnaker/rosco/manifests/helmfile/HelmfileTemplateUtilsTest.java b/...c/test/java/com/netflix/spinnaker/rosco/manifests/helmfile/HelmfileTemplateUtilsTest.java
@@ -18,10 +18,10 @@
 
 import static com.netflix.spinnaker.rosco.manifests.ManifestTestUtils.makeSpinnakerHttpException;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;

diff --git a/rosco-web/src/test/java/com/netflix/spinnaker/rosco/controllers/V2BakeryControllerTest.java b/rosco-web/src/test/java/com/netflix/spinnaker/rosco/controllers/V2BakeryControllerTest.java
@@ -26,7 +26,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.netflix.spinnaker.kork.artifacts.model.Artifact;
-import com.netflix.spinnaker.kork.retrofit.exceptions.RetrofitException;
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException;
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerServerException;
 import com.netflix.spinnaker.rosco.Main;
@@ -127,6 +126,6 @@ private static SpinnakerHttpException makeSpinnakerHttpException(int status) {
  .addConverterFactory(JacksonConverterFactory.create())
  .build();
 
- return new SpinnakerHttpException(RetrofitException.httpError(retrofit2Response, retrofit));
+ return new SpinnakerHttpException(retrofit2Response, retrofit);
  }
 }