alchemy 2.0.0-beta.30 → 2.0.0-beta.32

package/lib/AWS/ECR/Repository.js

@@ -1,5 +1,6 @@
 import * as ecr from "@distilled.cloud/aws/ecr";
 import * as Effect from "effect/Effect";
+import { Unowned } from "../../AdoptPolicy.js";
 import { isResolved } from "../../Diff.js";
 import { createPhysicalName } from "../../PhysicalName.js";
 import * as Provider from "../../Provider.js";
@@ -51,7 +52,10 @@ export const RepositoryProvider = () => Provider.effect(Repository, Effect.gen(f
             if (!repository?.repositoryArn || !repository.repositoryUri) {
                 return undefined;
             }
-            return {
+            const listedTags = yield* ecr.listTagsForResource({
+                resourceArn: repository.repositoryArn,
+            });
+            const attrs = {
                 repositoryName,
                 repositoryArn: repository.repositoryArn,
                 repositoryUri: repository.repositoryUri,
@@ -62,96 +66,89 @@ export const RepositoryProvider = () => Provider.effect(Repository, Effect.gen(f
                 lifecyclePolicyText: output?.lifecyclePolicyText,
                 tags: output?.tags ?? {},
             };
+            return (yield* hasAlchemyTags(id, listedTags.tags ?? []))
+                ? attrs
+                : Unowned(attrs);
         }),
-        create: Effect.fn(function* ({ id, news, session }) {
+        reconcile: Effect.fn(function* ({ id, news, session }) {
             const repositoryName = yield* toRepositoryName(id, news);
-            const tags = {
-                ...(yield* createInternalTags(id)),
-                ...news.tags,
-            };
-            const created = yield* ecr
-                .createRepository({
-                repositoryName,
-                imageTagMutability: news.imageTagMutability,
-                imageScanningConfiguration: news.scanOnPush
-                    ? { scanOnPush: true }
-                    : undefined,
-                tags: Object.entries(tags).map(([Key, Value]) => ({
-                    Key,
-                    Value,
-                })),
+            const internalTags = yield* createInternalTags(id);
+            const desiredTags = { ...internalTags, ...news.tags };
+            // Observe — fetch live cloud state. We never trust prior `output`
+            // blindly: the repository may have been deleted out-of-band.
+            let described = yield* ecr
+                .describeRepositories({
+                repositoryNames: [repositoryName],
             })
-                .pipe(Effect.catchTag("RepositoryAlreadyExistsException", () => Effect.gen(function* () {
-                const existing = yield* ecr.describeRepositories({
+                .pipe(Effect.catchTag("RepositoryNotFoundException", () => Effect.succeed(undefined)));
+            let repository = described?.repositories?.[0];
+            // Ensure — create the repository if missing. Tolerate
+            // `RepositoryAlreadyExistsException` as a race with a peer
+            // reconciler: re-describe and continue with the sync path.
+            if (!repository?.repositoryArn || !repository.repositoryUri) {
+                const created = yield* ecr
+                    .createRepository({
+                    repositoryName,
+                    imageTagMutability: news.imageTagMutability,
+                    imageScanningConfiguration: news.scanOnPush
+                        ? { scanOnPush: true }
+                        : undefined,
+                    tags: Object.entries(desiredTags).map(([Key, Value]) => ({
+                        Key,
+                        Value,
+                    })),
+                })
+                    .pipe(Effect.catchTag("RepositoryAlreadyExistsException", () => ecr
+                    .describeRepositories({
                     repositoryNames: [repositoryName],
-                });
-                const repo = existing.repositories?.[0];
-                if (!repo?.repositoryArn) {
-                    return yield* Effect.fail(new Error(`Repository '${repositoryName}' already exists`));
-                }
-                const listedTags = yield* ecr.listTagsForResource({
-                    resourceArn: repo.repositoryArn,
-                });
-                if (!(yield* hasAlchemyTags(id, listedTags.tags ?? []))) {
-                    return yield* Effect.fail(new Error(`Repository '${repositoryName}' already exists and is not managed by alchemy`));
+                })
+                    .pipe(Effect.map((res) => ({
+                    repository: res.repositories?.[0],
+                })))));
+                repository = created.repository;
+                if (!repository?.repositoryArn || !repository.repositoryUri) {
+                    return yield* Effect.fail(new Error(`Failed to create or read repository ${repositoryName}`));
                 }
-                return {
-                    repository: repo,
-                };
-            })));
+            }
+            const repositoryArn = repository.repositoryArn;
+            // Sync lifecycle policy — observed ↔ desired.
             if (news.lifecyclePolicyText) {
                 yield* ecr.putLifecyclePolicy({
                     repositoryName,
                     lifecyclePolicyText: news.lifecyclePolicyText,
                 });
             }
-            const repository = created.repository;
-            yield* session.note(repository.repositoryArn);
-            return {
-                repositoryName,
-                repositoryArn: repository.repositoryArn,
-                repositoryUri: repository.repositoryUri,
-                registryId: repository.registryId,
-                imageTagMutability: news.imageTagMutability ?? "MUTABLE",
-                lifecyclePolicyText: news.lifecyclePolicyText,
-                tags,
-            };
-        }),
-        update: Effect.fn(function* ({ id, news, olds, output, session }) {
-            if (news.lifecyclePolicyText !== undefined &&
-                news.lifecyclePolicyText !== olds.lifecyclePolicyText) {
-                yield* ecr.putLifecyclePolicy({
-                    repositoryName: output.repositoryName,
-                    lifecyclePolicyText: news.lifecyclePolicyText,
-                });
-            }
-            const oldTags = {
-                ...(yield* createInternalTags(id)),
-                ...olds.tags,
-            };
-            const newTags = {
-                ...(yield* createInternalTags(id)),
-                ...news.tags,
-            };
-            const { removed, upsert } = diffTags(oldTags, newTags);
+            // Sync tags — diff observed cloud tags against desired.
+            const listedTags = yield* ecr.listTagsForResource({
+                resourceArn: repositoryArn,
+            });
+            const observedTags = Object.fromEntries((listedTags.tags ?? [])
+                .filter((t) => typeof t.Key === "string" && typeof t.Value === "string")
+                .map((t) => [t.Key, t.Value]));
+            const { removed, upsert } = diffTags(observedTags, desiredTags);
             if (upsert.length > 0) {
                 yield* ecr.tagResource({
-                    resourceArn: output.repositoryArn,
+                    resourceArn: repositoryArn,
                     tags: upsert,
                 });
             }
             if (removed.length > 0) {
                 yield* ecr.untagResource({
-                    resourceArn: output.repositoryArn,
+                    resourceArn: repositoryArn,
                     tagKeys: removed,
                 });
             }
-            yield* session.note(output.repositoryArn);
+            yield* session.note(repositoryArn);
             return {
-                ...output,
-                imageTagMutability: news.imageTagMutability ?? output.imageTagMutability,
+                repositoryName,
+                repositoryArn,
+                repositoryUri: repository.repositoryUri,
+                registryId: repository.registryId,
+                imageTagMutability: news.imageTagMutability ??
+                    repository.imageTagMutability ??
+                    "MUTABLE",
                 lifecyclePolicyText: news.lifecyclePolicyText,
-                tags: newTags,
+                tags: desiredTags,
             };
         }),
         delete: Effect.fn(function* ({ output }) {

package/lib/AWS/ECR/Repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"Repository.js","sourceRoot":"","sources":["../../../src/AWS/ECR/Repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Repository.js","sourceRoot":"","sources":["../../../src/AWS/ECR/Repository.ts"],"names":[],"mappings":"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"}

package/lib/AWS/ECS/CapacityProvider.d.ts

@@ -87,6 +87,10 @@ export interface CapacityProvider extends Resource<"AWS.ECS.CapacityProvider", C
  * ```
  *
  * @section Adopting Existing Capacity Providers
+ * Foreign-tagged capacity providers (i.e. providers that exist in AWS but were
+ * not created by this stack/stage/logical-id) are surfaced as `Unowned` by
+ * `read`, and the engine fails with `OwnedBySomeoneElse` unless adoption is
+ * explicitly opted in via `--adopt` or {@link adopt}.
  * @example Adopt an existing provider
  * ```typescript
  * import { adopt } from "alchemy/AdoptPolicy";

package/lib/AWS/ECS/CapacityProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CapacityProvider.d.ts","sourceRoot":"","sources":["../../../src/AWS/ECS/CapacityProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAKrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAC1C,MAAM,MAAM,mBAAmB,GAC7B,eAAe,QAAQ,IAAI,SAAS,sBAAsB,oBAAoB,EAAE,CAAC;AAEnF,MAAM,WAAW,qBAAqB;IACpC;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,mBAAmB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC;;OAEG;IACH,cAAc,CAAC,EAAE,GAAG,CAAC,cAAc,CAAC;IACpC;;;OAGG;IACH,4BAA4B,CAAC,EAAE,GAAG,CAAC,4BAA4B,CAAC;IAChE;;;OAGG;IACH,eAAe,CAAC,EAAE,GAAG,CAAC,eAAe,CAAC;IACtC;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,gBAAiB,SAAQ,QAAQ,CAChD,0BAA0B,EAC1B,qBAAqB,EACrB;IACE,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,MAAM,EAAE,GAAG,CAAC,sBAAsB,CAAC;IACnC,YAAY,EAAE,GAAG,CAAC,4BAA4B,GAAG,SAAS,CAAC;IAC3D,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,GAAG,CAAC,cAAc,GAAG,SAAS,CAAC;IAC/C,4BAA4B,EAAE,GAAG,CAAC,4BAA4B,GAAG,SAAS,CAAC;IAC3E,eAAe,EAAE,GAAG,CAAC,eAAe,GAAG,SAAS,CAAC;IACjD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B,EACD,KAAK,EACL,SAAS,CACV;CAAG;AAEJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,eAAO,MAAM,gBAAgB,6DAE5B,CAAC;AAEF,eAAO,MAAM,wBAAwB,2RA2NlC,CAAC"}
+{"version":3,"file":"CapacityProvider.d.ts","sourceRoot":"","sources":["../../../src/AWS/ECS/CapacityProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAIrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAC1C,MAAM,MAAM,mBAAmB,GAC7B,eAAe,QAAQ,IAAI,SAAS,sBAAsB,oBAAoB,EAAE,CAAC;AAEnF,MAAM,WAAW,qBAAqB;IACpC;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,mBAAmB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC;;OAEG;IACH,cAAc,CAAC,EAAE,GAAG,CAAC,cAAc,CAAC;IACpC;;;OAGG;IACH,4BAA4B,CAAC,EAAE,GAAG,CAAC,4BAA4B,CAAC;IAChE;;;OAGG;IACH,eAAe,CAAC,EAAE,GAAG,CAAC,eAAe,CAAC;IACtC;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,gBAAiB,SAAQ,QAAQ,CAChD,0BAA0B,EAC1B,qBAAqB,EACrB;IACE,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,MAAM,EAAE,GAAG,CAAC,sBAAsB,CAAC;IACnC,YAAY,EAAE,GAAG,CAAC,4BAA4B,GAAG,SAAS,CAAC;IAC3D,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,GAAG,CAAC,cAAc,GAAG,SAAS,CAAC;IAC/C,4BAA4B,EAAE,GAAG,CAAC,4BAA4B,GAAG,SAAS,CAAC;IAC3E,eAAe,EAAE,GAAG,CAAC,eAAe,GAAG,SAAS,CAAC;IACjD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B,EACD,KAAK,EACL,SAAS,CACV;CAAG;AAEJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH,eAAO,MAAM,gBAAgB,6DAE5B,CAAC;AAEF,eAAO,MAAM,wBAAwB,2RAsLlC,CAAC"}

package/lib/AWS/ECS/CapacityProvider.js

@@ -1,8 +1,7 @@
 import * as ecs from "@distilled.cloud/aws/ecs";
 import { Region } from "@distilled.cloud/aws/Region";
 import * as Effect from "effect/Effect";
-import * as Option from "effect/Option";
-import { AdoptPolicy } from "../../AdoptPolicy.js";
+import { Unowned } from "../../AdoptPolicy.js";
 import { isResolved } from "../../Diff.js";
 import { createPhysicalName } from "../../PhysicalName.js";
 import * as Provider from "../../Provider.js";
@@ -43,6 +42,10 @@ import { AWSEnvironment } from "../Environment.js";
  * ```
  *
  * @section Adopting Existing Capacity Providers
+ * Foreign-tagged capacity providers (i.e. providers that exist in AWS but were
+ * not created by this stack/stage/logical-id) are surfaced as `Unowned` by
+ * `read`, and the engine fails with `OwnedBySomeoneElse` unless adoption is
+ * explicitly opted in via `--adopt` or {@link adopt}.
  * @example Adopt an existing provider
  * ```typescript
  * import { adopt } from "alchemy/AdoptPolicy";
@@ -55,7 +58,6 @@ import { AWSEnvironment } from "../Environment.js";
  */
 export const CapacityProvider = Resource("AWS.ECS.CapacityProvider");
 export const CapacityProviderProvider = () => Provider.effect(CapacityProvider, Effect.gen(function* () {
-    const adoptPolicy = yield* Effect.serviceOption(AdoptPolicy).pipe(Effect.map(Option.getOrElse(() => false)));
     const toEcsTags = (tags) => Object.entries(tags).map(([key, value]) => ({ key, value }));
     const fromEcsTags = (tags) => Object.fromEntries((tags ?? [])
         .filter((t) => t.key !== undefined && t.value !== undefined)
@@ -90,7 +92,9 @@ export const CapacityProviderProvider = () => Provider.effect(CapacityProvider,
             if (!found?.name || !found.capacityProviderArn) {
                 return undefined;
             }
-            return {
+            const internalTags = yield* createInternalTags(id);
+            const existingTags = fromEcsTags(found.tags);
+            const attrs = {
                 capacityProviderArn: found.capacityProviderArn,
                 name: found.name,
                 status: (found.status ?? "ACTIVE"),
@@ -99,111 +103,86 @@ export const CapacityProviderProvider = () => Provider.effect(CapacityProvider,
                 managedScaling: found.autoScalingGroupProvider?.managedScaling,
                 managedTerminationProtection: found.autoScalingGroupProvider?.managedTerminationProtection,
                 managedDraining: found.autoScalingGroupProvider?.managedDraining,
-                tags: fromEcsTags(found.tags),
+                tags: existingTags,
             };
+            return hasTags(internalTags, existingTags) ? attrs : Unowned(attrs);
         }),
-        create: Effect.fn(function* ({ id, news, session }) {
+        reconcile: Effect.fn(function* ({ id, news, session }) {
             const region = yield* Region;
             const { accountId } = yield* AWSEnvironment;
             const name = yield* toName(id, news);
             const internalTags = yield* createInternalTags(id);
-            const tags = { ...internalTags, ...news.tags };
-            const existing = yield* describe(name);
-            if (existing?.name && existing.capacityProviderArn) {
-                // The provider already exists. Only adopt when AdoptPolicy is true.
-                if (!adoptPolicy) {
-                    return yield* Effect.die(new Error(`ECS capacity provider "${name}" already exists. ` +
-                        `Provide adopt() on the resource or stack to adopt it.`));
-                }
-                yield* session.note(`Adopting existing ECS capacity provider ${name}`);
-                // If we own it (tags match), leave tags as-is. Otherwise apply
-                // our internal tags so future operations can identify ownership.
-                if (!hasTags(internalTags, fromEcsTags(existing.tags))) {
-                    yield* ecs.tagResource({
-                        resourceArn: existing.capacityProviderArn,
-                        tags: toEcsTags(tags),
-                    });
-                }
-                return {
-                    capacityProviderArn: existing.capacityProviderArn,
-                    name: existing.name,
-                    status: (existing.status ??
-                        "ACTIVE"),
-                    updateStatus: existing.updateStatus,
-                    autoScalingGroupArn: existing.autoScalingGroupProvider?.autoScalingGroupArn ?? "",
-                    managedScaling: existing.autoScalingGroupProvider?.managedScaling,
-                    managedTerminationProtection: existing.autoScalingGroupProvider?.managedTerminationProtection,
-                    managedDraining: existing.autoScalingGroupProvider?.managedDraining,
-                    tags: { ...fromEcsTags(existing.tags), ...tags },
-                };
-            }
+            const desiredTags = { ...internalTags, ...news.tags };
             const autoScalingGroupArn = news.autoScalingGroupArn;
-            const created = yield* ecs.createCapacityProvider({
-                name,
-                autoScalingGroupProvider: {
-                    autoScalingGroupArn,
-                    managedScaling: news.managedScaling,
-                    managedTerminationProtection: news.managedTerminationProtection,
-                    managedDraining: news.managedDraining,
-                },
-                tags: toEcsTags(tags),
-            });
-            const provider = created.capacityProvider;
-            const capacityProviderArn = (provider?.capacityProviderArn ??
+            // Observe — fetch live cloud state. We fetch fresh on every
+            // reconcile so adoption, drift, and partial-prior-runs all
+            // converge.
+            let existing = yield* describe(name);
+            // Ensure — create the capacity provider if missing.
+            if (!existing?.name || !existing.capacityProviderArn) {
+                yield* ecs
+                    .createCapacityProvider({
+                    name,
+                    autoScalingGroupProvider: {
+                        autoScalingGroupArn,
+                        managedScaling: news.managedScaling,
+                        managedTerminationProtection: news.managedTerminationProtection,
+                        managedDraining: news.managedDraining,
+                    },
+                    tags: toEcsTags(desiredTags),
+                })
+                    .pipe(
+                // ECS may surface concurrent creation either as
+                // `LimitExceededException` or a generic `ClientException`
+                // with name conflict semantics — re-describe and continue.
+                Effect.catchTag("LimitExceededException", () => Effect.void));
+                existing = yield* describe(name);
+            }
+            const capacityProviderArn = (existing?.capacityProviderArn ??
                 `arn:aws:ecs:${region}:${accountId}:capacity-provider/${name}`);
-            yield* session.note(capacityProviderArn);
-            return {
-                capacityProviderArn,
-                name,
-                status: (provider?.status ??
-                    "ACTIVE"),
-                updateStatus: provider?.updateStatus,
-                autoScalingGroupArn,
-                managedScaling: news.managedScaling,
-                managedTerminationProtection: news.managedTerminationProtection,
-                managedDraining: news.managedDraining,
-                tags,
-            };
-        }),
-        update: Effect.fn(function* ({ id, news, olds, output, session }) {
-            const internalTags = yield* createInternalTags(id);
-            const newTags = { ...internalTags, ...news.tags };
-            const oldTags = { ...internalTags, ...olds.tags };
+            // Sync managed scaling — observed ↔ desired. ECS
+            // updateCapacityProvider only mutates managed* fields; ASG ARN is
+            // immutable (replacement-triggering, handled in diff).
             yield* ecs.updateCapacityProvider({
-                name: output.name,
+                name,
                 autoScalingGroupProvider: {
                     managedScaling: news.managedScaling,
                     managedTerminationProtection: news.managedTerminationProtection,
                     managedDraining: news.managedDraining,
                 },
             });
-            const { removed, upsert } = diffTags(oldTags, newTags);
+            // Sync tags — diff observed cloud tags against desired.
+            const observedTags = fromEcsTags(existing?.tags);
+            const { removed, upsert } = diffTags(observedTags, desiredTags);
             if (upsert.length > 0) {
                 yield* ecs.tagResource({
-                    resourceArn: output.capacityProviderArn,
+                    resourceArn: capacityProviderArn,
                     tags: upsert.map((t) => ({ key: t.Key, value: t.Value })),
                 });
             }
             if (removed.length > 0) {
                 yield* ecs.untagResource({
-                    resourceArn: output.capacityProviderArn,
+                    resourceArn: capacityProviderArn,
                     tagKeys: removed,
                 });
             }
-            const found = yield* describe(output.name);
-            yield* session.note(output.capacityProviderArn);
+            // Re-read to capture status / updateStatus reflecting our changes.
+            const found = yield* describe(name);
+            yield* session.note(capacityProviderArn);
             return {
-                ...output,
-                status: (found?.status ??
-                    output.status),
-                updateStatus: found?.updateStatus ?? output.updateStatus,
+                capacityProviderArn,
+                name,
+                status: (found?.status ?? "ACTIVE"),
+                updateStatus: found?.updateStatus,
+                autoScalingGroupArn: found?.autoScalingGroupProvider?.autoScalingGroupArn ??
+                    autoScalingGroupArn,
                 managedScaling: found?.autoScalingGroupProvider?.managedScaling ??
                     news.managedScaling,
                 managedTerminationProtection: found?.autoScalingGroupProvider?.managedTerminationProtection ??
                     news.managedTerminationProtection,
                 managedDraining: found?.autoScalingGroupProvider?.managedDraining ??
                     news.managedDraining,
-                tags: newTags,
+                tags: desiredTags,
             };
         }),
         delete: Effect.fn(function* ({ output }) {

package/lib/AWS/ECS/CapacityProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"CapacityProvider.js","sourceRoot":"","sources":["../../../src/AWS/ECS/CapacityProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CapacityProvider.js","sourceRoot":"","sources":["../../../src/AWS/ECS/CapacityProvider.ts"],"names":[],"mappings":"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"}

package/lib/AWS/ECS/Cluster.js

@@ -71,82 +71,73 @@ export const ClusterProvider = () => Provider.effect(Cluster, Effect.gen(functio
                 tags: output?.tags ?? {},
             };
         }),
-        create: Effect.fn(function* ({ id, news, session }) {
+        reconcile: Effect.fn(function* ({ id, news, session }) {
             const clusterName = yield* toClusterName(id, news);
-            const tags = {
-                ...(yield* createInternalTags(id)),
-                ...news.tags,
-            };
-            const created = yield* ecs.createCluster({
-                clusterName,
-                settings: news.settings,
-                configuration: news.configuration,
-                serviceConnectDefaults: news.serviceConnectDefaults,
-                tags: toEcsTags(tags),
-            });
-            yield* applyCapacityProviders({
-                cluster: clusterName,
-                capacityProviders: news.capacityProviders,
-                defaultCapacityProviderStrategy: news.defaultCapacityProviderStrategy,
+            const clusterArn = `arn:aws:ecs:${region}:${accountId}:cluster/${clusterName}`;
+            const internalTags = yield* createInternalTags(id);
+            const desiredTags = { ...internalTags, ...news.tags };
+            // Observe — fetch live cloud state.
+            let described = yield* ecs.describeClusters({
+                clusters: [clusterArn],
+                include: ["SETTINGS", "TAGS", "CONFIGURATIONS"],
             });
-            const cluster = created.cluster;
-            const clusterArn = (cluster?.clusterArn ??
-                `arn:aws:ecs:${region}:${accountId}:cluster/${clusterName}`);
-            yield* session.note(clusterArn);
-            return {
-                clusterArn,
-                clusterName,
-                status: cluster?.status ?? "ACTIVE",
-                settings: news.settings ?? [],
-                configuration: news.configuration,
-                capacityProviders: news.capacityProviders ?? [],
-                defaultCapacityProviderStrategy: news.defaultCapacityProviderStrategy ?? [],
-                serviceConnectDefaults: news.serviceConnectDefaults,
-                tags,
-            };
-        }),
-        update: Effect.fn(function* ({ id, news, olds, output, session }) {
+            let cluster = described.clusters?.find((c) => c.clusterName === clusterName &&
+                (c.status === "ACTIVE" || c.status === "PROVISIONING"));
+            // Ensure — create if missing. ECS createCluster is idempotent for
+            // identical params and returns the existing cluster on conflict;
+            // we always sync below regardless.
+            if (!cluster?.clusterArn) {
+                const created = yield* ecs.createCluster({
+                    clusterName,
+                    settings: news.settings,
+                    configuration: news.configuration,
+                    serviceConnectDefaults: news.serviceConnectDefaults,
+                    tags: toEcsTags(desiredTags),
+                });
+                cluster = created.cluster;
+            }
+            // Sync cluster config — call updateCluster to converge settings,
+            // configuration, and serviceConnectDefaults to desired state.
             yield* ecs.updateCluster({
-                cluster: output.clusterArn,
+                cluster: clusterArn,
                 settings: news.settings,
                 configuration: news.configuration,
                 serviceConnectDefaults: news.serviceConnectDefaults,
             });
+            // Sync capacity providers — observed ↔ desired.
             yield* applyCapacityProviders({
-                cluster: output.clusterArn,
+                cluster: clusterArn,
                 capacityProviders: news.capacityProviders,
                 defaultCapacityProviderStrategy: news.defaultCapacityProviderStrategy,
             });
-            const oldTags = {
-                ...(yield* createInternalTags(id)),
-                ...olds.tags,
-            };
-            const newTags = {
-                ...(yield* createInternalTags(id)),
-                ...news.tags,
-            };
-            const { removed, upsert } = diffTags(oldTags, newTags);
+            // Sync tags — diff observed cloud tags against desired.
+            const observedTags = Object.fromEntries((cluster?.tags ?? [])
+                .filter((t) => typeof t.key === "string" && typeof t.value === "string")
+                .map((t) => [t.key, t.value]));
+            const { removed, upsert } = diffTags(observedTags, desiredTags);
             if (upsert.length > 0) {
                 yield* ecs.tagResource({
-                    resourceArn: output.clusterArn,
+                    resourceArn: clusterArn,
                     tags: upsert.map((tag) => ({ key: tag.Key, value: tag.Value })),
                 });
             }
             if (removed.length > 0) {
                 yield* ecs.untagResource({
-                    resourceArn: output.clusterArn,
+                    resourceArn: clusterArn,
                     tagKeys: removed,
                 });
             }
-            yield* session.note(output.clusterArn);
+            yield* session.note(clusterArn);
             return {
-                ...output,
+                clusterArn,
+                clusterName,
+                status: cluster?.status ?? "ACTIVE",
                 settings: news.settings ?? [],
                 configuration: news.configuration,
                 capacityProviders: news.capacityProviders ?? [],
                 defaultCapacityProviderStrategy: news.defaultCapacityProviderStrategy ?? [],
                 serviceConnectDefaults: news.serviceConnectDefaults,
-                tags: newTags,
+                tags: desiredTags,
             };
         }),
         delete: Effect.fn(function* ({ output }) {