Fixed EC2 client, added AWS context default

jobial-io · Jul 26, 2023 · 9e18977 · 9e18977
1 parent f9c1fac
commit 9e18977
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/build.sbt b/build.sbt
@@ -15,7 +15,7 @@ name := "scase"
 ThisBuild / organization := "io.jobial"
 ThisBuild / scalaVersion := "2.13.8"
 ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.15", "2.13.8")
-ThisBuild / version := "1.3.1"
+ThisBuild / version := "1.3.2"
 ThisBuild / scalacOptions += "-target:jvm-1.8"
 ThisBuild / javacOptions ++= Seq("-source", "11", "-target", "11")
 ThisBuild / Test / packageBin / publishArtifact := true

diff --git a/scase-aws/src/main/scala/io/jobial/scase/aws/client/AwsContext.scala b/scase-aws/src/main/scala/io/jobial/scase/aws/client/AwsContext.scala
@@ -12,6 +12,7 @@
  */
 package io.jobial.scase.aws.client
 
+import cats.effect.Concurrent
 import cats.effect.IO
 import com.amazonaws.auth.AWSCredentials
 import io.jobial.scase.core.impl.blockerContext
@@ -36,4 +37,6 @@ case class AwsContext(
   lazy val stsClient = StsClient[IO]
 
   lazy val s3Client = S3Client[IO]
-}
+
+  lazy val ec2Client = EC2Client[IO]
+}
diff --git a/scase-aws/src/main/scala/io/jobial/scase/aws/client/EC2Client.scala b/scase-aws/src/main/scala/io/jobial/scase/aws/client/EC2Client.scala
@@ -27,12 +27,12 @@ import java.util.concurrent.Executors
 
 object EC2Client {
 
-  val client = AmazonEC2AsyncClientBuilder.standard().withExecutorFactory(new ExecutorFactory {
+  lazy val client = AmazonEC2AsyncClientBuilder.standard().withExecutorFactory(new ExecutorFactory {
     def newExecutor = Executors.newCachedThreadPool(new DaemonThreadFactory)
   }).build
 
-  def apply[F[_] : Concurrent : Timer : Parallel](implicit context: AwsContext) =
-    new S3Client[F] {
+  def apply[F[_] : Concurrent : Timer : Parallel](implicit context: AwsContext = AwsContext()) =
+    new EC2Client[F] {
       def awsContext = context
 
       val concurrent = Concurrent[F]
@@ -45,7 +45,7 @@ object EC2Client {
 
 trait EC2Client[F[_]] extends AwsClient[F] with CatsUtils[F] {
 
-  def ec2Client = buildAwsAsyncClient[AmazonEC2AsyncClientBuilder, AmazonEC2Async](AmazonEC2AsyncClientBuilder.standard)
+  val ec2Client = buildAwsAsyncClient[AmazonEC2AsyncClientBuilder, AmazonEC2Async](AmazonEC2AsyncClientBuilder.standard)
 
   def getInstanceState(id: String) =
     for {

diff --git a/scase-aws/src/main/scala/io/jobial/scase/aws/client/LambdaClient.scala b/scase-aws/src/main/scala/io/jobial/scase/aws/client/LambdaClient.scala
@@ -53,7 +53,7 @@ trait LambdaClient[F[_]] extends AwsClient[F] {
 
 object LambdaClient {
 
-  def apply[F[_] : Concurrent : Timer](implicit context: AwsContext) =
+  def apply[F[_] : Concurrent : Timer](implicit context: AwsContext = AwsContext()) =
     new LambdaClient[F] {
       def awsContext = context
 

diff --git a/scase-aws/src/main/scala/io/jobial/scase/aws/client/S3Client.scala b/scase-aws/src/main/scala/io/jobial/scase/aws/client/S3Client.scala
@@ -115,7 +115,7 @@ trait S3Client[F[_]] extends AwsClient[F] {
 
 object S3Client {
 
-  def apply[F[_] : Concurrent : Timer](implicit context: AwsContext) =
+  def apply[F[_] : Concurrent : Timer](implicit context: AwsContext = AwsContext()) =
     new S3Client[F] {
       def awsContext = context
 

diff --git a/scase-aws/src/main/scala/io/jobial/scase/aws/client/SqsClient.scala b/scase-aws/src/main/scala/io/jobial/scase/aws/client/SqsClient.scala
@@ -170,7 +170,7 @@ trait SqsClient[F[_]] extends S3Client[F] {
 
 object SqsClient {
 
-  def apply[F[_] : Timer : Concurrent](implicit context: AwsContext) = {
+  def apply[F[_] : Timer : Concurrent](implicit context: AwsContext = AwsContext()) = {
     new SqsClient[F] {
       val awsContext = context
 

diff --git a/scase-aws/src/main/scala/io/jobial/scase/aws/client/StsClient.scala b/scase-aws/src/main/scala/io/jobial/scase/aws/client/StsClient.scala
@@ -28,7 +28,7 @@ trait StsClient[F[_]] extends AwsClient[F] {
 
 object StsClient {
 
-  def apply[F[_] : Concurrent : Timer](implicit context: AwsContext) =
+  def apply[F[_] : Concurrent : Timer](implicit context: AwsContext = AwsContext()) =
     new StsClient[F] {
       def awsContext = context