Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use requests and upickle instead of zio-json #9

Closed
wants to merge 1 commit into from
Closed

Use requests and upickle instead of zio-json #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,10 @@ build/
### VS Code ###
.vscode/

# Metals
.bloop/
.metals/
metals.sbt

### Mac OS ###
.DS_Store
6 changes: 1 addition & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ addCommandAlias("fmtCheck", "all root/scalafmtSbtCheck root/scalafmtCheckAll")
val versions = new {
val scala = "2.12.19"
val sonatypeCentralClient = "0.2.0"
val sttp = "4.0.0-M11"
}

publishTo := sonatypeCentralPublishToBundle.value
Expand Down Expand Up @@ -36,9 +35,6 @@ lazy val root = (project in file("."))
scalacOptions ++= Seq("-Ywarn-unused-import", "-Xfatal-warnings", "-deprecation"),
sbtPluginPublishLegacyMavenStyle := false,
libraryDependencies ++= Seq(
"com.lumidion" %% "sonatype-central-client-sttp-core" % versions.sonatypeCentralClient,
"com.lumidion" %% "sonatype-central-client-zio-json" % versions.sonatypeCentralClient,
"com.softwaremill.sttp.client4" %% "slf4j-backend" % versions.sttp,
"com.softwaremill.sttp.client4" %% "zio-json" % versions.sttp
"com.lumidion" %% "sonatype-central-client-requests" % versions.sonatypeCentralClient
)
)
34 changes: 9 additions & 25 deletions src/main/scala/com/lumidion/sbt/sonatype/central/SonatypeCentralClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,22 @@ package com.lumidion.sbt.sonatype.central
import com.lumidion.sbt.sonatype.central.error.{SonatypeCentralClientError, SonatypeCentralPluginError}
import com.lumidion.sbt.sonatype.central.utils.Extensions.*
import com.lumidion.sonatype.central.client.core.*
import com.lumidion.sonatype.central.client.core.DeploymentState.PUBLISHED
import com.lumidion.sonatype.central.client.sttp.core.SyncSonatypeClient
import com.lumidion.sonatype.central.client.zio.json.decoders.*

import sbt.librarymanagement.ivy.Credentials
import sbt.util.Logger

import sttp.client4.{HttpError, ResponseException}
import sttp.client4.httpurlconnection.HttpURLConnectionBackend
import sttp.client4.logging.slf4j.Slf4jLoggingBackend
import sttp.client4.logging.LoggingOptions
import sttp.client4.ziojson.asJson
import sttp.model.StatusCode

import java.io.File
import scala.math.pow
import scala.util.Try
import com.lumidion.sonatype.central.client.requests.SyncSonatypeClient
import com.lumidion.sonatype.central.client.core.DeploymentState.PUBLISHED

private[central] class SonatypeCentralClient(
client: SyncSonatypeClient
)(implicit val logger: Logger) {

private def retryRequest[A, E](
request: => Either[ResponseException[String, E], A],
request: => Either[Throwable, A],
errorContext: String,
retriesLeft: Int,
retriesAttempted: Int = 0
Expand All @@ -36,13 +28,6 @@ private[central] class SonatypeCentralClient(
SonatypeCentralClientError(new Exception(s"$errorContext. ${err.getMessage}"))
}
finalResponse <- response match {
case Left(HttpError(message, code))
if (code == StatusCode.Forbidden) || (code == StatusCode.Unauthorized) || (code == StatusCode.BadRequest) =>
Left(
SonatypeCentralClientError(
new Exception(s"$errorContext. Status code: ${code.code}. Message Received: $message")
)
)
case Left(ex) =>
if (retriesLeft > 0) {
val exponent = pow(5, retriesAttempted).toInt
Expand All @@ -57,7 +42,9 @@ private[central] class SonatypeCentralClient(
)
retryRequest(request, errorContext, retriesLeft - 1, retriesAttempted + 1)
} else {
Left(SonatypeCentralClientError(ex))
ex match {
case ex: Exception => Left(SonatypeCentralClientError(ex))
}
}
case Right(res) => Right(res)
}
Expand All @@ -71,7 +58,7 @@ private[central] class SonatypeCentralClient(
logger.info(s"Uploading bundle ${localBundlePath.getPath} to Sonatype Central")

retryRequest(
client.uploadBundle(localBundlePath, deploymentName, publishingType).body,
Try(client.uploadBundleFromFile(localBundlePath, deploymentName, publishingType)).toEither,
"Error uploading bundle to Sonatype Central",
60
)
Expand All @@ -84,7 +71,7 @@ private[central] class SonatypeCentralClient(

for {
response <- retryRequest(
client.checkStatus(deploymentId)(asJson[CheckStatusResponse]).body,
Try(client.checkStatus(deploymentId)).toEither,
"Error checking deployment status",
10
)
Expand Down Expand Up @@ -125,11 +112,8 @@ private[central] object SonatypeCentralClient {
)
}
.map(directCredentials => SonatypeCredentials(directCredentials.userName, directCredentials.passwd))
backend = Slf4jLoggingBackend(HttpURLConnectionBackend())
client = new SyncSonatypeClient(
sonatypeCredentials,
backend,
Some(LoggingOptions(logRequestBody = Some(true), logResponseBody = Some(true)))
sonatypeCredentials
)
} yield new SonatypeCentralClient(client)
}