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

package/dist/esm/KMSServiceConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"KMSServiceConfig.js","sourceRoot":"","sources":["../../src/KMSServiceConfig.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD;;;GAGG;AACH,MAAM,uBAAuB,GAAG,WAAW,CACzC,gDAAgD,EAChD,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAoB,EAAE,CAAC,CACjD,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAG7B,IAAI,CACN,CAAC,EACD,CAAU,MAA8B,EAAE,MAAyB,EAA0B,EAAE,CAC7F,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,uBAAuB,EAAE,MAAM,CAAC,CAC1D,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAyB,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;AAEvH;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAmC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnF,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAE1F,MAAM,MAAM,GAAG,aAAa,KAAK,IAAI;QACnC,CAAC,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,aAAa,CAAC,oBAAoB,CAAC;QACzE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAEzG,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;AAC/B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"KMSServiceConfig.js","sourceRoot":"","sources":["../../src/KMSServiceConfig.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAGhD;;;GAGG;AACH,MAAM,uBAAuB,GAAG,UAAU,CAAC,SAAS,CAClD,gDAAgD,EAChD,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAC7B,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAG7B,IAAI,CACN,CAAC,EACD,CAAU,MAA8B,EAAE,MAAyB,EAA0B,EAAE,CAC7F,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,uBAAuB,EAAE,MAAM,CAAC,CACjE,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAyB,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;AAEjH;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAmC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnF,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,uBAAuB,CAAC;IAE5E,MAAM,MAAM,GAAG,aAAa,KAAK,IAAI;QACnC,CAAC,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,aAAa,CAAC,oBAAoB,CAAC;QACzE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAEzG,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;AAC/B,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-aws/client-kms",
-  "version": "1.10.9",
+  "version": "2.0.0-beta.1",
   "description": "Effectful AWS KMS client",
   "license": "MIT",
   "repository": {
@@ -16,40 +16,34 @@
   "homepage": "https://floydspace.github.io/effect-aws/docs/client-kms",
   "dependencies": {
     "@aws-sdk/client-kms": "^3",
-    "@effect-aws/commons": "^0.3.1"
+    "@effect-aws/commons": "^1.0.0-beta.1"
   },
   "peerDependencies": {
-    "effect": ">=3.0.4 <4.0.0"
+    "effect": ">=4.0.0 <5.0.0"
   },
-  "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/dts/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
       "types": "./dist/dts/index.d.ts",
-      "import": "./dist/esm/index.js",
-      "default": "./dist/cjs/index.js"
+      "import": "./dist/esm/index.js"
     },
     "./Errors": {
       "types": "./dist/dts/Errors.d.ts",
-      "import": "./dist/esm/Errors.js",
-      "default": "./dist/cjs/Errors.js"
+      "import": "./dist/esm/Errors.js"
     },
     "./KMSClientInstance": {
       "types": "./dist/dts/KMSClientInstance.d.ts",
-      "import": "./dist/esm/KMSClientInstance.js",
-      "default": "./dist/cjs/KMSClientInstance.js"
+      "import": "./dist/esm/KMSClientInstance.js"
     },
     "./KMSService": {
       "types": "./dist/dts/KMSService.d.ts",
-      "import": "./dist/esm/KMSService.js",
-      "default": "./dist/cjs/KMSService.js"
+      "import": "./dist/esm/KMSService.js"
     },
     "./KMSServiceConfig": {
       "types": "./dist/dts/KMSServiceConfig.d.ts",
-      "import": "./dist/esm/KMSServiceConfig.js",
-      "default": "./dist/cjs/KMSServiceConfig.js"
+      "import": "./dist/esm/KMSServiceConfig.js"
     }
   },
   "typesVersions": {

package/src/KMSClientInstance.ts

@@ -2,16 +2,18 @@
  * @since 1.0.0
  */
 import { KMSClient } from "@aws-sdk/client-kms";
-import { Context, Effect, Layer } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as ServiceMap from "effect/ServiceMap";
 import * as KMSServiceConfig from "./KMSServiceConfig.js";
 
 /**
  * @since 1.0.0
  * @category tags
  */
-export class KMSClientInstance extends Context.Tag(
+export class KMSClientInstance extends ServiceMap.Service<KMSClientInstance, KMSClient>()(
   "@effect-aws/client-kms/KMSClientInstance",
-)<KMSClientInstance, KMSClient>() {}
+) {}
 
 /**
  * @since 1.0.0
@@ -30,4 +32,4 @@ export const make = Effect.flatMap(
  * @since 1.0.0
  * @category layers
  */
-export const layer = Layer.scoped(KMSClientInstance, make);
+export const layer = Layer.effect(KMSClientInstance, make);

package/src/KMSService.ts

@@ -166,8 +166,10 @@ import {
 } from "@aws-sdk/client-kms";
 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 {
   AlreadyExistsError,
   CloudHsmClusterInUseError,
@@ -290,7 +292,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CancelKeyDeletionCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -307,7 +309,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ConnectCustomKeyStoreCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | CloudHsmClusterInvalidConfigurationError
     | CloudHsmClusterNotActiveError
@@ -324,7 +326,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateAliasCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | AlreadyExistsError
     | DependencyTimeoutError
@@ -343,7 +345,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateCustomKeyStoreCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | CloudHsmClusterInUseError
     | CloudHsmClusterInvalidConfigurationError
@@ -372,7 +374,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateGrantCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -393,7 +395,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateKeyCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | CloudHsmClusterInvalidConfigurationError
     | CustomKeyStoreInvalidStateError
@@ -418,7 +420,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DecryptCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -441,7 +443,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteAliasCommandOutput,
-    Cause.TimeoutException | SdkError | DependencyTimeoutError | KMSInternalError | KMSInvalidStateError | NotFoundError
+    Cause.TimeoutError | SdkError | DependencyTimeoutError | KMSInternalError | KMSInvalidStateError | NotFoundError
   >;
 
   /**
@@ -452,7 +454,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteCustomKeyStoreCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | CustomKeyStoreHasCMKsError
     | CustomKeyStoreInvalidStateError
@@ -468,7 +470,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteImportedKeyMaterialCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -486,7 +488,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeriveSharedSecretCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -507,7 +509,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DescribeCustomKeyStoresCommandOutput,
-    Cause.TimeoutException | SdkError | CustomKeyStoreNotFoundError | InvalidMarkerError | KMSInternalError
+    Cause.TimeoutError | SdkError | CustomKeyStoreNotFoundError | InvalidMarkerError | KMSInternalError
   >;
 
   /**
@@ -518,7 +520,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DescribeKeyCommandOutput,
-    Cause.TimeoutException | SdkError | DependencyTimeoutError | InvalidArnError | KMSInternalError | NotFoundError
+    Cause.TimeoutError | SdkError | DependencyTimeoutError | InvalidArnError | KMSInternalError | NotFoundError
   >;
 
   /**
@@ -529,7 +531,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DisableKeyCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -546,7 +548,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DisableKeyRotationCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -565,7 +567,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DisconnectCustomKeyStoreCommandOutput,
-    Cause.TimeoutException | SdkError | CustomKeyStoreInvalidStateError | CustomKeyStoreNotFoundError | KMSInternalError
+    Cause.TimeoutError | SdkError | CustomKeyStoreInvalidStateError | CustomKeyStoreNotFoundError | KMSInternalError
   >;
 
   /**
@@ -576,7 +578,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     EnableKeyCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -594,7 +596,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     EnableKeyRotationCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -613,7 +615,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     EncryptCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -634,7 +636,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GenerateDataKeyCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -655,7 +657,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GenerateDataKeyPairCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -677,7 +679,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GenerateDataKeyPairWithoutPlaintextCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -699,7 +701,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GenerateDataKeyWithoutPlaintextCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -720,7 +722,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GenerateMacCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DisabledError
     | DryRunOperationError
@@ -740,7 +742,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GenerateRandomCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | CustomKeyStoreInvalidStateError
     | CustomKeyStoreNotFoundError
@@ -757,7 +759,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetKeyPolicyCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -774,7 +776,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetKeyRotationStatusCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -792,7 +794,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetParametersForImportCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -810,7 +812,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetPublicKeyCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -832,7 +834,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ImportKeyMaterialCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | ExpiredImportTokenError
@@ -854,7 +856,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListAliasesCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -871,7 +873,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListGrantsCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -890,7 +892,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListKeyPoliciesCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -907,7 +909,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListKeyRotationsCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | InvalidArnError
     | InvalidMarkerError
@@ -925,7 +927,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListKeysCommandOutput,
-    Cause.TimeoutException | SdkError | DependencyTimeoutError | InvalidMarkerError | KMSInternalError
+    Cause.TimeoutError | SdkError | DependencyTimeoutError | InvalidMarkerError | KMSInternalError
   >;
 
   /**
@@ -936,7 +938,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListResourceTagsCommandOutput,
-    Cause.TimeoutException | SdkError | InvalidArnError | InvalidMarkerError | KMSInternalError | NotFoundError
+    Cause.TimeoutError | SdkError | InvalidArnError | InvalidMarkerError | KMSInternalError | NotFoundError
   >;
 
   /**
@@ -947,7 +949,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListRetirableGrantsCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -964,7 +966,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutKeyPolicyCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -984,7 +986,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ReEncryptCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -1007,7 +1009,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ReplicateKeyCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | AlreadyExistsError
     | DisabledError
@@ -1029,7 +1031,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     RetireGrantCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DryRunOperationError
@@ -1049,7 +1051,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     RevokeGrantCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DryRunOperationError
@@ -1068,7 +1070,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     RotateKeyOnDemandCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | ConflictError
     | DependencyTimeoutError
@@ -1089,7 +1091,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ScheduleKeyDeletionCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -1106,7 +1108,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     SignCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -1127,7 +1129,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     TagResourceCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | InvalidArnError
     | KMSInternalError
@@ -1145,13 +1147,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UntagResourceCommandOutput,
-    | Cause.TimeoutException
-    | SdkError
-    | InvalidArnError
-    | KMSInternalError
-    | KMSInvalidStateError
-    | NotFoundError
-    | TagError
+    Cause.TimeoutError | SdkError | InvalidArnError | KMSInternalError | KMSInvalidStateError | NotFoundError | TagError
   >;
 
   /**
@@ -1162,7 +1158,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UpdateAliasCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | KMSInternalError
@@ -1179,7 +1175,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UpdateCustomKeyStoreCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | CloudHsmClusterInvalidConfigurationError
     | CloudHsmClusterNotActiveError
@@ -1208,7 +1204,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UpdateKeyDescriptionCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | InvalidArnError
@@ -1225,7 +1221,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UpdatePrimaryRegionCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DisabledError
     | InvalidArnError
@@ -1243,7 +1239,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     VerifyCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DependencyTimeoutError
     | DisabledError
@@ -1265,7 +1261,7 @@ interface KMSService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     VerifyMacCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | DisabledError
     | DryRunOperationError
@@ -1300,10 +1296,10 @@ export const makeKMSService = Effect.gen(function*() {
  * @since 1.0.0
  * @category models
  */
-export class KMSService extends Effect.Tag("@effect-aws/client-kms/KMSService")<
+export class KMSService extends ServiceMap.Service<
   KMSService,
   KMSService$
->() {
+>()("@effect-aws/client-kms/KMSService") {
   static readonly defaultLayer = Layer.effect(this, makeKMSService).pipe(Layer.provide(Instance.layer));
   static readonly layer = (config: KMSService.Config) =>
     Layer.effect(this, makeKMSService).pipe(

package/src/KMSServiceConfig.ts

@@ -3,18 +3,19 @@
  */
 import type { KMSClientConfig } from "@aws-sdk/client-kms";
 import { ServiceLogger } from "@effect-aws/commons";
-import { Effect, FiberRef, Layer } from "effect";
+import * as Effect from "effect/Effect";
 import { dual } from "effect/Function";
-import { globalValue } from "effect/GlobalValue";
+import * as Layer from "effect/Layer";
+import * as ServiceMap from "effect/ServiceMap";
 import type { KMSService } from "./KMSService.js";
 
 /**
  * @since 1.0.0
  * @category kms service config
  */
-const currentKMSServiceConfig = globalValue(
+const currentKMSServiceConfig = ServiceMap.Reference<KMSService.Config>(
   "@effect-aws/client-kms/currentKMSServiceConfig",
-  () => FiberRef.unsafeMake<KMSService.Config>({}),
+  { defaultValue: () => ({}) },
 );
 
 /**
@@ -27,21 +28,21 @@ export const withKMSServiceConfig: {
 } = dual(
   2,
   <A, E, R>(effect: Effect.Effect<A, E, R>, config: KMSService.Config): Effect.Effect<A, E, R> =>
-    Effect.locally(effect, currentKMSServiceConfig, config),
+    Effect.provideService(effect, currentKMSServiceConfig, config),
 );
 
 /**
  * @since 1.0.0
  * @category kms service config
  */
-export const setKMSServiceConfig = (config: KMSService.Config) => Layer.locallyScoped(currentKMSServiceConfig, config);
+export const setKMSServiceConfig = (config: KMSService.Config) => Layer.succeed(currentKMSServiceConfig, config);
 
 /**
  * @since 1.0.0
  * @category adapters
  */
 export const toKMSClientConfig: Effect.Effect<KMSClientConfig> = Effect.gen(function*() {
-  const { logger: serviceLogger, ...config } = yield* FiberRef.get(currentKMSServiceConfig);
+  const { logger: serviceLogger, ...config } = yield* currentKMSServiceConfig;
 
   const logger = serviceLogger === true
     ? yield* ServiceLogger.toClientLogger(ServiceLogger.defaultServiceLogger)