Skip to content

Commit

Permalink
minor library upgrades (#1287)
Browse files Browse the repository at this point in the history
* minor library upgrades
* add missing algebra after aws sdk upgrade

Co-authored-by: dmytro.obodowsky <[email protected]>
  • Loading branch information
barryoneill and dmytro.obodowsky authored Jan 13, 2025
1 parent 8798d8e commit 2a0580f
Show file tree
Hide file tree
Showing 6 changed files with 176 additions and 12 deletions.
16 changes: 16 additions & 0 deletions fs2-aws-benchmarks/src/main/scala/fs2/aws/kinesis/S3OpsStub.scala
Original file line number Diff line number Diff line change
Expand Up @@ -310,4 +310,20 @@ class S3OpsStub extends S3AsyncClientOp[IO] {
override def listDirectoryBuckets(a: ListDirectoryBucketsRequest): IO[ListDirectoryBucketsResponse] = ???

override def listDirectoryBucketsPaginator(a: ListDirectoryBucketsRequest): IO[ListDirectoryBucketsPublisher] = ???

override def createBucketMetadataTableConfiguration(
a: CreateBucketMetadataTableConfigurationRequest
): IO[CreateBucketMetadataTableConfigurationResponse] = ???

override def deleteBucketMetadataTableConfiguration(
a: DeleteBucketMetadataTableConfigurationRequest
): IO[DeleteBucketMetadataTableConfigurationResponse] = ???

override def getBucketMetadataTableConfiguration(
a: GetBucketMetadataTableConfigurationRequest
): IO[GetBucketMetadataTableConfigurationResponse] = ???

override def listBucketsPaginator: IO[ListBucketsPublisher] = ???

override def listBucketsPaginator(a: ListBucketsRequest): IO[ListBucketsPublisher] = ???
}
10 changes: 5 additions & 5 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ import sbt.{Def, _}
object Dependencies {

object V {
val AwsSdk = "2.29.43"
val Circe = "0.14.9"
val Munit = "1.0.3"
val AwsSdk = "2.29.50"
val Circe = "0.14.10"
val Munit = "1.0.4"
val Fs2 = "3.11.0"
val Refined = "0.11.3"
val ScalaTest = "3.2.19"
val MockitoScalaTest = "1.17.5"
val MockitoCore = "5.14.2"
val MockitoCore = "5.15.2"
val CE = "3.5.7"
val Logback = "1.5.15"
val Logback = "1.5.16"
val SLF4J = "2.0.16"
val Log4Cats = "2.7.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,107 @@ import software.amazon.awssdk.services.s3.model.*
// Types referenced
import software.amazon.awssdk.core.async.{AsyncRequestBody, AsyncResponseTransformer}
import software.amazon.awssdk.services.s3.S3AsyncClient
import software.amazon.awssdk.services.s3.model.{
AbortMultipartUploadRequest,
CompleteMultipartUploadRequest,
CopyObjectRequest,
CreateBucketMetadataTableConfigurationRequest,
CreateBucketRequest,
CreateMultipartUploadRequest,
CreateSessionRequest,
DeleteBucketAnalyticsConfigurationRequest,
DeleteBucketCorsRequest,
DeleteBucketEncryptionRequest,
DeleteBucketIntelligentTieringConfigurationRequest,
DeleteBucketInventoryConfigurationRequest,
DeleteBucketLifecycleRequest,
DeleteBucketMetadataTableConfigurationRequest,
DeleteBucketMetricsConfigurationRequest,
DeleteBucketOwnershipControlsRequest,
DeleteBucketPolicyRequest,
DeleteBucketReplicationRequest,
DeleteBucketRequest,
DeleteBucketTaggingRequest,
DeleteBucketWebsiteRequest,
DeleteObjectRequest,
DeleteObjectTaggingRequest,
DeleteObjectsRequest,
DeletePublicAccessBlockRequest,
GetBucketAccelerateConfigurationRequest,
GetBucketAclRequest,
GetBucketAnalyticsConfigurationRequest,
GetBucketCorsRequest,
GetBucketEncryptionRequest,
GetBucketIntelligentTieringConfigurationRequest,
GetBucketInventoryConfigurationRequest,
GetBucketLifecycleConfigurationRequest,
GetBucketLocationRequest,
GetBucketLoggingRequest,
GetBucketMetadataTableConfigurationRequest,
GetBucketMetricsConfigurationRequest,
GetBucketNotificationConfigurationRequest,
GetBucketOwnershipControlsRequest,
GetBucketPolicyRequest,
GetBucketPolicyStatusRequest,
GetBucketReplicationRequest,
GetBucketRequestPaymentRequest,
GetBucketTaggingRequest,
GetBucketVersioningRequest,
GetBucketWebsiteRequest,
GetObjectAclRequest,
GetObjectAttributesRequest,
GetObjectLegalHoldRequest,
GetObjectLockConfigurationRequest,
GetObjectRequest,
GetObjectRetentionRequest,
GetObjectTaggingRequest,
GetObjectTorrentRequest,
GetPublicAccessBlockRequest,
HeadBucketRequest,
HeadObjectRequest,
ListBucketAnalyticsConfigurationsRequest,
ListBucketIntelligentTieringConfigurationsRequest,
ListBucketInventoryConfigurationsRequest,
ListBucketMetricsConfigurationsRequest,
ListBucketsRequest,
ListDirectoryBucketsRequest,
ListMultipartUploadsRequest,
ListObjectVersionsRequest,
ListObjectsRequest,
ListObjectsV2Request,
ListPartsRequest,
PutBucketAccelerateConfigurationRequest,
PutBucketAclRequest,
PutBucketAnalyticsConfigurationRequest,
PutBucketCorsRequest,
PutBucketEncryptionRequest,
PutBucketIntelligentTieringConfigurationRequest,
PutBucketInventoryConfigurationRequest,
PutBucketLifecycleConfigurationRequest,
PutBucketLoggingRequest,
PutBucketMetricsConfigurationRequest,
PutBucketNotificationConfigurationRequest,
PutBucketOwnershipControlsRequest,
PutBucketPolicyRequest,
PutBucketReplicationRequest,
PutBucketRequestPaymentRequest,
PutBucketTaggingRequest,
PutBucketVersioningRequest,
PutBucketWebsiteRequest,
PutObjectAclRequest,
PutObjectLegalHoldRequest,
PutObjectLockConfigurationRequest,
PutObjectRequest,
PutObjectRetentionRequest,
PutObjectTaggingRequest,
PutPublicAccessBlockRequest,
RestoreObjectRequest,
SelectObjectContentRequest,
SelectObjectContentResponseHandler,
UploadPartCopyRequest,
UploadPartRequest,
WriteGetObjectResponseRequest
}

import java.nio.file.Path
import java.util.concurrent.CompletableFuture
Expand Down Expand Up @@ -50,9 +151,12 @@ trait Interpreter[M[_]] { outer =>
override def completeMultipartUpload(a: CompleteMultipartUploadRequest) = eff(_.completeMultipartUpload(a))
override def copyObject(a: CopyObjectRequest) = eff(_.copyObject(a))
override def createBucket(a: CreateBucketRequest) = eff(_.createBucket(a))
override def createMultipartUpload(a: CreateMultipartUploadRequest) = eff(_.createMultipartUpload(a))
override def createSession(a: CreateSessionRequest) = eff(_.createSession(a))
override def deleteBucket(a: DeleteBucketRequest) = eff(_.deleteBucket(a))
override def createBucketMetadataTableConfiguration(a: CreateBucketMetadataTableConfigurationRequest) = eff(
_.createBucketMetadataTableConfiguration(a)
)
override def createMultipartUpload(a: CreateMultipartUploadRequest) = eff(_.createMultipartUpload(a))
override def createSession(a: CreateSessionRequest) = eff(_.createSession(a))
override def deleteBucket(a: DeleteBucketRequest) = eff(_.deleteBucket(a))
override def deleteBucketAnalyticsConfiguration(a: DeleteBucketAnalyticsConfigurationRequest) = eff(
_.deleteBucketAnalyticsConfiguration(a)
)
Expand All @@ -64,6 +168,9 @@ trait Interpreter[M[_]] { outer =>
_.deleteBucketInventoryConfiguration(a)
)
override def deleteBucketLifecycle(a: DeleteBucketLifecycleRequest) = eff(_.deleteBucketLifecycle(a))
override def deleteBucketMetadataTableConfiguration(a: DeleteBucketMetadataTableConfigurationRequest) = eff(
_.deleteBucketMetadataTableConfiguration(a)
)
override def deleteBucketMetricsConfiguration(a: DeleteBucketMetricsConfigurationRequest) = eff(
_.deleteBucketMetricsConfiguration(a)
)
Expand Down Expand Up @@ -98,6 +205,9 @@ trait Interpreter[M[_]] { outer =>
)
override def getBucketLocation(a: GetBucketLocationRequest) = eff(_.getBucketLocation(a))
override def getBucketLogging(a: GetBucketLoggingRequest) = eff(_.getBucketLogging(a))
override def getBucketMetadataTableConfiguration(a: GetBucketMetadataTableConfigurationRequest) = eff(
_.getBucketMetadataTableConfiguration(a)
)
override def getBucketMetricsConfiguration(a: GetBucketMetricsConfigurationRequest) = eff(
_.getBucketMetricsConfiguration(a)
)
Expand Down Expand Up @@ -144,6 +254,8 @@ trait Interpreter[M[_]] { outer =>
)
override def listBuckets = eff(_.listBuckets)
override def listBuckets(a: ListBucketsRequest) = eff(_.listBuckets(a))
override def listBucketsPaginator = primitive(_.listBucketsPaginator)
override def listBucketsPaginator(a: ListBucketsRequest) = primitive(_.listBucketsPaginator(a))
override def listDirectoryBuckets(a: ListDirectoryBucketsRequest) = eff(_.listDirectoryBuckets(a))
override def listDirectoryBucketsPaginator(a: ListDirectoryBucketsRequest) = primitive(
_.listDirectoryBucketsPaginator(a)
Expand Down Expand Up @@ -223,6 +335,8 @@ trait Interpreter[M[_]] { outer =>
Kleisli(e => eff1(f(e).completeMultipartUpload(a)))
override def copyObject(a: CopyObjectRequest) = Kleisli(e => eff1(f(e).copyObject(a)))
override def createBucket(a: CreateBucketRequest) = Kleisli(e => eff1(f(e).createBucket(a)))
override def createBucketMetadataTableConfiguration(a: CreateBucketMetadataTableConfigurationRequest) =
Kleisli(e => eff1(f(e).createBucketMetadataTableConfiguration(a)))
override def createMultipartUpload(a: CreateMultipartUploadRequest) =
Kleisli(e => eff1(f(e).createMultipartUpload(a)))
override def createSession(a: CreateSessionRequest) = Kleisli(e => eff1(f(e).createSession(a)))
Expand All @@ -239,6 +353,8 @@ trait Interpreter[M[_]] { outer =>
Kleisli(e => eff1(f(e).deleteBucketInventoryConfiguration(a)))
override def deleteBucketLifecycle(a: DeleteBucketLifecycleRequest) =
Kleisli(e => eff1(f(e).deleteBucketLifecycle(a)))
override def deleteBucketMetadataTableConfiguration(a: DeleteBucketMetadataTableConfigurationRequest) =
Kleisli(e => eff1(f(e).deleteBucketMetadataTableConfiguration(a)))
override def deleteBucketMetricsConfiguration(a: DeleteBucketMetricsConfigurationRequest) =
Kleisli(e => eff1(f(e).deleteBucketMetricsConfiguration(a)))
override def deleteBucketOwnershipControls(a: DeleteBucketOwnershipControlsRequest) =
Expand Down Expand Up @@ -272,6 +388,8 @@ trait Interpreter[M[_]] { outer =>
Kleisli(e => eff1(f(e).getBucketLifecycleConfiguration(a)))
override def getBucketLocation(a: GetBucketLocationRequest) = Kleisli(e => eff1(f(e).getBucketLocation(a)))
override def getBucketLogging(a: GetBucketLoggingRequest) = Kleisli(e => eff1(f(e).getBucketLogging(a)))
override def getBucketMetadataTableConfiguration(a: GetBucketMetadataTableConfigurationRequest) =
Kleisli(e => eff1(f(e).getBucketMetadataTableConfiguration(a)))
override def getBucketMetricsConfiguration(a: GetBucketMetricsConfigurationRequest) =
Kleisli(e => eff1(f(e).getBucketMetricsConfiguration(a)))
override def getBucketNotificationConfiguration(a: GetBucketNotificationConfigurationRequest) =
Expand Down Expand Up @@ -320,6 +438,9 @@ trait Interpreter[M[_]] { outer =>
Kleisli(e => eff1(f(e).listBucketMetricsConfigurations(a)))
override def listBuckets = Kleisli(e => eff1(f(e).listBuckets))
override def listBuckets(a: ListBucketsRequest) = Kleisli(e => eff1(f(e).listBuckets(a)))
override def listBucketsPaginator = Kleisli(e => primitive1(f(e).listBucketsPaginator))
override def listBucketsPaginator(a: ListBucketsRequest) =
Kleisli(e => primitive1(f(e).listBucketsPaginator(a)))
override def listDirectoryBuckets(a: ListDirectoryBucketsRequest) =
Kleisli(e => eff1(f(e).listDirectoryBuckets(a)))
override def listDirectoryBucketsPaginator(a: ListDirectoryBucketsRequest) =
Expand Down Expand Up @@ -405,9 +526,12 @@ trait Interpreter[M[_]] { outer =>
override def completeMultipartUpload(a: CompleteMultipartUploadRequest) = eff1(client.completeMultipartUpload(a))
override def copyObject(a: CopyObjectRequest) = eff1(client.copyObject(a))
override def createBucket(a: CreateBucketRequest) = eff1(client.createBucket(a))
override def createMultipartUpload(a: CreateMultipartUploadRequest) = eff1(client.createMultipartUpload(a))
override def createSession(a: CreateSessionRequest) = eff1(client.createSession(a))
override def deleteBucket(a: DeleteBucketRequest) = eff1(client.deleteBucket(a))
override def createBucketMetadataTableConfiguration(a: CreateBucketMetadataTableConfigurationRequest) = eff1(
client.createBucketMetadataTableConfiguration(a)
)
override def createMultipartUpload(a: CreateMultipartUploadRequest) = eff1(client.createMultipartUpload(a))
override def createSession(a: CreateSessionRequest) = eff1(client.createSession(a))
override def deleteBucket(a: DeleteBucketRequest) = eff1(client.deleteBucket(a))
override def deleteBucketAnalyticsConfiguration(a: DeleteBucketAnalyticsConfigurationRequest) = eff1(
client.deleteBucketAnalyticsConfiguration(a)
)
Expand All @@ -419,6 +543,9 @@ trait Interpreter[M[_]] { outer =>
client.deleteBucketInventoryConfiguration(a)
)
override def deleteBucketLifecycle(a: DeleteBucketLifecycleRequest) = eff1(client.deleteBucketLifecycle(a))
override def deleteBucketMetadataTableConfiguration(a: DeleteBucketMetadataTableConfigurationRequest) = eff1(
client.deleteBucketMetadataTableConfiguration(a)
)
override def deleteBucketMetricsConfiguration(a: DeleteBucketMetricsConfigurationRequest) = eff1(
client.deleteBucketMetricsConfiguration(a)
)
Expand Down Expand Up @@ -453,6 +580,9 @@ trait Interpreter[M[_]] { outer =>
)
override def getBucketLocation(a: GetBucketLocationRequest) = eff1(client.getBucketLocation(a))
override def getBucketLogging(a: GetBucketLoggingRequest) = eff1(client.getBucketLogging(a))
override def getBucketMetadataTableConfiguration(a: GetBucketMetadataTableConfigurationRequest) = eff1(
client.getBucketMetadataTableConfiguration(a)
)
override def getBucketMetricsConfiguration(a: GetBucketMetricsConfigurationRequest) = eff1(
client.getBucketMetricsConfiguration(a)
)
Expand Down Expand Up @@ -501,6 +631,8 @@ trait Interpreter[M[_]] { outer =>
)
override def listBuckets = eff1(client.listBuckets)
override def listBuckets(a: ListBucketsRequest) = eff1(client.listBuckets(a))
override def listBucketsPaginator = primitive1(client.listBucketsPaginator)
override def listBucketsPaginator(a: ListBucketsRequest) = primitive1(client.listBucketsPaginator(a))
override def listDirectoryBuckets(a: ListDirectoryBucketsRequest) = eff1(client.listDirectoryBuckets(a))
override def listDirectoryBucketsPaginator(a: ListDirectoryBucketsRequest) = primitive1(
client.listDirectoryBucketsPaginator(a)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.laserdisc.pure.s3.tagless

import software.amazon.awssdk.core.async.{AsyncRequestBody, AsyncResponseTransformer}
import software.amazon.awssdk.services.s3.{S3ServiceClientConfiguration, S3Utilities}
import software.amazon.awssdk.services.s3.model.*
import software.amazon.awssdk.services.s3.paginators.*
import software.amazon.awssdk.services.s3.waiters.S3AsyncWaiter
import software.amazon.awssdk.services.s3.{S3ServiceClientConfiguration, S3Utilities}

import java.nio.file.Path

Expand All @@ -15,6 +15,9 @@ trait S3AsyncClientOp[F[_]] {
def completeMultipartUpload(a: CompleteMultipartUploadRequest): F[CompleteMultipartUploadResponse]
def copyObject(a: CopyObjectRequest): F[CopyObjectResponse]
def createBucket(a: CreateBucketRequest): F[CreateBucketResponse]
def createBucketMetadataTableConfiguration(
a: CreateBucketMetadataTableConfigurationRequest
): F[CreateBucketMetadataTableConfigurationResponse]
def createMultipartUpload(a: CreateMultipartUploadRequest): F[CreateMultipartUploadResponse]
def createSession(a: CreateSessionRequest): F[CreateSessionResponse]
def deleteBucket(a: DeleteBucketRequest): F[DeleteBucketResponse]
Expand All @@ -30,6 +33,9 @@ trait S3AsyncClientOp[F[_]] {
a: DeleteBucketInventoryConfigurationRequest
): F[DeleteBucketInventoryConfigurationResponse]
def deleteBucketLifecycle(a: DeleteBucketLifecycleRequest): F[DeleteBucketLifecycleResponse]
def deleteBucketMetadataTableConfiguration(
a: DeleteBucketMetadataTableConfigurationRequest
): F[DeleteBucketMetadataTableConfigurationResponse]
def deleteBucketMetricsConfiguration(
a: DeleteBucketMetricsConfigurationRequest
): F[DeleteBucketMetricsConfigurationResponse]
Expand Down Expand Up @@ -62,6 +68,9 @@ trait S3AsyncClientOp[F[_]] {
): F[GetBucketLifecycleConfigurationResponse]
def getBucketLocation(a: GetBucketLocationRequest): F[GetBucketLocationResponse]
def getBucketLogging(a: GetBucketLoggingRequest): F[GetBucketLoggingResponse]
def getBucketMetadataTableConfiguration(
a: GetBucketMetadataTableConfigurationRequest
): F[GetBucketMetadataTableConfigurationResponse]
def getBucketMetricsConfiguration(a: GetBucketMetricsConfigurationRequest): F[GetBucketMetricsConfigurationResponse]
def getBucketNotificationConfiguration(
a: GetBucketNotificationConfigurationRequest
Expand Down Expand Up @@ -104,6 +113,8 @@ trait S3AsyncClientOp[F[_]] {
): F[ListBucketMetricsConfigurationsResponse]
def listBuckets: F[ListBucketsResponse]
def listBuckets(a: ListBucketsRequest): F[ListBucketsResponse]
def listBucketsPaginator: F[ListBucketsPublisher]
def listBucketsPaginator(a: ListBucketsRequest): F[ListBucketsPublisher]
def listDirectoryBuckets(a: ListDirectoryBucketsRequest): F[ListDirectoryBucketsResponse]
def listDirectoryBucketsPaginator(a: ListDirectoryBucketsRequest): F[ListDirectoryBucketsPublisher]
def listMultipartUploads(a: ListMultipartUploadsRequest): F[ListMultipartUploadsResponse]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ trait Interpreter[M[_]] { outer =>

// domain-specific operations are implemented in terms of `primitive`
override def addPermission(a: AddPermissionRequest) = eff(_.addPermission(a))
override def batchManager = primitive(_.batchManager)
override def cancelMessageMoveTask(a: CancelMessageMoveTaskRequest) = eff(_.cancelMessageMoveTask(a))
override def changeMessageVisibility(a: ChangeMessageVisibilityRequest) = eff(_.changeMessageVisibility(a))
override def changeMessageVisibilityBatch(a: ChangeMessageVisibilityBatchRequest) = eff(
Expand Down Expand Up @@ -80,6 +81,7 @@ trait Interpreter[M[_]] { outer =>
def lens[E](f: E => SqsAsyncClient): SqsAsyncClientOp[Kleisli[M, E, *]] =
new SqsAsyncClientOp[Kleisli[M, E, *]] {
override def addPermission(a: AddPermissionRequest) = Kleisli(e => eff1(f(e).addPermission(a)))
override def batchManager = Kleisli(e => primitive1(f(e).batchManager))
override def cancelMessageMoveTask(a: CancelMessageMoveTaskRequest) =
Kleisli(e => eff1(f(e).cancelMessageMoveTask(a)))
override def changeMessageVisibility(a: ChangeMessageVisibilityRequest) =
Expand Down Expand Up @@ -126,6 +128,7 @@ trait Interpreter[M[_]] { outer =>

// domain-specific operations are implemented in terms of `primitive`
override def addPermission(a: AddPermissionRequest) = eff1(client.addPermission(a))
override def batchManager = primitive1(client.batchManager)
override def cancelMessageMoveTask(a: CancelMessageMoveTaskRequest) = eff1(client.cancelMessageMoveTask(a))
override def changeMessageVisibility(a: ChangeMessageVisibilityRequest) = eff1(client.changeMessageVisibility(a))
override def changeMessageVisibilityBatch(a: ChangeMessageVisibilityBatchRequest) = eff1(
Expand Down
Loading

0 comments on commit 2a0580f

Please sign in to comment.