@effect-aws/client-s3 1.10.9 → 2.0.0-beta.1

package/src/S3Service.ts

@@ -313,6 +313,9 @@ import {
   UpdateBucketMetadataJournalTableConfigurationCommand,
   type UpdateBucketMetadataJournalTableConfigurationCommandInput,
   type UpdateBucketMetadataJournalTableConfigurationCommandOutput,
+  UpdateObjectEncryptionCommand,
+  type UpdateObjectEncryptionCommandInput,
+  type UpdateObjectEncryptionCommandOutput,
   UploadPartCommand,
   type UploadPartCommandInput,
   type UploadPartCommandOutput,
@@ -327,9 +330,12 @@ import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import type { RequestPresigningArguments } from "@aws-sdk/types";
 import type { HttpHandlerOptions, ServiceLogger } from "@effect-aws/commons";
 import { Service } from "@effect-aws/commons";
-import type { Cause } from "effect";
-import { Effect, Layer } from "effect";
+import type * as Cause from "effect/Cause";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as ServiceMap from "effect/ServiceMap";
 import type {
+  AccessDeniedError,
   BucketAlreadyExistsError,
   BucketAlreadyOwnedByYouError,
   EncryptionTypeMismatchError,
@@ -455,6 +461,7 @@ const commands = {
   SelectObjectContentCommand,
   UpdateBucketMetadataInventoryTableConfigurationCommand,
   UpdateBucketMetadataJournalTableConfigurationCommand,
+  UpdateObjectEncryptionCommand,
   UploadPartCommand,
   UploadPartCopyCommand,
   WriteGetObjectResponseCommand,
@@ -471,7 +478,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     AbortMultipartUploadCommandOutput,
-    Cause.TimeoutException | SdkError | NoSuchUploadError
+    Cause.TimeoutError | SdkError | NoSuchUploadError
   >;
 
   /**
@@ -482,7 +489,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CompleteMultipartUploadCommandOutput,
-    Cause.TimeoutException | SdkError
+    Cause.TimeoutError | SdkError
   >;
 
   /**
@@ -493,7 +500,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CopyObjectCommandOutput,
-    Cause.TimeoutException | SdkError | ObjectNotInActiveTierError
+    Cause.TimeoutError | SdkError | ObjectNotInActiveTierError
   >;
 
   /**
@@ -504,7 +511,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateBucketCommandOutput,
-    Cause.TimeoutException | SdkError | BucketAlreadyExistsError | BucketAlreadyOwnedByYouError
+    Cause.TimeoutError | SdkError | BucketAlreadyExistsError | BucketAlreadyOwnedByYouError
   >;
 
   /**
@@ -515,7 +522,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateBucketMetadataConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -526,7 +533,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateBucketMetadataTableConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -537,7 +544,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateMultipartUploadCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -548,7 +555,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateSessionCommandOutput,
-    Cause.TimeoutException | SdkError | NoSuchBucketError
+    Cause.TimeoutError | SdkError | NoSuchBucketError
   >;
 
   /**
@@ -559,7 +566,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -570,7 +577,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketAnalyticsConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -581,7 +588,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketCorsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -592,7 +599,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketEncryptionCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -603,7 +610,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketIntelligentTieringConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -614,7 +621,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketInventoryConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -625,7 +632,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketLifecycleCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -636,7 +643,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketMetadataConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -647,7 +654,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketMetadataTableConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -658,7 +665,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketMetricsConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -669,7 +676,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketOwnershipControlsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -680,7 +687,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketPolicyCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -691,7 +698,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketReplicationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -702,7 +709,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketTaggingCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -713,7 +720,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteBucketWebsiteCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -724,7 +731,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteObjectCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -735,7 +742,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteObjectTaggingCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -746,7 +753,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteObjectsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -757,7 +764,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeletePublicAccessBlockCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -768,7 +775,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketAbacCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -779,7 +786,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketAccelerateConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -790,7 +797,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketAclCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -801,7 +808,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketAnalyticsConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -812,7 +819,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketCorsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -823,7 +830,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketEncryptionCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -834,7 +841,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketIntelligentTieringConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -845,7 +852,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketInventoryConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -856,7 +863,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketLifecycleConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -867,7 +874,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketLocationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -878,7 +885,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketLoggingCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -889,7 +896,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketMetadataConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -900,7 +907,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketMetadataTableConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -911,7 +918,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketMetricsConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -922,7 +929,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketNotificationConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -933,7 +940,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketOwnershipControlsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -944,7 +951,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketPolicyCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -955,7 +962,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketPolicyStatusCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -966,7 +973,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketReplicationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -977,7 +984,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketRequestPaymentCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -988,7 +995,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketTaggingCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -999,7 +1006,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketVersioningCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1010,7 +1017,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetBucketWebsiteCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1021,7 +1028,7 @@ interface S3Service$ {
     options?: { readonly presigned?: false } & HttpHandlerOptions,
   ): Effect.Effect<
     GetObjectCommandOutput,
-    Cause.TimeoutException | SdkError | InvalidObjectStateError | NoSuchKeyError
+    Cause.TimeoutError | SdkError | InvalidObjectStateError | NoSuchKeyError
   >;
   getObject(
     args: GetObjectCommandInput,
@@ -1036,7 +1043,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetObjectAclCommandOutput,
-    Cause.TimeoutException | SdkError | NoSuchKeyError
+    Cause.TimeoutError | SdkError | NoSuchKeyError
   >;
 
   /**
@@ -1047,7 +1054,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetObjectAttributesCommandOutput,
-    Cause.TimeoutException | SdkError | NoSuchKeyError
+    Cause.TimeoutError | SdkError | NoSuchKeyError
   >;
 
   /**
@@ -1058,7 +1065,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetObjectLegalHoldCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1069,7 +1076,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetObjectLockConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1080,7 +1087,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetObjectRetentionCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1091,7 +1098,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetObjectTaggingCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1102,7 +1109,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetObjectTorrentCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1113,7 +1120,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetPublicAccessBlockCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1124,7 +1131,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     HeadBucketCommandOutput,
-    Cause.TimeoutException | SdkError | NotFoundError
+    Cause.TimeoutError | SdkError | NotFoundError
   >;
 
   /**
@@ -1135,7 +1142,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     HeadObjectCommandOutput,
-    Cause.TimeoutException | SdkError | NotFoundError
+    Cause.TimeoutError | SdkError | NotFoundError
   >;
 
   /**
@@ -1146,7 +1153,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListBucketAnalyticsConfigurationsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1157,7 +1164,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListBucketIntelligentTieringConfigurationsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1168,7 +1175,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListBucketInventoryConfigurationsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1179,7 +1186,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListBucketMetricsConfigurationsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1190,7 +1197,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListBucketsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1201,7 +1208,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListDirectoryBucketsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1212,7 +1219,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListMultipartUploadsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1223,7 +1230,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListObjectVersionsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1234,7 +1241,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListObjectsCommandOutput,
-    Cause.TimeoutException | SdkError | NoSuchBucketError
+    Cause.TimeoutError | SdkError | NoSuchBucketError
   >;
 
   /**
@@ -1245,7 +1252,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListObjectsV2CommandOutput,
-    Cause.TimeoutException | SdkError | NoSuchBucketError
+    Cause.TimeoutError | SdkError | NoSuchBucketError
   >;
 
   /**
@@ -1256,7 +1263,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListPartsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1267,7 +1274,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketAbacCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1278,7 +1285,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketAccelerateConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1289,7 +1296,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketAclCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1300,7 +1307,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketAnalyticsConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1311,7 +1318,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketCorsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1322,7 +1329,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketEncryptionCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1333,7 +1340,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketIntelligentTieringConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1344,7 +1351,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketInventoryConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1355,7 +1362,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketLifecycleConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1366,7 +1373,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketLoggingCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1377,7 +1384,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketMetricsConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1388,7 +1395,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketNotificationConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1399,7 +1406,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketOwnershipControlsCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1410,7 +1417,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketPolicyCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1421,7 +1428,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketReplicationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1432,7 +1439,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketRequestPaymentCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1443,7 +1450,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketTaggingCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1454,7 +1461,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketVersioningCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1465,7 +1472,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutBucketWebsiteCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1476,7 +1483,7 @@ interface S3Service$ {
     options?: { readonly presigned?: false } & HttpHandlerOptions,
   ): Effect.Effect<
     PutObjectCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | EncryptionTypeMismatchError
     | InvalidRequestError
@@ -1496,7 +1503,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutObjectAclCommandOutput,
-    Cause.TimeoutException | SdkError | NoSuchKeyError
+    Cause.TimeoutError | SdkError | NoSuchKeyError
   >;
 
   /**
@@ -1507,7 +1514,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutObjectLegalHoldCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1518,7 +1525,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutObjectLockConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1529,7 +1536,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutObjectRetentionCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1540,7 +1547,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutObjectTaggingCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1551,7 +1558,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutPublicAccessBlockCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1562,7 +1569,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     RenameObjectCommandOutput,
-    Cause.TimeoutException | SdkError | IdempotencyParameterMismatchError
+    Cause.TimeoutError | SdkError | IdempotencyParameterMismatchError
   >;
 
   /**
@@ -1573,7 +1580,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     RestoreObjectCommandOutput,
-    Cause.TimeoutException | SdkError | ObjectAlreadyInActiveTierError
+    Cause.TimeoutError | SdkError | ObjectAlreadyInActiveTierError
   >;
 
   /**
@@ -1584,7 +1591,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     SelectObjectContentCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1595,7 +1602,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UpdateBucketMetadataInventoryTableConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1606,7 +1613,18 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UpdateBucketMetadataJournalTableConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
+  >;
+
+  /**
+   * @see {@link UpdateObjectEncryptionCommand}
+   */
+  updateObjectEncryption(
+    args: UpdateObjectEncryptionCommandInput,
+    options?: HttpHandlerOptions,
+  ): Effect.Effect<
+    UpdateObjectEncryptionCommandOutput,
+    Cause.TimeoutError | SdkError | AccessDeniedError | InvalidRequestError | NoSuchKeyError
   >;
 
   /**
@@ -1617,7 +1635,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UploadPartCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1628,7 +1646,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UploadPartCopyCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 
   /**
@@ -1639,7 +1657,7 @@ interface S3Service$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     WriteGetObjectResponseCommandOutput,
-    Cause.TimeoutException | SdkError | S3ServiceError
+    Cause.TimeoutError | SdkError | S3ServiceError
   >;
 }
 
@@ -1675,40 +1693,10 @@ export const makeS3Service = Effect.gen(function*() {
  * @since 1.0.0
  * @category models
  */
-export class S3Service extends Effect.Tag("@effect-aws/client-s3/S3Service")<
+export class S3Service extends ServiceMap.Service<
   S3Service,
   S3Service$
->() {
-  // Explicitly declare the methods which have overloads, Effect Service can't infer them as service accessors currently
-  declare static readonly getObject: {
-    (
-      args: GetObjectCommandInput,
-      options?: { readonly presigned?: false } & HttpHandlerOptions,
-    ): Effect.Effect<
-      GetObjectCommandOutput,
-      SdkError | InvalidObjectStateError | NoSuchKeyError,
-      S3Service
-    >;
-    (
-      args: GetObjectCommandInput,
-      options?: { readonly presigned: true } & RequestPresigningArguments,
-    ): Effect.Effect<string, SdkError | S3ServiceError, S3Service>;
-  };
-  declare static readonly putObject: {
-    (
-      args: PutObjectCommandInput,
-      options?: { readonly presigned?: false } & HttpHandlerOptions,
-    ): Effect.Effect<
-      PutObjectCommandOutput,
-      SdkError | EncryptionTypeMismatchError | InvalidRequestError | InvalidWriteOffsetError | TooManyPartsError,
-      S3Service
-    >;
-    (
-      args: PutObjectCommandInput,
-      options?: { readonly presigned: true } & RequestPresigningArguments,
-    ): Effect.Effect<string, SdkError | S3ServiceError, S3Service>;
-  };
-
+>()("@effect-aws/client-s3/S3Service") {
   static readonly defaultLayer = Layer.effect(this, makeS3Service).pipe(Layer.provide(Instance.layer));
   static readonly layer = (config: S3Service.Config) =>
     Layer.effect(this, makeS3Service).pipe(