move target from body to uri

lhns · Mar 31, 2022 · d5a0072 · d5a0072
1 parent 001a1f2
commit d5a0072
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -3,6 +3,15 @@
 A vendor-neutral and modular way to deploy your App with `curl` from a CI/CD-Pipeline to your Container Cluster of
 choice.
 
+## Example
+
+```shell
+curl -sSf -H "Authorization: Bearer <secret>" -d "{
+ \"resource\": \"my-app\",
+ \"value\": \"ghcr.io/my/app:1.0.0\"
+}" http:https://localhost:8080/deploy/<target>
+```
+
 ## Supported
 
 - Docker Swarm via Portainer API

diff --git a/server/src/main/scala/de/lolhens/kubedeploy/model/DeployRequest.scala b/server/src/main/scala/de/lolhens/kubedeploy/model/DeployRequest.scala
@@ -2,12 +2,10 @@ package de.lolhens.kubedeploy.model
 
 import cats.syntax.functor._
 import de.lolhens.kubedeploy.model.DeployRequest.Locator
-import de.lolhens.kubedeploy.model.DeployTarget.DeployTargetId
 import io.circe.generic.semiauto._
 import io.circe.{Codec, Decoder, Encoder, Json}
 
 case class DeployRequest(
- target: DeployTargetId,
  resource: String,
  value: String,
  locator: Option[Locator],

diff --git a/server/src/main/scala/de/lolhens/kubedeploy/route/KubedeployRoutes.scala b/server/src/main/scala/de/lolhens/kubedeploy/route/KubedeployRoutes.scala
@@ -7,6 +7,7 @@ import de.lolhens.http4s.errors.{ErrorResponseEncoder, ErrorResponseLogger}
 import de.lolhens.kubedeploy.JsonOf
 import de.lolhens.kubedeploy.deploy.PortainerDeploy
 import de.lolhens.kubedeploy.model.DeployResult.DeployFailure
+import de.lolhens.kubedeploy.model.DeployTarget.DeployTargetId
 import de.lolhens.kubedeploy.model.{DeployRequest, DeployResult, DeployTarget}
 import de.lolhens.kubedeploy.repo.DeployTargetRepo
 import org.http4s.client.Client
@@ -29,15 +30,15 @@ class KubedeployRoutes(client: Client[IO], deployTargetRepo: DeployTargetRepo[IO
 
  def toRoutes: HttpRoutes[IO] = HttpRoutes.of {
  case GET -> Root / "health" => Ok()
- case request@POST -> Root / "deploy" =>
+ case request@POST -> Root / "deploy" / target =>
  (for {
- deployRequest <- request.as[JsonOf[DeployRequest]].map(_.value).orErrorResponse(BadRequest)
- deployTarget <- OptionT(deployTargetRepo.get(deployRequest.target))
+ deployTarget <- OptionT(deployTargetRepo.get(DeployTargetId(target)))
  .toRight(DeployFailure("target not found")).toErrorResponse(NotFound)
  _ <- EitherT.fromOption[IO](request.headers.get[Authorization].collect {
  case Authorization(Credentials.Token(AuthScheme.Bearer, secret)) if secret == deployTarget.secret.value =>
  ()
  }, "not authorized").toErrorResponse(Unauthorized)
+ deployRequest <- request.as[JsonOf[DeployRequest]].map(_.value).orErrorResponse(BadRequest)
  deploy <- IO(deployTarget match {
  case DeployTarget(_, _, Some(portainerDeployTarget)) =>
  new PortainerDeploy(client, portainerDeployTarget)