From 2bca4d1dd0b0bed483a574798f5820d8e26f096d Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Thu, 14 Nov 2024 16:24:28 +0100 Subject: [PATCH] chore(clearly-defined): Use "raw" mode for getting harvest data While "streamed" should be an alias for "raw", the former seems to cause "Bad Gateway" responses. Use "raw" instead which does not seem to have these problems and is more speaking anyway, as it is used to get the raw results of a harvest tool. Signed-off-by: Sebastian Schuberth --- .../clearly-defined/src/main/kotlin/ClearlyDefinedService.kt | 2 +- scanner/src/test/kotlin/storages/ClearlyDefinedStorageTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/clearly-defined/src/main/kotlin/ClearlyDefinedService.kt b/clients/clearly-defined/src/main/kotlin/ClearlyDefinedService.kt index 12e304696ea12..f24810c226484 100644 --- a/clients/clearly-defined/src/main/kotlin/ClearlyDefinedService.kt +++ b/clients/clearly-defined/src/main/kotlin/ClearlyDefinedService.kt @@ -265,7 +265,7 @@ interface ClearlyDefinedService { * sense for the provider), see * https://api.clearlydefined.io/api-docs/#/harvest/get_harvest__type___provider___namespace___name___revision___tool___toolVersion_ */ - @GET("harvest/{coordinates}/{tool}/{toolVersion}?form=streamed") + @GET("harvest/{coordinates}/{tool}/{toolVersion}?form=raw") suspend fun harvestToolData( @Path("coordinates", encoded = true) coordinates: Coordinates, @Path("tool") tool: String, diff --git a/scanner/src/test/kotlin/storages/ClearlyDefinedStorageTest.kt b/scanner/src/test/kotlin/storages/ClearlyDefinedStorageTest.kt index c4c57ea595ad2..cd838810ce31b 100644 --- a/scanner/src/test/kotlin/storages/ClearlyDefinedStorageTest.kt +++ b/scanner/src/test/kotlin/storages/ClearlyDefinedStorageTest.kt @@ -355,7 +355,7 @@ private fun stubHarvestToolResponse(server: WireMockServer, coordinates: Coordin val urlPath = "/harvest/${toolUrl(coordinates, "scancode", SCANCODE_VERSION)}" server.stubFor( get(urlPathEqualTo(urlPath)) - .withQueryParam("form", equalTo("streamed")) + .withQueryParam("form", equalTo("raw")) .willReturn( aResponse().withStatus(200) .withBodyFile("$TEST_FILES_DIRECTORY/$RESPONSE_FILE")