alchemy 2.0.0-beta.60 → 2.0.0-beta.62

package/src/AWS/EC2/InternetGateway.ts

@@ -332,11 +332,13 @@ export const InternetGatewayProvider = () =>
                     while: (e) => {
                       return e._tag === "DependencyViolation";
                     },
-                    schedule: Schedule.fixed(5000).pipe(
-                      Schedule.both(Schedule.recurs(60)), // Up to 5 minutes
-                      Schedule.tapOutput(([, attempt]) =>
+                    schedule: Schedule.max([
+                      Schedule.fixed(5000),
+                      Schedule.recurs(60),
+                    ]).pipe(
+                      Schedule.tap(({ attempt }) =>
                         session.note(
-                          `Waiting for VPC dependencies to clear before detaching... (attempt ${attempt + 1})`,
+                          `Waiting for VPC dependencies to clear before detaching... (attempt ${attempt})`,
                         ),
                       ),
                     ),
@@ -367,11 +369,13 @@ export const InternetGatewayProvider = () =>
                       e.message?.includes("DependencyViolation"))
                   );
                 },
-                schedule: Schedule.fixed(5000).pipe(
-                  Schedule.both(Schedule.recurs(60)), // Up to 5 minutes
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.fixed(5000),
+                  Schedule.recurs(60),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `Waiting for dependencies to clear... (attempt ${attempt + 1})`,
+                      `Waiting for dependencies to clear... (attempt ${attempt})`,
                     ),
                   ),
                 ),
@@ -439,11 +443,13 @@ const waitForInternetGatewayDeleted = (
         return yield* Effect.fail(new Error("Internet gateway still exists"));
       }),
       {
-        schedule: Schedule.fixed(2000).pipe(
-          Schedule.both(Schedule.recurs(15)),
-          Schedule.tapOutput(([, attempt]) =>
+        schedule: Schedule.max([
+          Schedule.fixed(2000),
+          Schedule.recurs(15),
+        ]).pipe(
+          Schedule.tap(({ attempt }) =>
             session.note(
-              `Waiting for internet gateway deletion... (${(attempt + 1) * 2}s)`,
+              `Waiting for internet gateway deletion... (${attempt * 2}s)`,
             ),
           ),
         ),

package/src/AWS/EC2/NatGateway.ts

@@ -533,11 +533,10 @@ const waitForNatGatewayAvailable = (
     Effect.tapError(Effect.logDebug),
     Effect.retry({
       while: (e) => e._tag === "NatGatewayPending",
-      schedule: Schedule.fixed(5000).pipe(
-        Schedule.both(Schedule.recurs(60)), // Max 5 minutes
-        Schedule.tapOutput(([, attempt]) =>
+      schedule: Schedule.max([Schedule.fixed(5000), Schedule.recurs(60)]).pipe(
+        Schedule.tap(({ attempt }) =>
           session.note(
-            `Waiting for NAT Gateway to be available... (${(attempt + 1) * 5}s)`,
+            `Waiting for NAT Gateway to be available... (${attempt * 5}s)`,
           ),
         ),
       ),
@@ -580,12 +579,9 @@ const waitForNatGatewayDeleted = (
     Effect.tapError(Effect.logDebug),
     Effect.retry({
       while: (e) => e._tag === "NatGatewayDeleting",
-      schedule: Schedule.fixed(5000).pipe(
-        Schedule.both(Schedule.recurs(60)), // Max 5 minutes
-        Schedule.tapOutput(([, attempt]) =>
-          session.note(
-            `Waiting for NAT Gateway deletion... (${(attempt + 1) * 5}s)`,
-          ),
+      schedule: Schedule.max([Schedule.fixed(5000), Schedule.recurs(60)]).pipe(
+        Schedule.tap(({ attempt }) =>
+          session.note(`Waiting for NAT Gateway deletion... (${attempt * 5}s)`),
         ),
       ),
     }),

package/src/AWS/EC2/NetworkAcl.ts

@@ -335,11 +335,13 @@ export const NetworkAclProvider = () =>
                 while: (e) => {
                   return e._tag === "DependencyViolation";
                 },
-                schedule: Schedule.exponential(1000, 1.5).pipe(
-                  Schedule.both(Schedule.recurs(15)),
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.exponential(1000, 1.5),
+                  Schedule.recurs(15),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `Waiting for dependencies to clear... (attempt ${attempt + 1})`,
+                      `Waiting for dependencies to clear... (attempt ${attempt})`,
                     ),
                   ),
                 ),

package/src/AWS/EC2/NetworkAclEntry.ts

@@ -389,9 +389,10 @@ export const NetworkAclEntryProvider = () =>
             ),
             Effect.retry({
               while: (e) => e._tag === "EntryNotYetVisible",
-              schedule: Schedule.exponential("500 millis").pipe(
-                Schedule.both(Schedule.recurs(8)),
-              ),
+              schedule: Schedule.max([
+                Schedule.exponential("500 millis"),
+                Schedule.recurs(8),
+              ]),
             }),
             Effect.catchTag("EntryNotYetVisible", () =>
               Effect.fail(

package/src/AWS/EC2/RouteTable.ts

@@ -458,11 +458,13 @@ export const RouteTableProvider = () =>
                 while: (e) => {
                   return e._tag === "DependencyViolation";
                 },
-                schedule: Schedule.exponential(1000, 1.5).pipe(
-                  Schedule.both(Schedule.recurs(10)), // Try up to 10 times
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.exponential(1000, 1.5),
+                  Schedule.recurs(10),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `Waiting for dependencies to clear... (attempt ${attempt + 1})`,
+                      `Waiting for dependencies to clear... (attempt ${attempt})`,
                     ),
                   ),
                 ),
@@ -530,12 +532,13 @@ const waitForRouteTableDeleted = (
         return yield* Effect.fail(new Error("Route table still exists"));
       }),
       {
-        schedule: Schedule.fixed(2000).pipe(
-          // Check every 2 seconds
-          Schedule.both(Schedule.recurs(15)), // Max 30 seconds
-          Schedule.tapOutput(([, attempt]) =>
+        schedule: Schedule.max([
+          Schedule.fixed(2000),
+          Schedule.recurs(15),
+        ]).pipe(
+          Schedule.tap(({ attempt }) =>
             session.note(
-              `Waiting for route table deletion... (${(attempt + 1) * 2}s)`,
+              `Waiting for route table deletion... (${attempt * 2}s)`,
             ),
           ),
         ),

package/src/AWS/EC2/RouteTableAssociation.ts

@@ -412,13 +412,11 @@ const waitForAssociationState = (
       );
     }),
     {
-      schedule: Schedule.fixed(1000).pipe(
-        // Check every second
-        Schedule.both(Schedule.recurs(30)), // Max 30 seconds
-        Schedule.tapOutput(([, attempt]) =>
+      schedule: Schedule.max([Schedule.fixed(1000), Schedule.recurs(30)]).pipe(
+        Schedule.tap(({ attempt }) =>
           session
             ? session.note(
-                `Waiting for association to be ${targetState}... (${attempt + 1}s)`,
+                `Waiting for association to be ${targetState}... (${attempt}s)`,
               )
             : Effect.void,
         ),

package/src/AWS/EC2/SecurityGroup.ts

@@ -558,9 +558,10 @@ export const SecurityGroupProvider = () =>
                 // `InvalidVpcID.NotFound`. Retry, bounded.
                 Effect.retry({
                   while: (e) => e._tag === "InvalidVpcID.NotFound",
-                  schedule: Schedule.fixed("1 second").pipe(
-                    Schedule.both(Schedule.recurs(15)),
-                  ),
+                  schedule: Schedule.max([
+                    Schedule.fixed("1 second"),
+                    Schedule.recurs(15),
+                  ]),
                 }),
               );
             const newGroupId = result.GroupId! as SecurityGroupId;
@@ -690,11 +691,13 @@ export const SecurityGroupProvider = () =>
                       e.message?.includes("DependencyViolation"))
                   );
                 },
-                schedule: Schedule.fixed(5000).pipe(
-                  Schedule.both(Schedule.recurs(30)), // Up to ~2.5 minutes
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.fixed(5000),
+                  Schedule.recurs(30),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `Waiting for dependencies to clear... (attempt ${attempt + 1})`,
+                      `Waiting for dependencies to clear... (attempt ${attempt})`,
                     ),
                   ),
                 ),

package/src/AWS/EC2/Subnet.ts

@@ -604,12 +604,16 @@ export const SubnetProvider = () =>
                   // This can happen if ENIs/instances are being deleted concurrently
                   return e._tag === "DependencyViolation";
                 },
-                schedule: Schedule.exponential(1000, 1.5).pipe(
-                  Schedule.either(Schedule.spaced("30 seconds")),
-                  Schedule.both(Schedule.recurs(30)),
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.min([
+                    Schedule.exponential(1000, 1.5),
+                    Schedule.spaced("30 seconds"),
+                  ]),
+                  Schedule.recurs(30),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `Waiting for dependencies to clear... (attempt ${attempt + 1})`,
+                      `Waiting for dependencies to clear... (attempt ${attempt})`,
                     ),
                   ),
                 ),
@@ -700,12 +704,11 @@ const waitForSubnetAvailable = (
   }).pipe(
     Effect.retry({
       while: (e) => e instanceof SubnetPending,
-      schedule: Schedule.fixed(2000).pipe(
-        Schedule.both(Schedule.recurs(30)), // Max 60 seconds
-        Schedule.tapOutput(([, attempt]) =>
+      schedule: Schedule.max([Schedule.fixed(2000), Schedule.recurs(30)]).pipe(
+        Schedule.tap(({ attempt }) =>
           session
             ? session.note(
-                `Waiting for subnet to be available... (${(attempt + 1) * 2}s)`,
+                `Waiting for subnet to be available... (${attempt * 2}s)`,
               )
             : Effect.void,
         ),
@@ -738,12 +741,9 @@ const waitForSubnetDeleted = (
   }).pipe(
     Effect.retry({
       while: (e) => e instanceof SubnetStillExists,
-      schedule: Schedule.fixed(2000).pipe(
-        Schedule.both(Schedule.recurs(15)), // Max 30 seconds
-        Schedule.tapOutput(([, attempt]) =>
-          session.note(
-            `Waiting for subnet deletion... (${(attempt + 1) * 2}s)`,
-          ),
+      schedule: Schedule.max([Schedule.fixed(2000), Schedule.recurs(15)]).pipe(
+        Schedule.tap(({ attempt }) =>
+          session.note(`Waiting for subnet deletion... (${attempt * 2}s)`),
         ),
       ),
     }),

package/src/AWS/EC2/Vpc.ts

@@ -550,11 +550,13 @@ export const VpcProvider = () =>
                   );
                 },
                 // Use fixed 5s delay instead of exponential to avoid very long waits
-                schedule: Schedule.fixed(5000).pipe(
-                  Schedule.both(Schedule.recurs(60)), // Up to 5 minutes total
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.fixed(5000),
+                  Schedule.recurs(60),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `Waiting for dependencies to clear... (attempt ${attempt + 1})`,
+                      `Waiting for dependencies to clear... (attempt ${attempt})`,
                     ),
                   ),
                 ),
@@ -609,12 +611,11 @@ const waitForVpcAvailable = (
   }).pipe(
     Effect.retry({
       while: (e) => e instanceof VpcPending,
-      schedule: Schedule.fixed(2000).pipe(
-        Schedule.both(Schedule.recurs(30)), // Max 60 seconds
-        Schedule.tapOutput(([, attempt]) =>
+      schedule: Schedule.max([Schedule.fixed(2000), Schedule.recurs(30)]).pipe(
+        Schedule.tap(({ attempt }) =>
           session
             ? session.note(
-                `Waiting for VPC to be available... (${(attempt + 1) * 2}s)`,
+                `Waiting for VPC to be available... (${attempt * 2}s)`,
               )
             : Effect.void,
         ),
@@ -644,10 +645,9 @@ const waitForVpcDeleted = (vpcId: string, session: ScopedPlanStatusSession) =>
   }).pipe(
     Effect.retry({
       while: (e) => e instanceof VpcStillExists,
-      schedule: Schedule.fixed(2000).pipe(
-        Schedule.both(Schedule.recurs(15)), // Max 30 seconds
-        Schedule.tapOutput(([, attempt]) =>
-          session.note(`Waiting for VPC deletion... (${(attempt + 1) * 2}s)`),
+      schedule: Schedule.max([Schedule.fixed(2000), Schedule.recurs(15)]).pipe(
+        Schedule.tap(({ attempt }) =>
+          session.note(`Waiting for VPC deletion... (${attempt * 2}s)`),
         ),
       ),
     }),

package/src/AWS/EC2/VpcEndpoint.ts

@@ -714,11 +714,10 @@ const waitForVpcEndpointAvailable = (
   }).pipe(
     Effect.retry({
       while: (e) => e._tag === "VpcEndpointPending",
-      schedule: Schedule.fixed(3000).pipe(
-        Schedule.both(Schedule.recurs(60)), // Max 3 minutes
-        Schedule.tapOutput(([, attempt]) =>
+      schedule: Schedule.max([Schedule.fixed(3000), Schedule.recurs(60)]).pipe(
+        Schedule.tap(({ attempt }) =>
           session.note(
-            `Waiting for VPC Endpoint to be available... (${(attempt + 1) * 3}s)`,
+            `Waiting for VPC Endpoint to be available... (${attempt * 3}s)`,
           ),
         ),
       ),
@@ -752,11 +751,10 @@ const waitForVpcEndpointDeleted = (
   }).pipe(
     Effect.retry({
       while: (e) => e._tag === "VpcEndpointDeleting",
-      schedule: Schedule.fixed(3000).pipe(
-        Schedule.both(Schedule.recurs(60)), // Max 3 minutes
-        Schedule.tapOutput(([, attempt]) =>
+      schedule: Schedule.max([Schedule.fixed(3000), Schedule.recurs(60)]).pipe(
+        Schedule.tap(({ attempt }) =>
           session.note(
-            `Waiting for VPC Endpoint deletion... (${(attempt + 1) * 3}s)`,
+            `Waiting for VPC Endpoint deletion... (${attempt * 3}s)`,
           ),
         ),
       ),

package/src/AWS/ECS/Service.ts

@@ -381,10 +381,20 @@ export const ServiceProvider = () =>
   Provider.effect(
     Service,
     Effect.gen(function* () {
-      const clusterArnOf = (cluster: ServiceProps["cluster"] | ClusterArn) =>
+      // Derive the cluster ARN from either form of the `cluster` prop. May
+      // legitimately receive `undefined`: a `creating` state row persisted
+      // before upstream Outputs resolved can't round-trip an Output-valued
+      // `cluster` (it deserializes as `undefined`), and recovery paths hand
+      // those props back as `olds`.
+      const clusterArnOf = (
+        cluster: ServiceProps["cluster"] | ClusterArn | undefined,
+      ): ClusterArn | undefined =>
         typeof cluster === "string"
-          ? cluster
-          : (((cluster as any).clusterArn ?? cluster) as string);
+          ? (cluster as ClusterArn)
+          : typeof (cluster as { clusterArn?: unknown } | undefined)
+                ?.clusterArn === "string"
+            ? ((cluster as { clusterArn: string }).clusterArn as ClusterArn)
+            : undefined;
       const toEcsTags = (tags: Record<string, string>): ecs.Tag[] =>
         Object.entries(tags).map(([key, value]) => ({ key, value }));
 
@@ -555,8 +565,18 @@ export const ServiceProvider = () =>
           ) {
             return { action: "replace", deleteFirst: true } as const;
           }
-          // cluster change → replace (a service can't move clusters).
-          if (clusterArnOf(olds.cluster) !== clusterArnOf(news.cluster)) {
+          // cluster change → replace (a service can't move clusters). Only
+          // when both sides are known — a half-created state row may have
+          // lost an Output-valued `cluster` (see `clusterArnOf`), and an
+          // unknown old cluster must fall through to the create/update
+          // recovery path rather than force a replacement.
+          const oldClusterArn = clusterArnOf(olds.cluster);
+          const newClusterArn = clusterArnOf(news.cluster);
+          if (
+            oldClusterArn !== undefined &&
+            newClusterArn !== undefined &&
+            oldClusterArn !== newClusterArn
+          ) {
             return { action: "replace", deleteFirst: true } as const;
           }
           // Truly-immutable post-create fields. Everything else (desiredCount,
@@ -587,11 +607,20 @@ export const ServiceProvider = () =>
           }
         }),
         read: Effect.fn(function* ({ id, olds, output }) {
+          const clusterArn = output?.clusterArn ?? clusterArnOf(olds?.cluster);
+          if (clusterArn === undefined) {
+            // No attributes and no recoverable cluster from the persisted
+            // props (an Output-valued `cluster` doesn't survive a
+            // `creating`-state round-trip). We can't locate the service, so
+            // report "not found" — the engine re-drives the create and
+            // reconcile converges on any half-created service by name.
+            return undefined;
+          }
           const serviceName =
             output?.serviceName ?? (yield* toServiceName(id, olds ?? {}));
           const described = yield* ecs
             .describeServices({
-              cluster: output?.clusterArn ?? clusterArnOf(olds!.cluster),
+              cluster: clusterArn,
               services: [serviceName],
               include: ["TAGS"],
             })
@@ -790,9 +819,10 @@ export const ServiceProvider = () =>
               // bounded.
               Effect.retry({
                 while: (e) => e._tag === "ServiceNotActiveException",
-                schedule: Schedule.spaced("5 seconds").pipe(
-                  Schedule.both(Schedule.recurs(8)),
-                ),
+                schedule: Schedule.max([
+                  Schedule.spaced("5 seconds"),
+                  Schedule.recurs(8),
+                ]),
               }),
             );
           const service = updated.service;

package/src/AWS/EKS/Addon.ts

@@ -391,9 +391,10 @@ const waitForAddonActive = Effect.fn(function* ({
     }),
     Effect.retry({
       while: (error) => error instanceof AddonNotReady,
-      schedule: Schedule.exponential("1 second").pipe(
-        Schedule.both(Schedule.recurs(120)),
-      ),
+      schedule: Schedule.max([
+        Schedule.exponential("1 second"),
+        Schedule.recurs(120),
+      ]),
     }),
   );
 });
@@ -416,9 +417,10 @@ const waitForAddonDeleted = Effect.fn(function* ({
     ),
     Effect.retry({
       while: (error) => error instanceof AddonStillExists,
-      schedule: Schedule.exponential("1 second").pipe(
-        Schedule.both(Schedule.recurs(120)),
-      ),
+      schedule: Schedule.max([
+        Schedule.exponential("1 second"),
+        Schedule.recurs(120),
+      ]),
     }),
   );
 });

package/src/AWS/EKS/Cluster.ts

@@ -163,9 +163,10 @@ const normalizeTags = (tags: Record<string, string | undefined> | undefined) =>
 const jsonEqual = (a: unknown, b: unknown) =>
   JSON.stringify(a ?? undefined) === JSON.stringify(b ?? undefined);
 
-const updateRetrySchedule = Schedule.exponential("1 second").pipe(
-  Schedule.both(Schedule.recurs(120)),
-);
+const updateRetrySchedule = Schedule.max([
+  Schedule.exponential("1 second"),
+  Schedule.recurs(120),
+]);
 
 const getKubernetesConnection = (
   state: Pick<

package/src/AWS/ELBv2/TargetGroup.ts

@@ -399,9 +399,10 @@ export const TargetGroupProvider = () =>
             .pipe(
               Effect.retry({
                 while: (e) => e._tag === "ResourceInUseException",
-                schedule: Schedule.spaced("3 seconds").pipe(
-                  Schedule.both(Schedule.recurs(8)),
-                ),
+                schedule: Schedule.max([
+                  Schedule.spaced("3 seconds"),
+                  Schedule.recurs(8),
+                ]),
               }),
               Effect.catchTag("ResourceInUseException", () => Effect.void),
             );

package/src/AWS/ELBv2/TrustStore.ts

@@ -264,9 +264,10 @@ export const TrustStoreProvider = () =>
               // eventual-consistency window.
               Effect.retry({
                 while: (e) => e._tag === "TrustStoreInUseException",
-                schedule: Schedule.spaced("3 seconds").pipe(
-                  Schedule.both(Schedule.recurs(8)),
-                ),
+                schedule: Schedule.max([
+                  Schedule.spaced("3 seconds"),
+                  Schedule.recurs(8),
+                ]),
               }),
               Effect.catchTag("TrustStoreNotFoundException", () => Effect.void),
               Effect.catchTag("TrustStoreInUseException", () => Effect.void),

package/src/AWS/IAM/OpenIDConnectProvider.ts

@@ -147,7 +147,15 @@ export const OpenIDConnectProviderProvider = () =>
         read: Effect.fn(function* ({ olds, output }) {
           const providerArn =
             output?.openIDConnectProviderArn ??
-            (yield* oidcArnFromUrl(olds.url));
+            (olds?.url !== undefined
+              ? yield* oidcArnFromUrl(olds.url)
+              : undefined);
+          if (providerArn === undefined) {
+            // An Output-valued `url` doesn't survive a `creating`-state
+            // round-trip (it deserializes as `undefined`) — report "not
+            // found" so the engine re-drives the create.
+            return undefined;
+          }
           const provider = yield* readProvider(providerArn);
           if (!provider?.Url) {
             return undefined;

package/src/AWS/IAM/SAMLProvider.ts

@@ -71,10 +71,10 @@ export const SAMLProvider = Resource<SAMLProvider>("AWS.IAM.SAMLProvider");
 // until the prior delete settles. A bounded retry rides out that window; a
 // well-formed metadata document never fails persistently, so this never masks a
 // genuine bad-input error for longer than the small budget.
-const transientWriteSchedule = Schedule.exponential(500).pipe(
-  Schedule.jittered,
-  Schedule.both(Schedule.recurs(6)),
-);
+const transientWriteSchedule = Schedule.max([
+  Schedule.exponential(500).pipe(Schedule.jittered),
+  Schedule.recurs(6),
+]);
 const isTransientWriteError = (error: {
   _tag: "ValidationError" | "ConcurrentModificationException" | (string & {});
 }) =>

package/src/AWS/IdentityCenter/AccountAssignment.ts

@@ -384,9 +384,10 @@ const waitForAssignmentCreation = (instanceArn: string, requestId: string) =>
   }).pipe(
     Effect.retry({
       while: (error: any) => error?._tag === "AssignmentCreationInProgress",
-      schedule: Schedule.spaced("2 seconds").pipe(
-        Schedule.both(Schedule.recurs(120)),
-      ),
+      schedule: Schedule.max([
+        Schedule.spaced("2 seconds"),
+        Schedule.recurs(120),
+      ]),
     }),
   );
 
@@ -418,8 +419,9 @@ const waitForAssignmentDeletion = (instanceArn: string, requestId: string) =>
   }).pipe(
     Effect.retry({
       while: (error: any) => error?._tag === "AssignmentDeletionInProgress",
-      schedule: Schedule.spaced("2 seconds").pipe(
-        Schedule.both(Schedule.recurs(120)),
-      ),
+      schedule: Schedule.max([
+        Schedule.spaced("2 seconds"),
+        Schedule.recurs(120),
+      ]),
     }),
   );

package/src/AWS/IdentityCenter/common.ts

@@ -11,9 +11,7 @@ export const retryIdentityCenter = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
         error?._tag === "ConflictException" ||
         error?._tag === "ThrottlingException" ||
         error?._tag === "InternalServerException",
-      schedule: Schedule.exponential(200).pipe(
-        Schedule.both(Schedule.recurs(8)),
-      ),
+      schedule: Schedule.max([Schedule.exponential(200), Schedule.recurs(8)]),
     }),
   );
 

package/src/AWS/KMS/Alias.ts

@@ -213,6 +213,7 @@ const isKmsEventuallyConsistent = (error: { _tag: string }) =>
   error._tag === "KMSInvalidStateException" ||
   error._tag === "NotFoundException";
 
-const kmsRetrySchedule = Schedule.exponential(250).pipe(
-  Schedule.both(Schedule.recurs(7)),
-);
+const kmsRetrySchedule = Schedule.max([
+  Schedule.exponential(250),
+  Schedule.recurs(7),
+]);

package/src/AWS/KMS/Key.ts

@@ -586,6 +586,7 @@ class KmsKeyNotConverged extends Error {
   readonly _tag = "KmsKeyNotConverged";
 }
 
-const kmsRetrySchedule = Schedule.exponential(250).pipe(
-  Schedule.both(Schedule.recurs(7)),
-);
+const kmsRetrySchedule = Schedule.max([
+  Schedule.exponential(250),
+  Schedule.recurs(7),
+]);

package/src/AWS/Kinesis/Stream.ts

@@ -414,9 +414,7 @@ const waitForStreamActive = (streamName: string) =>
     Effect.retry({
       while: (e: { _tag: string }) =>
         e._tag === "StreamNotActive" || e._tag === "ParseError",
-      schedule: Schedule.exponential(500).pipe(
-        Schedule.both(Schedule.recurs(60)),
-      ),
+      schedule: Schedule.max([Schedule.exponential(500), Schedule.recurs(60)]),
     }),
   );
 
@@ -430,9 +428,7 @@ const waitForStreamDeleted = (streamName: string) =>
     Effect.retry({
       while: (e: { _tag: string }) =>
         e._tag === "StreamStillExists" || e._tag === "ParseError",
-      schedule: Schedule.exponential(500).pipe(
-        Schedule.both(Schedule.recurs(60)),
-      ),
+      schedule: Schedule.max([Schedule.exponential(500), Schedule.recurs(60)]),
     }),
     Effect.catchTag("ResourceNotFoundException", () => Effect.void),
   );