This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-management.git
The following commit(s) were added to refs/heads/main by this push:
new 8dce0c48 Update ecs to 2.26.3 (#259)
8dce0c48 is described below
commit 8dce0c485edeb9009285e359f0914497c456c292
Author: scala-steward-asf[bot]
<147768647+scala-steward-asf[bot]@users.noreply.github.com>
AuthorDate: Tue Jun 18 14:50:16 2024 +0100
Update ecs to 2.26.3 (#259)
* Update ecs to 2.26.3
* retry strategy
* use DefaultRetryStrategy.doNotRetry()
---------
Co-authored-by: scala-steward-asf[bot]
<147768647+scala-steward-asf[bot]@users.noreply.github.com>
Co-authored-by: PJ Fanning <[email protected]>
---
.../apache/pekko/discovery/awsapi/ecs/AsyncEcsServiceDiscovery.scala | 4 ++--
.../apache/pekko/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala | 4 ++--
project/Dependencies.scala | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsServiceDiscovery.scala
b/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsServiceDiscovery.scala
index 27d6e50d..09270cad 100644
---
a/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsServiceDiscovery.scala
+++
b/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsServiceDiscovery.scala
@@ -29,8 +29,8 @@ import pekko.pattern.after
import pekko.util.FutureConverters._
import pekko.util.ccompat.JavaConverters._
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration
-import software.amazon.awssdk.core.retry.RetryPolicy
import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient
+import software.amazon.awssdk.retries.DefaultRetryStrategy
import software.amazon.awssdk.services.ecs._
import software.amazon.awssdk.services.ecs.model.{ Tag => _, _ }
@@ -50,7 +50,7 @@ class AsyncEcsServiceDiscovery(system: ActorSystem) extends
ServiceDiscovery {
.toList
private[this] lazy val ecsClient = {
- val conf =
ClientOverrideConfiguration.builder().retryPolicy(RetryPolicy.none).build()
+ val conf =
ClientOverrideConfiguration.builder().retryStrategy(DefaultRetryStrategy.doNotRetry()).build()
val httpClient = NettyNioAsyncHttpClient.create()
EcsAsyncClient.builder().overrideConfiguration(conf).httpClient(httpClient).build()
}
diff --git
a/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala
b/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala
index c70999e2..b4c941aa 100644
---
a/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala
+++
b/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala
@@ -34,7 +34,7 @@ import pekko.stream.Materializer
import pekko.util.FutureConverters._
import pekko.util.ccompat.JavaConverters._
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration
-import software.amazon.awssdk.core.retry.RetryPolicy
+import software.amazon.awssdk.retries.DefaultRetryStrategy
import software.amazon.awssdk.services.ecs._
import software.amazon.awssdk.services.ecs.model.{
DescribeTasksRequest,
@@ -54,7 +54,7 @@ class AsyncEcsTaskSetDiscovery(system: ActorSystem) extends
ServiceDiscovery {
private val cluster = config.getString("cluster")
private lazy val ecsClient = {
- val conf =
ClientOverrideConfiguration.builder().retryPolicy(RetryPolicy.none).build()
+ val conf =
ClientOverrideConfiguration.builder().retryStrategy(DefaultRetryStrategy.doNotRetry()).build()
EcsAsyncClient.builder().overrideConfiguration(conf).build()
}
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 2e2e9b21..2b1db5a2 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.25.70").exclude("software.amazon.awssdk", "apache-client"),
+ ("software.amazon.awssdk" % "ecs" %
"2.26.3").exclude("software.amazon.awssdk", "apache-client"),
"org.scalatest" %% "scalatest" % scalaTestVersion % Test) ++
jacksonDatabind // aws-java-sdk depends on insecure version of jackson
val managementHttp = Seq(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]