From 98c70ba2dda55dd1d497d18428fe233e0b5ad933 Mon Sep 17 00:00:00 2001 From: "scala-steward-asf[bot]" <147768647+scala-steward-asf[bot]@users.noreply.github.com> Date: Sun, 29 Sep 2024 01:29:28 +0100 Subject: [PATCH 1/5] Update ecs to 2.28.11 (#318) Co-authored-by: scala-steward-asf[bot] <147768647+scala-steward-asf[bot]@users.noreply.github.com> --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ae4192e0..c0c2be2d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -104,7 +104,7 @@ object Dependencies { "org.apache.pekko" %% "pekko-stream" % pekkoVersion, "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion, "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion, - ("software.amazon.awssdk" % "ecs" % "2.27.24").exclude("software.amazon.awssdk", "apache-client"), + ("software.amazon.awssdk" % "ecs" % "2.28.11").exclude("software.amazon.awssdk", "apache-client"), "org.scalatest" %% "scalatest" % scalaTestVersion % Test) ++ jacksonDatabind // aws-java-sdk depends on insecure version of jackson val managementHttp = Seq( From da6e0c6513ead569fae53161a5b40e684eeadaa1 Mon Sep 17 00:00:00 2001 From: "scala-steward-asf[bot]" <147768647+scala-steward-asf[bot]@users.noreply.github.com> Date: Sun, 29 Sep 2024 01:30:18 +0100 Subject: [PATCH 2/5] Update guava to 33.3.1-jre (#315) Co-authored-by: scala-steward-asf[bot] <147768647+scala-steward-asf[bot]@users.noreply.github.com> --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c0c2be2d..ed372f68 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -25,7 +25,7 @@ object Dependencies { val scalaTestPlusJUnitVersion = scalaTestVersion + ".0" val awsSdkVersion = "1.12.772" - val guavaVersion = "33.3.0-jre" + val guavaVersion = "33.3.1-jre" val jacksonVersion = "2.17.2" val log4j2Version = "2.23.1" From 5b235ec5dcab03e2e42e621846ac0cf1daa17a9e Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 2 Oct 2024 00:20:09 +0100 Subject: [PATCH 3/5] build with pekko-http 1.1.0 (#319) --- project/PekkoHttpDependency.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/PekkoHttpDependency.scala b/project/PekkoHttpDependency.scala index 20d1196e..820779b6 100644 --- a/project/PekkoHttpDependency.scala +++ b/project/PekkoHttpDependency.scala @@ -20,5 +20,5 @@ import com.github.pjfanning.pekkobuild.PekkoDependency object PekkoHttpDependency extends PekkoDependency { override val checkProject: String = "pekko-http-testkit" override val module: Option[String] = Some("http") - override val currentVersion: String = "1.1.0-M1" + override val currentVersion: String = "1.1.0" } From cca5ce0f14322f0917253282c7675fde9bb9cafa Mon Sep 17 00:00:00 2001 From: shakeeb-upstart <139975498+shakeeb-upstart@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:00:56 +0500 Subject: [PATCH 4/5] Kubernetes Service Discovery Custom Settings (#313) * - Added configNamespace in Kubernetes settings object, so that users can create different settings based on config path - Added "Settings" object to KubernetesApiServiceDiscovery constructor so that users are able to provide their different settings for discovery * - Added defaultConfig as fallback to user provided config --- .../kubernetes/KubernetesApiServiceDiscovery.scala | 5 +++-- .../org/apache/pekko/discovery/kubernetes/Settings.scala | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscovery.scala b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscovery.scala index dd9f9631..279a28a5 100644 --- a/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscovery.scala +++ b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscovery.scala @@ -96,13 +96,14 @@ object KubernetesApiServiceDiscovery { * An alternative implementation that uses the Kubernetes API. The main advantage of this method is that it allows * you to define readiness/health checks that don't affect the bootstrap mechanism. */ -class KubernetesApiServiceDiscovery(implicit system: ActorSystem) extends ServiceDiscovery { +class KubernetesApiServiceDiscovery(settings: Settings)( + implicit system: ActorSystem) extends ServiceDiscovery { import system.dispatcher private val http = Http() - private val settings = Settings(system) + def this()(implicit system: ActorSystem) = this(Settings(system)) private val log = Logging(system, getClass)(LogSource.fromClass) diff --git a/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/Settings.scala b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/Settings.scala index 55d6af21..afbb7394 100644 --- a/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/Settings.scala +++ b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/Settings.scala @@ -20,7 +20,9 @@ import com.typesafe.config.Config import org.apache.pekko.util.OptionConverters._ -final class Settings(system: ExtendedActorSystem) extends Extension { +final class Settings(kubernetesApi: Config) extends Extension { + + def this(system: ExtendedActorSystem) = this(system.settings.config.getConfig("pekko.discovery.kubernetes-api")) /** * Copied from PekkoManagementSettings, which we don't depend on. @@ -35,8 +37,6 @@ final class Settings(system: ExtendedActorSystem) extends Extension { if (hasDefined(key)) Some(config.getString(key)) else None } - private val kubernetesApi = system.settings.config.getConfig("pekko.discovery.kubernetes-api") - val apiCaPath: String = kubernetesApi.getString("api-ca-path") From c9ac7035c383a76da50d6130a3453881ee4c125c Mon Sep 17 00:00:00 2001 From: "scala-steward-asf[bot]" <147768647+scala-steward-asf[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 10:31:37 +0100 Subject: [PATCH 5/5] Update scala-library to 2.13.15 (#316) Co-authored-by: scala-steward-asf[bot] <147768647+scala-steward-asf[bot]@users.noreply.github.com> --- integration-test/dns-api-mesos/build.sbt | 2 +- integration-test/marathon-api-docker/build.sbt | 2 +- integration-test/marathon-api/build.sbt | 2 +- project/Dependencies.scala | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-test/dns-api-mesos/build.sbt b/integration-test/dns-api-mesos/build.sbt index 01177505..7cf5c61b 100644 --- a/integration-test/dns-api-mesos/build.sbt +++ b/integration-test/dns-api-mesos/build.sbt @@ -10,7 +10,7 @@ enablePlugins(JavaAppPackaging) name := "bootstrap-demo-dns-api" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" def pekkoManagementVersion(version: String) = version.split('+')(0) diff --git a/integration-test/marathon-api-docker/build.sbt b/integration-test/marathon-api-docker/build.sbt index 4f057991..52292eeb 100644 --- a/integration-test/marathon-api-docker/build.sbt +++ b/integration-test/marathon-api-docker/build.sbt @@ -11,7 +11,7 @@ import com.typesafe.sbt.packager.docker._ name := "bootstrap-demo-marathon-api-docker" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" enablePlugins(JavaServerAppPackaging) diff --git a/integration-test/marathon-api/build.sbt b/integration-test/marathon-api/build.sbt index 5294c271..b64e7179 100644 --- a/integration-test/marathon-api/build.sbt +++ b/integration-test/marathon-api/build.sbt @@ -13,7 +13,7 @@ name := "bootstrap-demo-marathon-api" version := "1.1.4" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" val pekkoManagementVersion = "1.0.0" diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ed372f68..e8805e46 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,7 @@ import sbt._ object Dependencies { // keep in sync with .github/workflows/unit-tests.yml val scala212Version = "2.12.20" - val scala213Version = "2.13.14" + val scala213Version = "2.13.15" val scala3Version = "3.3.3" val crossScalaVersions = Seq(scala212Version, scala213Version, scala3Version)