Skip to content

Commit 58e2d0d

Browse files
authored
Set http.agent Java property (#2331)
* Set `http.agent` Java property Follow-up to #2330. This also sets the `http.agent` Java property which is used for `java.net.HttpURLConnection`'s `User-Agent`. `HttpURLConnection` is used in this code base by Coursier and the default `FileAlg#readUri` implementation. * Do not add login to User-Agent
1 parent 2593625 commit 58e2d0d

File tree

1 file changed

+4
-7
lines changed
  • modules/core/src/main/scala/org/scalasteward/core/application

1 file changed

+4
-7
lines changed

modules/core/src/main/scala/org/scalasteward/core/application/Context.scala

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.scalasteward.core.application
1818

19-
import cats.ApplicativeThrow
2019
import cats.effect._
2120
import cats.effect.implicits._
2221
import cats.syntax.all._
@@ -82,7 +81,8 @@ object Context {
8281
logger <- Resource.eval(Slf4jLogger.fromName[F]("org.scalasteward.core"))
8382
_ <- Resource.eval(printBanner(logger))
8483
config = Config.from(args)
85-
userAgent <- Resource.eval(mkUserAgent[F](config.vcsCfg.login))
84+
_ <- Resource.eval(F.delay(System.setProperty("http.agent", userAgentString)))
85+
userAgent <- Resource.eval(F.fromEither(`User-Agent`.parse(userAgentString)))
8686
client <- OkHttpBuilder
8787
.withDefaultClient[F]
8888
.flatMap(_.resource)
@@ -173,9 +173,6 @@ object Context {
173173
logger.info(msg)
174174
}
175175

176-
private def mkUserAgent[F[_]](login: String)(implicit F: ApplicativeThrow[F]): F[`User-Agent`] = {
177-
val s = s"Scala-Steward/${org.scalasteward.core.BuildInfo.version}" +
178-
s" (operated by $login; ${org.scalasteward.core.BuildInfo.gitHubUrl})"
179-
F.fromEither(`User-Agent`.parse(s))
180-
}
176+
private val userAgentString: String =
177+
s"Scala-Steward/${org.scalasteward.core.BuildInfo.version} (${org.scalasteward.core.BuildInfo.gitHubUrl})"
181178
}

0 commit comments

Comments
 (0)