From e8ffd89afe0ecaea47ed913dbdc8abad7eb6d181 Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Sun, 29 Oct 2023 23:05:30 -0400 Subject: [PATCH] chore(dependencies): Autobump korkVersion (#1036) * chore(dependencies): Autobump korkVersion * fix(manifests/test): keep up with SpinnakerNetworkException constructor changes from https://github.com/spinnaker/kork/pull/1110 --------- Co-authored-by: root Co-authored-by: David Byron --- gradle.properties | 2 +- rosco-manifests/rosco-manifests.gradle | 1 + .../spinnaker/rosco/manifests/ArtifactDownloaderImplTest.java | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 525916597..86d787c9b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -korkVersion=7.195.0 +korkVersion=7.196.0 org.gradle.parallel=true spinnakerGradleVersion=8.31.0 targetJava11=true diff --git a/rosco-manifests/rosco-manifests.gradle b/rosco-manifests/rosco-manifests.gradle index d135d0997..fe9058215 100644 --- a/rosco-manifests/rosco-manifests.gradle +++ b/rosco-manifests/rosco-manifests.gradle @@ -15,6 +15,7 @@ dependencies { implementation "com.squareup.retrofit2:retrofit" testImplementation "org.assertj:assertj-core" + testImplementation "com.squareup.okhttp3:okhttp" testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.junit.jupiter:junit-jupiter-params" testImplementation "org.mockito:mockito-core" diff --git a/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/ArtifactDownloaderImplTest.java b/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/ArtifactDownloaderImplTest.java index 041ad76b4..9d03b963a 100644 --- a/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/ArtifactDownloaderImplTest.java +++ b/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/ArtifactDownloaderImplTest.java @@ -30,6 +30,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import okhttp3.Request; import okhttp3.ResponseBody; import org.junit.jupiter.api.Test; import retrofit2.Call; @@ -58,11 +59,12 @@ public void downloadsArtifactContent() throws IOException { @Test public void retries() throws IOException { ArtifactDownloaderImpl artifactDownloader = new ArtifactDownloaderImpl(clouddriverService); + Request request = new Request.Builder().url("http://some-url").build(); String testContent = "abcdefg"; try (ArtifactDownloaderImplTest.AutoDeletingFile file = new AutoDeletingFile()) { when(clouddriverService.fetchArtifact(testArtifact)).thenReturn(mockCall); when(mockCall.execute()) - .thenThrow(new SpinnakerNetworkException(new IOException("timeout"))) + .thenThrow(new SpinnakerNetworkException(new IOException("timeout"), request)) .thenReturn(successfulResponse(testContent)); artifactDownloader.downloadArtifactToFile(testArtifact, file.path);