fix(plugins): Use inputstream for reading bodies (#1072)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
spinnaker · Feb 23, 2020 · cddc1a1 · cddc1a1
1 parent 30f0b59
commit cddc1a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/gate-core/src/main/groovy/com/netflix/spinnaker/gate/services/internal/Front50Service.groovy b/gate-core/src/main/groovy/com/netflix/spinnaker/gate/services/internal/Front50Service.groovy
@@ -19,7 +19,7 @@ package com.netflix.spinnaker.gate.services.internal
 import com.netflix.spinnaker.fiat.model.resources.ServiceAccount
 import retrofit.client.Response
 import retrofit.http.*
-import retrofit.mime.TypedInput
+import retrofit.mime.TypedByteArray
 
 interface Front50Service {
   @GET("/credentials")
@@ -163,11 +163,11 @@ interface Front50Service {
   List<Map> getPluginInfo(@Query("service") String service)
 
   @POST("/pluginBinaries/{id}/{version}")
-  @Headers(["Content-Type: application/zip,application/octet-stream"])
+  @Headers("Content-Type: application/octet-stream")
   Response uploadPluginBinary(
     @Path("id") String pluginId,
     @Path("version") String pluginVersion,
     @Query("sha512sum") String sha512sum,
-    @Body TypedInput pluginBinary
+    @Body TypedByteArray pluginBinary
   );
 }
diff --git a/...gins/src/main/kotlin/com/netflix/spinnaker/gate/plugins/publish/PluginBinaryController.kt b/...gins/src/main/kotlin/com/netflix/spinnaker/gate/plugins/publish/PluginBinaryController.kt
@@ -19,7 +19,6 @@ import com.netflix.spinnaker.gate.services.internal.Front50Service
 import io.swagger.annotations.ApiOperation
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
@@ -33,12 +32,9 @@ class PluginBinaryController(
 ) {
 
   @ApiOperation(value = "Upload a plugin binary")
-  @PostMapping(
-    "/{pluginId}/{pluginVersion}",
-    consumes = ["application/zip", "application/octet-stream"]
-  )
+  @PostMapping("/{pluginId}/{pluginVersion}")
   fun publishBinary(
-    @RequestBody body: InputStream,
+    body: InputStream,
     @PathVariable pluginId: String,
     @PathVariable pluginVersion: String,
     @RequestParam sha512sum: String