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

package/src/AthenaService.ts

@@ -217,8 +217,10 @@ import {
 } from "@aws-sdk/client-athena";
 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 * as Instance from "./AthenaClientInstance.js";
 import * as AthenaServiceConfig from "./AthenaServiceConfig.js";
 import type {
@@ -316,7 +318,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     BatchGetNamedQueryCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -327,7 +329,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     BatchGetPreparedStatementCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -338,7 +340,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     BatchGetQueryExecutionCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -349,7 +351,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CancelCapacityReservationCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -360,7 +362,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateCapacityReservationCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -371,7 +373,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateDataCatalogCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -382,7 +384,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateNamedQueryCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -393,7 +395,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateNotebookCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
   >;
 
   /**
@@ -404,7 +406,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreatePreparedStatementCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -415,7 +417,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreatePresignedNotebookUrlCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -426,7 +428,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     CreateWorkGroupCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -437,7 +439,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteCapacityReservationCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -448,7 +450,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteDataCatalogCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -459,7 +461,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteNamedQueryCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -470,7 +472,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteNotebookCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
   >;
 
   /**
@@ -481,7 +483,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeletePreparedStatementCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -492,7 +494,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     DeleteWorkGroupCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -503,7 +505,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ExportNotebookCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
   >;
 
   /**
@@ -514,7 +516,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetCalculationExecutionCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -525,7 +527,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetCalculationExecutionCodeCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -536,7 +538,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetCalculationExecutionStatusCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -547,7 +549,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetCapacityAssignmentConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -558,7 +560,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetCapacityReservationCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -569,7 +571,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetDataCatalogCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -580,7 +582,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetDatabaseCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | MetadataError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | MetadataError
   >;
 
   /**
@@ -591,7 +593,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetNamedQueryCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -602,7 +604,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetNotebookMetadataCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
   >;
 
   /**
@@ -613,7 +615,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetPreparedStatementCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -624,7 +626,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetQueryExecutionCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -635,7 +637,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetQueryResultsCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
   >;
 
   /**
@@ -646,7 +648,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetQueryRuntimeStatisticsCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -657,7 +659,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetResourceDashboardCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -668,7 +670,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetSessionCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -679,7 +681,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetSessionEndpointCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -690,7 +692,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetSessionStatusCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -701,7 +703,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetTableMetadataCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | MetadataError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | MetadataError
   >;
 
   /**
@@ -712,7 +714,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     GetWorkGroupCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -723,7 +725,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ImportNotebookCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
   >;
 
   /**
@@ -734,7 +736,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListApplicationDPUSizesCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
   >;
 
   /**
@@ -745,7 +747,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListCalculationExecutionsCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -756,7 +758,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListCapacityReservationsCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -767,7 +769,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListDataCatalogsCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -778,7 +780,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListDatabasesCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | MetadataError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | MetadataError
   >;
 
   /**
@@ -789,7 +791,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListEngineVersionsCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -800,7 +802,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListExecutorsCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -811,7 +813,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListNamedQueriesCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -822,7 +824,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListNotebookMetadataCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
   >;
 
   /**
@@ -833,7 +835,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListNotebookSessionsCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -844,7 +846,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListPreparedStatementsCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -855,7 +857,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListQueryExecutionsCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -866,7 +868,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListSessionsCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -877,7 +879,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListTableMetadataCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | MetadataError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | MetadataError
   >;
 
   /**
@@ -888,7 +890,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListTagsForResourceCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -899,7 +901,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     ListWorkGroupsCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -910,7 +912,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     PutCapacityAssignmentConfigurationCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -921,7 +923,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     StartCalculationExecutionCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -932,7 +934,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     StartQueryExecutionCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
   >;
 
   /**
@@ -943,7 +945,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     StartSessionCommandOutput,
-    | Cause.TimeoutException
+    | Cause.TimeoutError
     | SdkError
     | InternalServerError
     | InvalidRequestError
@@ -960,7 +962,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     StopCalculationExecutionCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -971,7 +973,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     StopQueryExecutionCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -982,7 +984,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     TagResourceCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -993,7 +995,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     TerminateSessionCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -1004,7 +1006,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UntagResourceCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -1015,7 +1017,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UpdateCapacityReservationCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -1026,7 +1028,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UpdateDataCatalogCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -1037,7 +1039,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UpdateNamedQueryCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 
   /**
@@ -1048,7 +1050,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UpdateNotebookCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
   >;
 
   /**
@@ -1059,7 +1061,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UpdateNotebookMetadataCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | TooManyRequestsError
   >;
 
   /**
@@ -1070,7 +1072,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UpdatePreparedStatementCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError | ResourceNotFoundError
   >;
 
   /**
@@ -1081,7 +1083,7 @@ interface AthenaService$ {
     options?: HttpHandlerOptions,
   ): Effect.Effect<
     UpdateWorkGroupCommandOutput,
-    Cause.TimeoutException | SdkError | InternalServerError | InvalidRequestError
+    Cause.TimeoutError | SdkError | InternalServerError | InvalidRequestError
   >;
 }
 
@@ -1106,10 +1108,10 @@ export const makeAthenaService = Effect.gen(function*() {
  * @since 1.0.0
  * @category models
  */
-export class AthenaService extends Effect.Tag("@effect-aws/client-athena/AthenaService")<
+export class AthenaService extends ServiceMap.Service<
   AthenaService,
   AthenaService$
->() {
+>()("@effect-aws/client-athena/AthenaService") {
   static readonly defaultLayer = Layer.effect(this, makeAthenaService).pipe(Layer.provide(Instance.layer));
   static readonly layer = (config: AthenaService.Config) =>
     Layer.effect(this, makeAthenaService).pipe(

package/src/AthenaServiceConfig.ts

@@ -3,18 +3,19 @@
  */
 import type { AthenaClientConfig } from "@aws-sdk/client-athena";
 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 { AthenaService } from "./AthenaService.js";
 
 /**
  * @since 1.0.0
  * @category athena service config
  */
-const currentAthenaServiceConfig = globalValue(
+const currentAthenaServiceConfig = ServiceMap.Reference<AthenaService.Config>(
   "@effect-aws/client-athena/currentAthenaServiceConfig",
-  () => FiberRef.unsafeMake<AthenaService.Config>({}),
+  { defaultValue: () => ({}) },
 );
 
 /**
@@ -27,7 +28,7 @@ export const withAthenaServiceConfig: {
 } = dual(
   2,
   <A, E, R>(effect: Effect.Effect<A, E, R>, config: AthenaService.Config): Effect.Effect<A, E, R> =>
-    Effect.locally(effect, currentAthenaServiceConfig, config),
+    Effect.provideService(effect, currentAthenaServiceConfig, config),
 );
 
 /**
@@ -35,14 +36,14 @@ export const withAthenaServiceConfig: {
  * @category athena service config
  */
 export const setAthenaServiceConfig = (config: AthenaService.Config) =>
-  Layer.locallyScoped(currentAthenaServiceConfig, config);
+  Layer.succeed(currentAthenaServiceConfig, config);
 
 /**
  * @since 1.0.0
  * @category adapters
  */
 export const toAthenaClientConfig: Effect.Effect<AthenaClientConfig> = Effect.gen(function*() {
-  const { logger: serviceLogger, ...config } = yield* FiberRef.get(currentAthenaServiceConfig);
+  const { logger: serviceLogger, ...config } = yield* currentAthenaServiceConfig;
 
   const logger = serviceLogger === true
     ? yield* ServiceLogger.toClientLogger(ServiceLogger.defaultServiceLogger)