@awsless/cli 0.1.3 → 0.1.4

package/dist/bin.js

@@ -108480,6 +108480,10 @@ var format = (parts) => {
     if (part instanceof Error) {
       return part.stack ?? part.message;
     }
+    if (Array.isArray(part)) {
+      return part.map((entry) => format([entry])).join(`
+`);
+    }
     return JSON.stringify(part);
   }).join(" ");
 };
@@ -128397,7 +128401,7 @@ import {
   UpdateKeysCommand
 } from "@aws-sdk/client-cloudfront-keyvaluestore";
 
-// ../../node_modules/.pnpm/@terraforge+core@0.0.43_aws-crt@1.30.0_debug@4.4.3_supports-color@8.1.1__supports-color@8.1.1__graphology-types@0.24.8/node_modules/@terraforge/core/dist/index.mjs
+// ../../node_modules/.pnpm/@terraforge+core@0.0.44_aws-crt@1.30.0_debug@4.4.3_supports-color@8.1.1__supports-color@8.1.1__graphology-types@0.24.8/node_modules/@terraforge/core/dist/index.mjs
 var import_async_on_exit = __toESM(require_async_on_exit(), 1);
 
 // ../../node_modules/.pnpm/p-limit@6.2.0/node_modules/p-limit/index.js
@@ -131734,7 +131738,7 @@ var getter = (options = {}) => {
 };
 var get = getter();
 
-// ../../node_modules/.pnpm/@terraforge+core@0.0.43_aws-crt@1.30.0_debug@4.4.3_supports-color@8.1.1__supports-color@8.1.1__graphology-types@0.24.8/node_modules/@terraforge/core/dist/index.mjs
+// ../../node_modules/.pnpm/@terraforge+core@0.0.44_aws-crt@1.30.0_debug@4.4.3_supports-color@8.1.1__supports-color@8.1.1__graphology-types@0.24.8/node_modules/@terraforge/core/dist/index.mjs
 import { appendFile, mkdir, readFile as readFile4, rename, rm, writeFile as writeFile2 } from "fs/promises";
 var import_proper_lockfile = __toESM(require_proper_lockfile(), 1);
 import { DynamoDB } from "@aws-sdk/client-dynamodb";
@@ -132007,7 +132011,7 @@ var unmarshall = (data, options) => {
   return convertToNative({ M: data }, options);
 };
 
-// ../../node_modules/.pnpm/@terraforge+core@0.0.43_aws-crt@1.30.0_debug@4.4.3_supports-color@8.1.1__supports-color@8.1.1__graphology-types@0.24.8/node_modules/@terraforge/core/dist/index.mjs
+// ../../node_modules/.pnpm/@terraforge+core@0.0.44_aws-crt@1.30.0_debug@4.4.3_supports-color@8.1.1__supports-color@8.1.1__graphology-types@0.24.8/node_modules/@terraforge/core/dist/index.mjs
 import { createHash as createHash4, randomUUID as randomUUID2 } from "crypto";
 import { DeleteObjectCommand, GetObjectCommand, PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
 var nodeMetaSymbol = Symbol("metadata");
@@ -132025,9 +132029,6 @@ var isDataSource = (obj) => {
   return isNode(obj) && obj[nodeMetaSymbol].tag === "data";
 };
 var Group = class Group2 {
-  parent;
-  type;
-  name;
   children = [];
   constructor(parent, type, name) {
     this.parent = parent;
@@ -132073,7 +132074,6 @@ var Group = class Group2 {
   }
 };
 var Stack = class extends Group {
-  app;
   dependencies = /* @__PURE__ */ new Set;
   constructor(app, name) {
     super(app, "stack", name);
@@ -132088,7 +132088,6 @@ var findParentStack = (group4) => {
   return findParentStack(group4.parent);
 };
 var App = class extends Group {
-  name;
   constructor(name) {
     super(undefined, "app", name);
     this.name = name;
@@ -132102,8 +132101,6 @@ var PENDING = 1;
 var RESOLVED = 2;
 var REJECTED = 3;
 var Future = class Future2 {
-  callback;
-  volatile;
   listeners = /* @__PURE__ */ new Set;
   status = IDLE;
   data;
@@ -132125,28 +132122,28 @@ var Future = class Future2 {
     }
   }
   pipe(cb) {
-    return new Future2((resolve, reject) => {
+    return new Future2((resolve$1, reject) => {
       this.then((value) => {
-        Promise.resolve(cb(value)).then((value2) => {
-          resolve(value2);
+        Promise.resolve(cb(value)).then((value$1) => {
+          resolve$1(value$1);
         }).catch(reject);
       }, reject);
     }, this.volatile);
   }
-  then(resolve, reject) {
+  then(resolve$1, reject) {
     if (this.volatile)
       try {
-        Promise.resolve(this.callback(resolve, (error3) => reject?.(error3))).catch((error3) => reject?.(error3));
+        Promise.resolve(this.callback(resolve$1, (error3) => reject?.(error3))).catch((error3) => reject?.(error3));
       } catch (error3) {
         reject?.(error3);
       }
     else if (this.status === RESOLVED)
-      resolve(this.data);
+      resolve$1(this.data);
     else if (this.status === REJECTED)
       reject?.(this.error);
     else {
       this.listeners.add({
-        resolve,
+        resolve: resolve$1,
         reject
       });
       if (this.status === IDLE) {
@@ -132155,7 +132152,7 @@ var Future = class Future2 {
           if (this.status === PENDING) {
             this.status = RESOLVED;
             this.data = data;
-            this.listeners.forEach(({ resolve: resolve2 }) => resolve2(data));
+            this.listeners.forEach(({ resolve: resolve$2 }) => resolve$2(data));
             this.listeners.clear();
           }
         };
@@ -132163,7 +132160,7 @@ var Future = class Future2 {
           if (this.status === PENDING) {
             this.status = REJECTED;
             this.error = error3;
-            this.listeners.forEach(({ reject: reject2 }) => reject2?.(error3));
+            this.listeners.forEach(({ reject: reject$1 }) => reject$1?.(error3));
             this.listeners.clear();
           }
         };
@@ -132178,13 +132175,13 @@ var Future = class Future2 {
 };
 var findInputDeps = (props) => {
   const deps = [];
-  const find = (props2) => {
-    if (props2 instanceof Output)
-      deps.push(...props2.dependencies);
-    else if (Array.isArray(props2))
-      props2.map(find);
-    else if (props2?.constructor === Object)
-      Object.values(props2).map(find);
+  const find = (props$1) => {
+    if (props$1 instanceof Output)
+      deps.push(...props$1.dependencies);
+    else if (Array.isArray(props$1))
+      props$1.map(find);
+    else if (props$1?.constructor === Object)
+      Object.values(props$1).map(find);
   };
   find(props);
   return deps;
@@ -132207,7 +132204,7 @@ var resolveWithTimeout = async (promise) => {
   }
 };
 var resolveInputs = async (inputs, fallback) => {
-  const resolve = async (value, path) => {
+  const resolve$1 = async (value, path) => {
     if (value instanceof Output || value instanceof Future || value instanceof Promise)
       try {
         return await resolveWithTimeout(value);
@@ -132217,31 +132214,30 @@ var resolveInputs = async (inputs, fallback) => {
         throw error3;
       }
     if (Array.isArray(value))
-      return Promise.all(value.map((item, index) => resolve(item, [...path, index])));
+      return Promise.all(value.map((item, index) => resolve$1(item, [...path, index])));
     if (value?.constructor === Object) {
-      const entries = Object.entries(value);
-      const resolved = await Promise.all(entries.map(([key, item]) => resolve(item, [...path, key])));
+      const entries$1 = Object.entries(value);
+      const resolved = await Promise.all(entries$1.map(([key, item]) => resolve$1(item, [...path, key])));
       const result = {};
-      entries.forEach(([key], i3) => {
+      entries$1.forEach(([key], i3) => {
         result[key] = resolved[i3];
       });
       return result;
     }
     return value;
   };
-  return resolve(inputs, []);
+  return resolve$1(inputs, []);
 };
 var Output = class Output2 extends Future {
-  dependencies;
   constructor(dependencies, callback, volatile = false) {
     super(callback, volatile);
     this.dependencies = dependencies;
   }
   pipe(cb) {
-    return new Output2(this.dependencies, (resolve, reject) => {
+    return new Output2(this.dependencies, (resolve$1, reject) => {
       this.then((value) => {
-        Promise.resolve(cb(value)).then((value2) => {
-          resolve(value2);
+        Promise.resolve(cb(value)).then((value$1) => {
+          resolve$1(value$1);
         }).catch(reject);
       }, reject);
     }, this.volatile);
@@ -132257,9 +132253,9 @@ var hasVolatileInput = (props) => {
   return false;
 };
 var combine = (...inputs) => {
-  return new Output(new Set(findInputDeps(inputs)), (resolve, reject) => {
+  return new Output(new Set(findInputDeps(inputs)), (resolve$1, reject) => {
     Promise.all(inputs).then(resolveInputs).then((result) => {
-      resolve(result);
+      resolve$1(result);
     }, reject);
   }, hasVolatileInput(inputs));
 };
@@ -132283,7 +132279,7 @@ var createUrn = (tag, type, name, parentUrn) => {
 var createMeta = (tag, provider, parent, type, logicalId, input, config) => {
   const urn = createUrn(tag, type, logicalId, parent.urn);
   const stack = findParentStack(parent);
-  let output;
+  let output$1;
   let resolved = false;
   return {
     tag,
@@ -132308,16 +132304,16 @@ var createMeta = (tag, provider, parent, type, logicalId, input, config) => {
       return dependencies;
     },
     resolve(data) {
-      output = data;
+      output$1 = data;
       resolved = true;
     },
     output(cb) {
-      return new Output(/* @__PURE__ */ new Set([this]), (resolve2, reject) => {
+      return new Output(new Set([this]), (resolve$1, reject) => {
         if (!resolved) {
           reject(/* @__PURE__ */ new Error(`Unresolved output for ${tag}: ${urn}`));
           return;
         }
-        resolve2(cb(output));
+        resolve$1(cb(output$1));
       }, true);
     }
   };
@@ -132337,7 +132333,6 @@ var createDebugger = (group4) => {
   };
 };
 var AlreadyLockedError = class extends Error {
-  urn;
   constructor(urn) {
     super(`Already locked: ${urn}`);
     this.urn = urn;
@@ -132543,9 +132538,6 @@ var allowsDependentReplace = (replaceOnChanges, dependencyPaths) => {
   return false;
 };
 var ResourceError = class ResourceError2 extends Error {
-  urn;
-  type;
-  operation;
   static wrap(urn, type, operation, error3) {
     if (error3 instanceof Error)
       return new ResourceError2(urn, type, operation, error3.message);
@@ -132559,8 +132551,6 @@ var ResourceError = class ResourceError2 extends Error {
   }
 };
 var AppError = class extends Error {
-  app;
-  issues;
   constructor(app, issues, message4) {
     super(message4);
     this.app = app;
@@ -132589,8 +132579,8 @@ var v1 = (oldAppState) => {
   const stacks = {};
   for (const [urn, stack] of entries(oldAppState.stacks)) {
     const nodes2 = {};
-    for (const [urn2, resource] of entries(stack.resources))
-      nodes2[urn2] = {
+    for (const [urn$1, resource] of entries(stack.resources))
+      nodes2[urn$1] = {
         ...resource,
         tag: "resource"
       };
@@ -132831,6 +132821,8 @@ var importResource = async (resource, input, opt) => {
       }
     });
   } catch (error3) {
+    if (error3 instanceof ResourceNotFound)
+      throw new ResourceNotFound(`The "${meta.type}" resource import "${meta.config?.import}" doesn't exist. (${meta.urn})`);
     throw ResourceError.wrap(meta.urn, meta.type, "import", error3);
   }
   return {
@@ -133012,11 +133004,11 @@ var deployApp = async (app, opt) => {
       });
       const isFilteredIn = !opt.filters?.length || opt.filters.includes(stackState.name);
       if (!found && isFilteredIn)
-        for (const [urn2, nodeState] of entries(stackState.nodes))
-          graph.add(urn2, dependentsOn(allNodes, urn2), async () => {
+        for (const [urn$1, nodeState] of entries(stackState.nodes))
+          graph.add(urn$1, dependentsOn(allNodes, urn$1), async () => {
             if (nodeState.tag === "resource")
-              await queue(() => deleteResource(appState.idempotentToken, urn2, nodeState, opt));
-            delete stackState.nodes[urn2];
+              await queue(() => deleteResource(appState.idempotentToken, urn$1, nodeState, opt));
+            delete stackState.nodes[urn$1];
           });
     }
     for (const stack of stacks) {
@@ -133045,16 +133037,16 @@ var deployApp = async (app, opt) => {
               throw ResourceError.wrap(meta.urn, meta.type, "resolve", error3);
             }
             if (isDataSource(node)) {
-              const meta2 = getMeta(node);
+              const meta$1 = getMeta(node);
               if (!nodeState) {
-                const dataSourceState = await getDataSource(meta2, input, opt);
-                nodeState = stackState.nodes[meta2.urn] = {
+                const dataSourceState = await getDataSource(meta$1, input, opt);
+                nodeState = stackState.nodes[meta$1.urn] = {
                   ...dataSourceState,
                   drifted: undefined,
                   ...partialNewResourceState
                 };
               } else if (!compareState(nodeState.input, input) || nodeState.drifted) {
-                const dataSourceState = await getDataSource(meta2, input, opt);
+                const dataSourceState = await getDataSource(meta$1, input, opt);
                 Object.assign(nodeState, {
                   ...dataSourceState,
                   drifted: undefined,
@@ -133064,78 +133056,87 @@ var deployApp = async (app, opt) => {
                 Object.assign(nodeState, partialNewResourceState);
             }
             if (isResource(node)) {
-              const meta2 = getMeta(node);
-              if (!nodeState)
-                if (meta2.config?.import) {
+              const meta$1 = getMeta(node);
+              if (!nodeState) {
+                if (meta$1.config?.import) {
                   const importedState = await importResource(node, input, opt);
-                  const newResourceState = await updateResource(node, appState.idempotentToken, importedState.input, importedState.output, input, opt);
-                  nodeState = stackState.nodes[meta2.urn] = {
-                    ...importedState,
-                    ...newResourceState,
-                    ...partialNewResourceState
-                  };
-                } else {
+                  if (importedState) {
+                    const newResourceState = await updateResource(node, appState.idempotentToken, importedState.input, importedState.output, input, opt);
+                    nodeState = stackState.nodes[meta$1.urn] = {
+                      ...importedState,
+                      ...newResourceState,
+                      ...partialNewResourceState
+                    };
+                  }
+                }
+                if (!nodeState) {
                   const newResourceState = await createResource(node, appState.idempotentToken, input, opt);
-                  nodeState = stackState.nodes[meta2.urn] = {
+                  nodeState = stackState.nodes[meta$1.urn] = {
                     ...newResourceState,
                     ...partialNewResourceState
                   };
                 }
-              else {
+              } else {
                 const inputChanged = !compareState(nodeState.input, input);
                 const hasDrift = !!nodeState.drifted;
                 if (!inputChanged && !hasDrift)
                   Object.assign(nodeState, partialNewResourceState);
                 else {
                   let newResourceState;
-                  const ignoreReplace = forcedUpdateDependents.has(meta2.urn);
-                  if (!ignoreReplace && requiresReplacement(nodeState.input, input, meta2.config?.replaceOnChanges ?? []))
-                    if (meta2.config?.createBeforeReplace) {
-                      meta2.resolve(input);
+                  const ignoreReplace = forcedUpdateDependents.has(meta$1.urn);
+                  if (!ignoreReplace && requiresReplacement(nodeState.input, input, meta$1.config?.replaceOnChanges ?? []))
+                    if (meta$1.config?.createBeforeReplace) {
+                      meta$1.resolve(input);
                       try {
                         for (const [dependentUrn, dependentNode] of nodeByUrn.entries()) {
                           if (!isResource(dependentNode))
                             continue;
                           const dependentMeta = getMeta(dependentNode);
-                          if (!dependentMeta.dependencies.has(meta2.urn))
+                          if (!dependentMeta.dependencies.has(meta$1.urn))
                             continue;
                           const dependentStackState = stackStates.get(dependentMeta.stack.urn);
                           const dependentState = dependentStackState?.nodes[dependentUrn];
                           if (!dependentStackState || !dependentState)
                             continue;
-                          const dependencyPaths = findDependencyPaths(dependentMeta.input, meta2.urn);
+                          const dependencyPaths = findDependencyPaths(dependentMeta.input, meta$1.urn);
                           if (dependencyPaths.length === 0)
                             continue;
                           const dependentProvider = findProvider(opt.providers, dependentMeta.provider);
                           if (dependentProvider.planResourceChange) {
                             const dependentProposedInput = await resolveInputs(dependentMeta.input, (path) => getAtPath(dependentState.input, path));
-                            if ((await dependentProvider.planResourceChange({
-                              type: dependentMeta.type,
-                              priorState: dependentState.output,
-                              proposedState: dependentProposedInput
-                            })).requiresReplacement) {
+                            let dependentRequiresReplacement;
+                            try {
+                              dependentRequiresReplacement = !!(await dependentProvider.planResourceChange({
+                                type: dependentMeta.type,
+                                priorState: dependentState.output,
+                                proposedState: dependentProposedInput
+                              })).requiresReplacement;
+                            } catch {
+                              dependentRequiresReplacement = true;
+                            }
+                            if (dependentRequiresReplacement) {
                               if (!allowsDependentReplace(dependentMeta.config?.replaceOnChanges, dependencyPaths))
-                                throw ResourceError.wrap(dependentMeta.urn, dependentMeta.type, "update", /* @__PURE__ */ new Error(`Replacing ${meta2.urn} requires ${dependentMeta.urn} to set replaceOnChanges for its dependency fields.`));
+                                throw ResourceError.wrap(dependentMeta.urn, dependentMeta.type, "update", /* @__PURE__ */ new Error(`Replacing ${meta$1.urn} requires ${dependentMeta.urn} to set replaceOnChanges for its dependency fields.`));
                             }
                           }
                         }
                       } finally {
-                        meta2.resolve(nodeState.output);
+                        meta$1.resolve(nodeState.output);
                       }
                       const priorState = { ...nodeState };
                       newResourceState = await createResource(node, appState.idempotentToken, input, opt);
                       if (newResourceState.output)
-                        meta2.resolve(newResourceState.output);
-                      if (!meta2.config?.retainOnDelete) {
+                        meta$1.resolve(newResourceState.output);
+                      if (!meta$1.config?.retainOnDelete) {
                         appState.pendingDeletes ??= {};
-                        appState.pendingDeletes[meta2.urn] = priorState;
+                        appState.pendingDeletes[meta$1.urn] = priorState;
                       }
                     } else {
                       for (const [dependentUrn, dependentNode] of nodeByUrn.entries()) {
                         if (!isResource(dependentNode))
                           continue;
                         const dependentMeta = getMeta(dependentNode);
-                        if (!dependentMeta.dependencies.has(meta2.urn))
+                        if (!dependentMeta.dependencies.has(meta$1.urn))
                           continue;
                         if (plannedDependents.has(dependentUrn))
                           continue;
@@ -133143,10 +133144,10 @@ var deployApp = async (app, opt) => {
                         const dependentState = dependentStackState?.nodes[dependentUrn];
                         if (!dependentStackState || !dependentState)
                           continue;
-                        const dependencyPaths = findDependencyPaths(dependentMeta.input, meta2.urn);
+                        const dependencyPaths = findDependencyPaths(dependentMeta.input, meta$1.urn);
                         if (dependencyPaths.length === 0)
                           continue;
-                        const detachedInput = stripDependencyInputs(dependentState.input, dependentMeta.input, meta2.urn);
+                        const detachedInput = stripDependencyInputs(dependentState.input, dependentMeta.input, meta$1.urn);
                         if (compareState(dependentState.input, detachedInput))
                           continue;
                         plannedDependents.add(dependentUrn);
@@ -133164,7 +133165,7 @@ var deployApp = async (app, opt) => {
                           }
                         if (dependentRequiresReplacement) {
                           if (!allowsDependentReplace(dependentMeta.config?.replaceOnChanges, dependencyPaths))
-                            throw ResourceError.wrap(dependentMeta.urn, dependentMeta.type, "update", /* @__PURE__ */ new Error(`Replacing ${meta2.urn} requires ${dependentMeta.urn} to set replaceOnChanges for its dependency fields.`));
+                            throw ResourceError.wrap(dependentMeta.urn, dependentMeta.type, "update", /* @__PURE__ */ new Error(`Replacing ${meta$1.urn} requires ${dependentMeta.urn} to set replaceOnChanges for its dependency fields.`));
                           await deleteResource(appState.idempotentToken, dependentUrn, dependentState, opt);
                           delete dependentStackState.nodes[dependentUrn];
                         } else {
@@ -133178,12 +133179,12 @@ var deployApp = async (app, opt) => {
                       }
                       newResourceState = await replaceResource(node, appState.idempotentToken, nodeState.input, nodeState.output, input, opt);
                       if (newResourceState.output)
-                        meta2.resolve(newResourceState.output);
+                        meta$1.resolve(newResourceState.output);
                     }
                   else {
                     newResourceState = await updateResource(node, appState.idempotentToken, nodeState.input, nodeState.output, input, opt);
                     if (ignoreReplace)
-                      forcedUpdateDependents.delete(meta2.urn);
+                      forcedUpdateDependents.delete(meta$1.urn);
                   }
                   Object.assign(nodeState, {
                     input,
@@ -133432,7 +133433,6 @@ var status = async (app, opt) => {
   return stacks;
 };
 var WorkSpace = class {
-  props;
   constructor(props) {
     this.props = props;
   }
@@ -133527,7 +133527,6 @@ var isConditionalCheckFailed = (error3) => {
   return error3 instanceof Error && error3.name === "ConditionalCheckFailedException";
 };
 var DynamoLockBackend = class {
-  props;
   client;
   constructor(props) {
     this.props = props;
@@ -133611,7 +133610,6 @@ var DynamoLockBackend = class {
   }
 };
 var S3StateBackend = class {
-  props;
   client;
   constructor(props) {
     this.props = props;
@@ -133649,16 +133647,16 @@ var S3StateBackend = class {
   }
 };
 var file = (path, encoding = "utf8") => {
-  return new Future(async (resolve2, reject) => {
+  return new Future(async (resolve$1, reject) => {
     try {
-      resolve2(await readFile4(path, { encoding }));
+      resolve$1(await readFile4(path, { encoding }));
     } catch (error3) {
       reject(error3);
     }
   });
 };
 var hash = (path, algo = "sha256") => {
-  return file(path).pipe((file2) => createHash4(algo).update(file2).digest("hex"));
+  return file(path).pipe((file$1) => createHash4(algo).update(file$1).digest("hex"));
 };
 globalThis.$resolve = resolve;
 globalThis.$combine = combine;
@@ -133669,7 +133667,7 @@ var createCustomResourceClass = (providerId, resourceType) => {
   return new Proxy(class {
   }, { construct(_3, [parent, id, input, config]) {
     const meta = createMeta("resource", `custom:${providerId}`, parent, resourceType, id, input, config);
-    const node = new Proxy({}, { get(_4, key) {
+    const node = new Proxy({}, { get(_$1, key) {
       if (key === nodeMetaSymbol)
         return meta;
       if (key === "urn")
@@ -133684,68 +133682,67 @@ var createCustomResourceClass = (providerId, resourceType) => {
 };
 var createCustomProvider = (providerId, resourceProviders) => {
   const version2 = 1;
-  const hasRefreshResource = Object.values(resourceProviders).some((provider2) => !!provider2.refreshResource);
+  const hasRefreshResource = Object.values(resourceProviders).some((provider$1) => !!provider$1.refreshResource);
   const getProvider = (type) => {
-    const provider2 = resourceProviders[type];
-    if (!provider2)
+    const provider$1 = resourceProviders[type];
+    if (!provider$1)
       throw new Error(`The "${providerId}" provider doesn't support the "${type}" resource type.`);
-    return provider2;
+    return provider$1;
   };
   const provider = {
     ownResource(id) {
       return id === `custom:${providerId}`;
     },
     async getResource({ type, ...props }) {
-      const provider2 = getProvider(type);
-      if (!provider2.getResource)
+      const provider$1 = getProvider(type);
+      if (!provider$1.getResource)
         return {
           version: version2,
           state: props.state
         };
       return {
         version: version2,
-        state: await provider2.getResource(props)
+        state: await provider$1.getResource(props)
       };
     },
     async createResource({ type, ...props }) {
-      const provider2 = getProvider(type);
-      if (!provider2.createResource)
+      const provider$1 = getProvider(type);
+      if (!provider$1.createResource)
         return {
           version: version2,
           state: props.state
         };
       return {
         version: version2,
-        state: await provider2.createResource(props)
+        state: await provider$1.createResource(props)
       };
     },
     async updateResource({ type, ...props }) {
-      const provider2 = getProvider(type);
-      if (!provider2.updateResource)
+      const provider$1 = getProvider(type);
+      if (!provider$1.updateResource)
         return {
           version: version2,
           state: props.proposedState
         };
       return {
         version: version2,
-        state: await provider2.updateResource(props)
+        state: await provider$1.updateResource(props)
       };
     },
     async deleteResource({ type, ...props }) {
       await getProvider(type).deleteResource?.(props);
     },
     async planResourceChange({ type, ...props }) {
-      const provider2 = getProvider(type);
-      if (!provider2.planResourceChange)
+      const provider$1 = getProvider(type);
+      if (!provider$1.planResourceChange)
         return {
           version: version2,
           state: props.proposedState,
           requiresReplacement: false
         };
-      const result = await provider2.planResourceChange(props);
       return {
         version: version2,
-        ...result
+        ...await provider$1.planResourceChange(props)
       };
     },
     async getData({ type, ...props }) {
@@ -141105,7 +141102,7 @@ if (!nativeAccelerationDisabled) {
   } catch (error3) {}
 }
 
-// ../../node_modules/.pnpm/@terraforge+terraform@0.0.35_@terraforge+core@0.0.43_aws-crt@1.30.0_debug@4.4.3_support_5cbec650153056d375307c2d151398c3/node_modules/@terraforge/terraform/dist/index.mjs
+// ../../node_modules/.pnpm/@terraforge+terraform@0.0.35_@terraforge+core@0.0.44_aws-crt@1.30.0_debug@4.4.3_support_4501f5c353e25a801cf638e931a8dd2d/node_modules/@terraforge/terraform/dist/index.mjs
 var import_grpc_js = __toESM(require_src4(), 1);
 var import_proto_loader = __toESM(require_src3(), 1);
 var import_jszip = __toESM(require_lib3(), 1);
@@ -143616,7 +143613,7 @@ var createTerraformProxy = (props) => {
   });
 };
 
-// ../../node_modules/.pnpm/@terraforge+aws@6.53.0_@terraforge+core@0.0.43_aws-crt@1.30.0_debug@4.4.3_supports-colo_8ae6ada9f1b5b5808a0d42265f99939f/node_modules/@terraforge/aws/dist/index.js
+// ../../node_modules/.pnpm/@terraforge+aws@6.53.0_@terraforge+core@0.0.44_aws-crt@1.30.0_debug@4.4.3_supports-colo_7835ee9c943a9b106f7a0c962824b2e8/node_modules/@terraforge/aws/dist/index.js
 var aws2 = createTerraformProxy({
   namespace: "aws",
   provider: { org: "hashicorp", type: "aws", version: "6.53.0" }
@@ -155610,7 +155607,11 @@ var createDnsValidatedCertificate = (group4, id, props) => {
     validationMethod: "DNS",
     keyAlgorithm: "RSA_2048",
     subjectAlternativeNames: props.subjectAlternativeNames
-  }, props.provider ? { provider: props.provider } : undefined);
+  }, {
+    ...props.provider ? { provider: props.provider } : {},
+    replaceOnChanges: ["domainName", "subjectAlternativeNames"],
+    createBeforeReplace: true
+  });
   const option = (index) => {
     return certificate.domainValidationOptions.pipe((options) => {
       return options[index];
@@ -155623,6 +155624,8 @@ var createDnsValidatedCertificate = (group4, id, props) => {
     ttl: toSeconds2(minutes5(5)),
     records: [option(0).pipe((r4) => r4.resourceRecordValue)],
     allowOverwrite: true
+  }, {
+    replaceOnChanges: ["name", "type", "zoneId", "records"]
   });
   const record2 = new aws2.route53.Record(group4, `${props.recordIdPrefix}-2`, {
     zoneId: props.zoneId,
@@ -155631,14 +155634,17 @@ var createDnsValidatedCertificate = (group4, id, props) => {
     ttl: toSeconds2(minutes5(5)),
     records: [option(1).pipe((r4) => r4.resourceRecordValue)],
     allowOverwrite: true
+  }, {
+    replaceOnChanges: ["name", "type", "zoneId", "records"]
   });
   const validation = new aws2.acm.CertificateValidation(group4, id, {
     certificateArn: certificate.arn,
     validationRecordFqdns: [record1.fqdn, record2.fqdn]
-  }, props.provider || props.dependsOn ? {
+  }, {
     ...props.dependsOn ? { dependsOn: props.dependsOn } : {},
-    ...props.provider ? { provider: props.provider } : {}
-  } : undefined);
+    ...props.provider ? { provider: props.provider } : {},
+    replaceOnChanges: ["certificateArn", "validationRecordFqdns"]
+  });
   return validation;
 };
 var getDomainNameById = (config, id) => {
@@ -155679,9 +155685,14 @@ var domainFeature = defineFeature({
       const zone = new aws2.route53.Zone(ctx.zones, "zone", {
         name: props.domain,
         forceDestroy: true
+      }, {
+        replaceOnChanges: ["name"],
+        createBeforeReplace: true
       });
       const nsCheck = new NsCheck(group5, "check", {
         zoneId: zone.id
+      }, {
+        replaceOnChanges: ["zoneId"]
       });
       ctx.registerDomainZone(zone);
       ctx.shared.add("domain", `zone-id`, id, zone.id);
@@ -155708,7 +155719,9 @@ var domainFeature = defineFeature({
       const identity = new aws2.ses.DomainIdentity(group5, "mail", {
         domain: props.domain
       }, {
-        import: ctx.import ? props.domain : undefined
+        import: ctx.import ? props.domain : undefined,
+        replaceOnChanges: ["domain"],
+        createBeforeReplace: true
       });
       const verificationRecord = new aws2.route53.Record(group5, `verification`, {
         zoneId: zone.id,
@@ -155716,11 +155729,15 @@ var domainFeature = defineFeature({
         type: "TXT",
         ttl: toSeconds3(minutes6(5)),
         records: [identity.verificationToken]
+      }, {
+        replaceOnChanges: ["name", "type", "zoneId", "records"]
       });
       const dkim = new aws2.ses.DomainDkim(group5, "dkim", {
         domain: props.domain
       }, {
-        import: ctx.import ? props.domain : undefined
+        import: ctx.import ? props.domain : undefined,
+        replaceOnChanges: ["domain"],
+        createBeforeReplace: true
       });
       for (let i3 = 0;i3 < 3; i3++) {
         new aws2.route53.Record(group5, `dkim-${i3}`, {
@@ -155729,6 +155746,8 @@ var domainFeature = defineFeature({
           name: dkim.dkimTokens.pipe((t2) => `${t2.at(i3)}._domainkey`),
           ttl: toSeconds3(minutes6(5)),
           records: [dkim.dkimTokens.pipe((t2) => `${t2.at(i3)}.dkim.amazonses.com`)]
+        }, {
+          replaceOnChanges: ["name", "type", "zoneId", "records"]
         });
       }
       const mailFrom = new aws2.ses.DomainMailFrom(group5, "mail-from", {
@@ -155736,7 +155755,9 @@ var domainFeature = defineFeature({
         mailFromDomain: `mail.${props.domain}`,
         behaviorOnMxFailure: "UseDefaultValue"
       }, {
-        import: ctx.import ? props.domain : undefined
+        import: ctx.import ? props.domain : undefined,
+        replaceOnChanges: ["domain"],
+        createBeforeReplace: true
       });
       new aws2.route53.Record(group5, `MX`, {
         zoneId: zone.id,
@@ -155744,6 +155765,8 @@ var domainFeature = defineFeature({
         type: "MX",
         ttl: toSeconds3(minutes6(5)),
         records: [`10 feedback-smtp.${ctx.appConfig.region}.amazonses.com`]
+      }, {
+        replaceOnChanges: ["name", "type", "zoneId"]
       });
       new aws2.route53.Record(group5, `SPF`, {
         zoneId: zone.id,
@@ -155751,6 +155774,8 @@ var domainFeature = defineFeature({
         type: "TXT",
         ttl: toSeconds3(minutes6(5)),
         records: ["v=spf1 include:amazonses.com -all"]
+      }, {
+        replaceOnChanges: ["name", "type", "zoneId"]
       });
       new aws2.route53.Record(group5, `DMARC`, {
         zoneId: zone.id,
@@ -155758,8 +155783,13 @@ var domainFeature = defineFeature({
         type: "TXT",
         ttl: toSeconds3(minutes6(5)),
         records: ["v=DMARC1; p=none;"]
+      }, {
+        replaceOnChanges: ["name", "type", "zoneId"]
+      });
+      new aws2.ses.DomainIdentityVerification(group5, "mail", { domain: props.domain }, {
+        dependsOn: [identity, verificationRecord, nsCheck],
+        replaceOnChanges: ["domain"]
       });
-      new aws2.ses.DomainIdentityVerification(group5, "mail", { domain: props.domain }, { dependsOn: [identity, verificationRecord, nsCheck] });
       for (const record of props.dns ?? []) {
         const name = record.name ?? props.domain;
         new aws2.route53.Record(group5, `${name}-${record.type}`, {
@@ -155768,6 +155798,8 @@ var domainFeature = defineFeature({
           ttl: toSeconds3(record.ttl),
           type: record.type,
           records: record.records
+        }, {
+          replaceOnChanges: ["name", "type", "zoneId"]
         });
       }
     }
@@ -158400,11 +158432,16 @@ var restFeature = defineFeature({
             endpointType: "REGIONAL",
             securityPolicy: "TLS_1_2"
           }
+        }, {
+          replaceOnChanges: ["domainName", "domainNameConfiguration"],
+          createBeforeReplace: true
         });
         const mapping = new aws2.apigatewayv2.ApiMapping(group4, "mapping", {
           apiId: api.id,
           domainName: domain.domainName,
           stage: stage.name
+        }, {
+          replaceOnChanges: ["domainName"]
         });
         new aws2.route53.Record(group4, "record", {
           zoneId,
@@ -158416,7 +158453,8 @@ var restFeature = defineFeature({
             evaluateTargetHealth: false
           }
         }, {
-          dependsOn: [mapping]
+          dependsOn: [mapping],
+          replaceOnChanges: ["name", "type", "zoneId", "alias"]
         });
         ctx.bind(`REST_${constantCase(id)}_ENDPOINT`, domainName);
       } else {
@@ -162855,6 +162893,8 @@ var routerFeature = defineFeature({
               zoneId: "Z2FDTNDATAQYW2",
               evaluateTargetHealth: false
             }
+          }, {
+            replaceOnChanges: ["name", "type", "zoneId", "alias"]
           });
           new aws2.route53.Record(group4, `${recordId}-ipv6`, {
             zoneId,
@@ -162865,6 +162905,8 @@ var routerFeature = defineFeature({
               zoneId: "Z2FDTNDATAQYW2",
               evaluateTargetHealth: false
             }
+          }, {
+            replaceOnChanges: ["name", "type", "zoneId", "alias"]
           });
         }
         ctx.bind(`ROUTER_${constantCase(id)}_ENDPOINT`, domainName);
@@ -164250,16 +164292,148 @@ var del9 = (program3) => {
 import { LambdaClient as LambdaClient4 } from "@aws-sdk/client-lambda";
 import { DynamoDBClient as DynamoDBClient4 } from "@awsless/dynamodb";
 
+// src/test/environment.ts
+import { mkdir as mkdir7, writeFile as writeFile10 } from "fs/promises";
+import { join as join47 } from "path";
+
+// src/test/manifest.ts
+import { isAbsolute as isAbsolute5, join as join46 } from "path";
+var absolute = (file2) => {
+  return isAbsolute5(file2) ? file2 : join46(directories.root, file2);
+};
+var createTestManifest = (appConfig, stackConfigs) => {
+  const manifest = {
+    app: appConfig.name,
+    region: appConfig.region,
+    configs: appConfig.test.configs,
+    tables: [],
+    tableKeys: [],
+    streams: [],
+    searches: [],
+    functions: [],
+    tasks: [],
+    queues: [],
+    topics: appConfig.topics ?? [],
+    pubsub: Object.keys(appConfig.pubsub ?? {}),
+    caches: [],
+    alerts: Object.keys(appConfig.alerts ?? {}),
+    jobs: [],
+    instances: []
+  };
+  for (const stack of stackConfigs) {
+    for (const [id, props] of Object.entries(stack.tables ?? {})) {
+      const name = formatLocalResourceName({
+        appName: appConfig.name,
+        stackName: stack.name,
+        resourceType: "table",
+        resourceName: id
+      });
+      manifest.tables.push(createTableInput(name, props));
+      manifest.tableKeys.push({ stack: stack.name, id, keys: formatTableKeys(props) });
+      if (props.stream) {
+        manifest.streams.push({
+          stack: stack.name,
+          id,
+          file: absolute(props.stream.consumer.code.file),
+          hash: props.hash,
+          sort: props.sort
+        });
+      }
+    }
+    for (const [id, props] of Object.entries(stack.searchs ?? {})) {
+      manifest.searches.push({
+        stack: stack.name,
+        id,
+        mappings: resolveSearchMappings(props),
+        settings: props.settings
+      });
+    }
+    for (const [id, props] of Object.entries(stack.functions ?? {})) {
+      manifest.functions.push({ stack: stack.name, id, file: absolute(props.code.file) });
+    }
+    for (const [id, props] of Object.entries(stack.tasks ?? {})) {
+      manifest.tasks.push({ stack: stack.name, id, file: absolute(props.consumer.code.file) });
+    }
+    for (const [id, props] of Object.entries(stack.queues ?? {})) {
+      manifest.queues.push({
+        stack: stack.name,
+        id,
+        file: props.consumer ? absolute(props.consumer.code.file) : undefined
+      });
+    }
+    for (const id of Object.keys(stack.caches ?? {})) {
+      manifest.caches.push({ stack: stack.name, id });
+    }
+    for (const id of Object.keys(stack.jobs ?? {})) {
+      manifest.jobs.push({ stack: stack.name, id });
+    }
+    for (const id of Object.keys(stack.instances ?? {})) {
+      manifest.instances.push({ stack: stack.name, id });
+    }
+  }
+  return manifest;
+};
+
+// src/test/environment.ts
+var waitForSearch2 = async (port, timeoutMs) => {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    try {
+      const res = await fetch(`http://localhost:${port}`);
+      if (res.ok) {
+        return;
+      }
+    } catch (_4) {}
+    await new Promise((resolve5) => setTimeout(resolve5, 500));
+  }
+  throw new Error("The local OpenSearch server never became ready.");
+};
+var withTestEnvironment = async (appConfig, stackConfigs, run) => {
+  const manifest = createTestManifest(appConfig, stackConfigs);
+  const manifestFile = join47(directories.output, "test", "manifest.json");
+  let redis;
+  let killSearch;
+  manifest.servers = {};
+  try {
+    if (manifest.searches.length > 0) {
+      const { download: download2, launch: launch2, VERSION_3_5_0_MIN: VERSION_3_5_0_MIN2 } = await Promise.resolve().then(() => (init_dist2(), exports_dist));
+      const port = await findFreePort();
+      const path6 = await download2(VERSION_3_5_0_MIN2);
+      killSearch = await launch2({
+        path: path6,
+        port,
+        host: "localhost",
+        version: VERSION_3_5_0_MIN2,
+        debug: false
+      });
+      await waitForSearch2(port, 60000);
+      manifest.servers.search = { domain: `localhost:${port}` };
+    }
+    if (manifest.caches.length > 0) {
+      redis = new RedisServer;
+      await redis.start(undefined, undefined, ["--databases", "256"]);
+      await redis.ping();
+      manifest.servers.redis = { host: "127.0.0.1", port: await redis.getPort() };
+    }
+    await mkdir7(join47(directories.output, "test"), { recursive: true });
+    await writeFile10(manifestFile, JSON.stringify(manifest));
+    return await run({ manifest, manifestFile });
+  } finally {
+    await redis?.kill();
+    await killSearch?.();
+  }
+};
+
 // src/cli/ui/complex/run-tests.ts
 var import_wildstring2 = __toESM(require_wildstring(), 1);
-import { mkdir as mkdir7, readFile as readFile19, writeFile as writeFile10 } from "fs/promises";
-import { join as join47 } from "path";
+import { mkdir as mkdir8, readFile as readFile19, writeFile as writeFile11 } from "fs/promises";
+import { join as join49 } from "path";
 import { parse as parse7, stringify as stringify4 } from "@awsless/json";
 import { generateFileHash as generateFileHash5, generateFolderHash, loadWorkspace as loadWorkspace2 } from "@awsless/ts-file-cache";
 import { createHash as createHash21 } from "crypto";
 
 // src/test/start.ts
-import { dirname as dirname21, join as join46 } from "path";
+import { dirname as dirname21, join as join48 } from "path";
 import { fileURLToPath as fileURLToPath15 } from "url";
 import { configDefaults } from "vitest/config";
 import { startVitest } from "vitest/node";
@@ -164335,7 +164509,7 @@ var startTest = async (props) => {
     reporters: [new NullReporter],
     env: props.env,
     setupFiles: [
-      join46(__dirname4, "test-global-setup.js")
+      join48(__dirname4, "test-global-setup.js")
     ]
   }, {
     logLevel: "silent",
@@ -164490,8 +164664,8 @@ var logTestErrors = (event) => {
   }
 };
 var runTest = async (stack, dir, filters, workspace, opts) => {
-  await mkdir7(directories.test, { recursive: true });
-  const file2 = join47(directories.test, `${stack}.json`);
+  await mkdir8(directories.test, { recursive: true });
+  const file2 = join49(directories.test, `${stack}.json`);
   const fingerprint = await generateFolderHash(workspace, dir) + (opts.fingerprint ?? "");
   if (!process.env.NO_CACHE) {
     const exists4 = await fileExist(file2);
@@ -164522,7 +164696,7 @@ var runTest = async (stack, dir, filters, workspace, opts) => {
         env: opts.env
       });
       if (result2.errors.length > 0) {
-        throw result2.errors.map((error3) => new ExpectedError(error3.message));
+        throw result2.errors.map((error3) => new ExpectedError(error3.type && error3.type !== "Error" ? `${error3.type}: ${error3.message}` : error3.message));
       }
       ctx.updateSuccessMessage(formatResult({
         stack,
@@ -164536,7 +164710,7 @@ var runTest = async (stack, dir, filters, workspace, opts) => {
     logTestLogs(result);
   }
   logTestErrors(result);
-  await writeFile10(file2, stringify4({
+  await writeFile11(file2, stringify4({
     ...result,
     fingerprint
   }));
@@ -164808,14 +164982,18 @@ var deploy = (program3) => {
         }
       }
       if (!options.skipTests) {
-        const passed = await runTests(tests, [], [], {
-          showLogs: false,
-          env: {
-            APP: appConfig.name,
-            APP_ID: appId,
-            AWS_REGION: appConfig.region,
-            AWS_ACCOUNT_ID: accountId
-          }
+        const passed = await withTestEnvironment(appConfig, stackConfigs, ({ manifest, manifestFile }) => {
+          return runTests(tests, [], [], {
+            showLogs: false,
+            manifest,
+            env: {
+              APP: appConfig.name,
+              APP_ID: appId,
+              AWS_REGION: appConfig.region,
+              AWS_ACCOUNT_ID: accountId,
+              AWSLESS_TEST_MANIFEST: manifestFile
+            }
+          });
         });
         if (!passed) {
           throw new ExpectedError("Tests failed.");
@@ -165371,12 +165549,12 @@ var auth = (program3) => {
 
 // src/cli/command/bind.ts
 import { readFile as readFile20 } from "fs/promises";
-import { join as join48 } from "path";
+import { join as join50 } from "path";
 var bind = (program3) => {
   program3.command("bind").argument("[command...]", "The command to execute").option("--config <string...>", "List of config values that will be accessable", (v3) => v3.split(",")).option("--local", "Bind against the running local dev environment instead of the deployed app").description(`Bind your site environment variables to a command`).action(async (commands5 = [], opts) => {
     await layout("bind", async ({ appConfig, stackConfigs }) => {
       if (opts.local) {
-        const file2 = join48(directories.output, "local", "env.json");
+        const file2 = join50(directories.output, "local", "env.json");
         let env5;
         try {
           env5 = JSON.parse(await readFile20(file2, "utf8"));
@@ -166172,18 +166350,18 @@ var watchConfig = async (options, resolve5, reject) => {
 
 // src/dev/index.ts
 import { loadWorkspace as loadWorkspace3 } from "@awsless/ts-file-cache";
-import { mkdir as mkdir10, rm as rm12, writeFile as writeFile14 } from "fs/promises";
-import { join as join55 } from "path";
+import { mkdir as mkdir11, rm as rm12, writeFile as writeFile15 } from "fs/promises";
+import { join as join57 } from "path";
 
 // src/dev/context.ts
 import { DynamoDBServer } from "@awsless/dynamodb-server";
-import { join as join50 } from "path";
+import { join as join52 } from "path";
 
 // src/dev/servers/s3.ts
 import { createHash as createHash22 } from "crypto";
-import { mkdir as mkdir8, readdir as readdir8, readFile as readFile21, rm as rm10, stat as stat7, writeFile as writeFile11 } from "fs/promises";
+import { mkdir as mkdir9, readdir as readdir8, readFile as readFile21, rm as rm10, stat as stat7, writeFile as writeFile12 } from "fs/promises";
 import { createServer as createServer7 } from "http";
-import { dirname as dirname22, isAbsolute as isAbsolute5, join as join49, relative as relative10, sep as sep4 } from "path";
+import { dirname as dirname22, isAbsolute as isAbsolute6, join as join51, relative as relative10, sep as sep4 } from "path";
 var escapeXml = (value) => {
   return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&apos;");
 };
@@ -166248,11 +166426,11 @@ var createS3Server = (props) => {
       res.end(xmlError("InvalidRequest", "Missing bucket name"));
       return;
     }
-    const bucketDir = join49(props.root, bucket);
-    const file2 = join49(bucketDir, ...keyParts);
+    const bucketDir = join51(props.root, bucket);
+    const file2 = join51(bucketDir, ...keyParts);
     const escapes = (base, path6) => {
       const rel = relative10(base, path6);
-      return rel.startsWith("..") || isAbsolute5(rel);
+      return rel.startsWith("..") || isAbsolute6(rel);
     };
     if (escapes(props.root, bucketDir) || escapes(bucketDir, file2)) {
       res.writeHead(400, { "content-type": "application/xml" });
@@ -166270,7 +166448,7 @@ var createS3Server = (props) => {
           return;
         }
         for (const entry of entries2) {
-          const path6 = join49(dir, entry.name);
+          const path6 = join51(dir, entry.name);
           if (entry.isDirectory()) {
             await walk2(path6);
           } else {
@@ -166296,8 +166474,8 @@ var createS3Server = (props) => {
       if (typeof encoding === "string" && encoding.includes("aws-chunked") || typeof sha === "string" && sha.startsWith("STREAMING")) {
         body = decodeAwsChunked(body);
       }
-      await mkdir8(dirname22(file2), { recursive: true });
-      await writeFile11(file2, body);
+      await mkdir9(dirname22(file2), { recursive: true });
+      await writeFile12(file2, body);
       const eTag = createHash22("md5").update(body).digest("hex");
       res.writeHead(200, { etag: `"${eTag}"` });
       res.end();
@@ -166738,7 +166916,7 @@ var createDevContext = (props) => {
       const value = await props.pool.keep("store", null, async () => {
         const rules = [];
         const server = createS3Server({
-          root: join50(directories.output, "local", "store"),
+          root: join52(directories.output, "local", "store"),
           region: props.appConfig.region,
           rules
         });
@@ -166838,9 +167016,9 @@ var createDevContext = (props) => {
 
 // src/dev/seed.ts
 import { spawn as spawn6 } from "child_process";
-import { isAbsolute as isAbsolute6, join as join51 } from "path";
+import { isAbsolute as isAbsolute7, join as join53 } from "path";
 var createSeedRunner = (props) => {
-  const file2 = props.seed && (isAbsolute6(props.seed) ? props.seed : join51(directories.root, props.seed));
+  const file2 = props.seed && (isAbsolute7(props.seed) ? props.seed : join53(directories.root, props.seed));
   let running;
   const run = () => {
     running ??= (async () => {
@@ -166889,15 +167067,15 @@ var import_ioredis5 = __toESM(require_built3(), 1);
 import { DynamoDBClient as DynamoDBClient5 } from "@aws-sdk/client-dynamodb";
 import { DynamoDBDocumentClient, ScanCommand as ScanCommand2 } from "@aws-sdk/lib-dynamodb";
 import { randomUUID as randomUUID8 } from "crypto";
-import { readdir as readdir9, readFile as readFile22, stat as stat8, writeFile as writeFile13 } from "fs/promises";
+import { readdir as readdir9, readFile as readFile22, stat as stat8, writeFile as writeFile14 } from "fs/promises";
 import { createServer as createServer9 } from "http";
-import { join as join53, relative as relative11, sep as sep5 } from "path";
+import { join as join55, relative as relative11, sep as sep5 } from "path";
 
 // src/dev/worker.ts
 import { spawn as spawn7 } from "child_process";
-import { writeFile as writeFile12 } from "fs/promises";
+import { writeFile as writeFile13 } from "fs/promises";
 import { availableParallelism } from "os";
-import { join as join52 } from "path";
+import { join as join54 } from "path";
 class WorkerError extends Error {
   name;
   constructor(name, message4, stack) {
@@ -167014,7 +167192,7 @@ var createBundleWorker = (props) => {
     throw new Error("The bundle worker never became ready.");
   };
   const startWorker = async () => {
-    const entry = join52(props.buildDir, "worker.mjs");
+    const entry = join54(props.buildDir, "worker.mjs");
     const port = await findFreePort();
     const child = spawn7("node", ["--enable-source-maps", entry], {
       cwd: props.buildDir,
@@ -167073,7 +167251,7 @@ var createBundleWorker = (props) => {
     return worker;
   };
   const doStart = async () => {
-    await writeFile12(join52(props.buildDir, "worker.mjs"), WORKER_ENTRY);
+    await writeFile13(join54(props.buildDir, "worker.mjs"), WORKER_ENTRY);
     const results = await Promise.allSettled(Array.from({ length: concurrency }, () => startWorker()));
     const started = results.filter((result) => result.status === "fulfilled").map((result) => result.value);
     const failed = results.find((result) => result.status === "rejected");
@@ -168737,7 +168915,7 @@ var createDashboardServer = (props) => {
           return;
         }
         for (const entry of entries2) {
-          const path6 = join53(dir, entry.name);
+          const path6 = join55(dir, entry.name);
           if (entry.isDirectory()) {
             await walk2(path6);
           } else {
@@ -168802,7 +168980,7 @@ var createDashboardServer = (props) => {
     if (url.pathname === "/api/config") {
       if (req.method === "PUT") {
         const values2 = JSON.parse((await readBody(req)).toString() || "{}");
-        await writeFile13(props.configFile, JSON.stringify(values2, null, "\t") + `
+        await writeFile14(props.configFile, JSON.stringify(values2, null, "\t") + `
 `);
         return { status: 200, body: JSON.stringify({ ok: true }) };
       }
@@ -169048,17 +169226,17 @@ var createLambdaServer = (props) => {
 };
 
 // src/dev/sdk.ts
-import { readdir as readdir10, readFile as readFile23, mkdir as mkdir9, rm as rm11, stat as stat9, symlink } from "fs/promises";
+import { readdir as readdir10, readFile as readFile23, mkdir as mkdir10, rm as rm11, stat as stat9, symlink } from "fs/promises";
 import { createRequire } from "module";
-import { dirname as dirname23, join as join54 } from "path";
+import { dirname as dirname23, join as join56 } from "path";
 var linkSdkPackages = async (buildDir, onWarn) => {
-  const filesDir = join54(buildDir, "files");
+  const filesDir = join56(buildDir, "files");
   const packages = new Set;
   for (const file2 of await readdir10(filesDir)) {
     if (!file2.endsWith(".mjs")) {
       continue;
     }
-    const code = await readFile23(join54(filesDir, file2), "utf8");
+    const code = await readFile23(join56(filesDir, file2), "utf8");
     for (const match3 of code.matchAll(/(?:from\s*|import\()\s*["'](@aws-sdk\/[a-z0-9-]+|sharp)["']/g)) {
       packages.add(match3[1]);
     }
@@ -169066,25 +169244,25 @@ var linkSdkPackages = async (buildDir, onWarn) => {
   const ownRequire = createRequire(import.meta.url);
   const isProjectDep = async (name) => {
     try {
-      await stat9(join54(directories.root, "node_modules", name, "package.json"));
+      await stat9(join56(directories.root, "node_modules", name, "package.json"));
       return true;
     } catch (_4) {
       return false;
     }
   };
   const resolveFromStore = async (name) => {
-    const store = join54(directories.root, "node_modules", ".pnpm");
+    const store = join56(directories.root, "node_modules", ".pnpm");
     const prefix = name.replaceAll("/", "+") + "@";
     try {
       const entries2 = (await readdir10(store)).filter((entry) => entry.startsWith(prefix));
       const best = entries2.sort((a4, b6) => a4.slice(prefix.length).localeCompare(b6.slice(prefix.length), undefined, { numeric: true })).at(-1);
-      return best ? join54(store, best, "node_modules", name) : undefined;
+      return best ? join56(store, best, "node_modules", name) : undefined;
     } catch (_4) {
       return;
     }
   };
   for (const name of packages) {
-    const target2 = join54(buildDir, "node_modules", name);
+    const target2 = join56(buildDir, "node_modules", name);
     try {
       if (await isProjectDep(name)) {
         await rm11(target2, { recursive: true, force: true });
@@ -169100,10 +169278,10 @@ var linkSdkPackages = async (buildDir, onWarn) => {
           continue;
         }
       }
-      await mkdir9(dirname23(target2), { recursive: true });
+      await mkdir10(dirname23(target2), { recursive: true });
       await rm11(target2, { recursive: true, force: true });
       await symlink(source, target2, "dir");
-      await stat9(join54(target2, "package.json"));
+      await stat9(join56(target2, "package.json"));
       debug(`Sdk link ${name}: ${source}`);
     } catch (error3) {
       onWarn?.(`Linking the "${name}" sdk package failed: ${error3 instanceof Error ? error3.message : String(error3)}`);
@@ -169127,7 +169305,7 @@ var startDev = async (props) => {
     dev: true
   });
   ready2();
-  await mkdir10(join55(directories.output, "local"), { recursive: true });
+  await mkdir11(join57(directories.output, "local"), { recursive: true });
   const routerPorts = {};
   Object.keys(appConfig.router ?? {}).forEach((id, index) => {
     routerPorts[id] = props.port + 1 + index;
@@ -169182,7 +169360,7 @@ var startDev = async (props) => {
     for (const [id, port] of Object.entries(routerPorts)) {
       env5[`ROUTER_${constantCase(id)}_ENDPOINT`] = `localhost:${port}`;
     }
-    await writeFile14(join55(directories.output, "local", "env.json"), JSON.stringify(env5, null, "\t") + `
+    await writeFile15(join57(directories.output, "local", "env.json"), JSON.stringify(env5, null, "\t") + `
 `);
     return { env: env5, lambda: lambda2 };
   });
@@ -169197,7 +169375,7 @@ var startDev = async (props) => {
       }
       debug(`Build ${builder.type}:${builder.name}`, meta?.cached ? "cached" : String(meta?.buildTime));
     }
-    await writeFile14(getBuildPath("bundle", bundleName, "files/awsless-env.mjs"), `export default {}
+    await writeFile15(getBuildPath("bundle", bundleName, "files/awsless-env.mjs"), `export default {}
 `);
     await linkSdkPackages(buildDir, log);
     return changed;
@@ -169324,8 +169502,8 @@ var startDev = async (props) => {
     resources: dev.resources,
     routes: dev.routes,
     env: env4,
-    storeRoot: join55(directories.output, "local", "store"),
-    configFile: join55(directories.output, "local", "config.json"),
+    storeRoot: join57(directories.output, "local", "store"),
+    configFile: join57(directories.output, "local", "config.json"),
     getEmails: () => props.pool.peek("shim:ses-email")?.server.list() ?? [],
     configPulled: Object.keys(props.pool.peek("config:pull") ?? {}),
     auth: createAuthAdmin({
@@ -169367,7 +169545,7 @@ var startDev = async (props) => {
     routerPorts,
     async stop() {
       stopping = true;
-      await rm12(join55(directories.output, "local", "env.json"), { force: true });
+      await rm12(join57(directories.output, "local", "env.json"), { force: true });
       clearTimeout(rebuildTimer);
       await watcher.close();
       await restartWatcher?.close();
@@ -169432,8 +169610,8 @@ var createServerPool = () => {
 };
 
 // src/type-gen/generate.ts
-import { mkdir as mkdir11, writeFile as writeFile15 } from "fs/promises";
-import { dirname as dirname24, join as join56, relative as relative12 } from "path";
+import { mkdir as mkdir12, writeFile as writeFile16 } from "fs/promises";
+import { dirname as dirname24, join as join58, relative as relative12 } from "path";
 var generateTypes = async (props) => {
   const files = [];
   await Promise.all(features.map((feature) => {
@@ -169441,13 +169619,13 @@ var generateTypes = async (props) => {
       ...props,
       async write(file2, data, include = false) {
         const code = data?.toString("utf8");
-        const path6 = join56(directories.types, file2);
+        const path6 = join58(directories.types, file2);
         if (code) {
           if (include) {
             files.push(relative12(directories.root, path6));
           }
-          await mkdir11(dirname24(path6), { recursive: true });
-          await writeFile15(path6, code);
+          await mkdir12(dirname24(path6), { recursive: true });
+          await writeFile16(path6, code);
         }
       }
     });
@@ -169455,7 +169633,7 @@ var generateTypes = async (props) => {
   if (files.length) {
     const code = files.map((file2) => `/// <reference path='${file2}' />`).join(`
 `);
-    await writeFile15(join56(directories.root, `awsless.d.ts`), code);
+    await writeFile16(join58(directories.root, `awsless.d.ts`), code);
   }
 };
 
@@ -185107,101 +185285,6 @@ var state = (program3) => {
 };
 
 // src/cli/command/test.ts
-import { mkdir as mkdir12, writeFile as writeFile16 } from "fs/promises";
-import { join as join58 } from "path";
-
-// src/test/manifest.ts
-import { isAbsolute as isAbsolute7, join as join57 } from "path";
-var absolute = (file2) => {
-  return isAbsolute7(file2) ? file2 : join57(directories.root, file2);
-};
-var createTestManifest = (appConfig, stackConfigs) => {
-  const manifest = {
-    app: appConfig.name,
-    region: appConfig.region,
-    configs: appConfig.test.configs,
-    tables: [],
-    tableKeys: [],
-    streams: [],
-    searches: [],
-    functions: [],
-    tasks: [],
-    queues: [],
-    topics: appConfig.topics ?? [],
-    pubsub: Object.keys(appConfig.pubsub ?? {}),
-    caches: [],
-    alerts: Object.keys(appConfig.alerts ?? {}),
-    jobs: [],
-    instances: []
-  };
-  for (const stack of stackConfigs) {
-    for (const [id, props] of Object.entries(stack.tables ?? {})) {
-      const name = formatLocalResourceName({
-        appName: appConfig.name,
-        stackName: stack.name,
-        resourceType: "table",
-        resourceName: id
-      });
-      manifest.tables.push(createTableInput(name, props));
-      manifest.tableKeys.push({ stack: stack.name, id, keys: formatTableKeys(props) });
-      if (props.stream) {
-        manifest.streams.push({
-          stack: stack.name,
-          id,
-          file: absolute(props.stream.consumer.code.file),
-          hash: props.hash,
-          sort: props.sort
-        });
-      }
-    }
-    for (const [id, props] of Object.entries(stack.searchs ?? {})) {
-      manifest.searches.push({
-        stack: stack.name,
-        id,
-        mappings: resolveSearchMappings(props),
-        settings: props.settings
-      });
-    }
-    for (const [id, props] of Object.entries(stack.functions ?? {})) {
-      manifest.functions.push({ stack: stack.name, id, file: absolute(props.code.file) });
-    }
-    for (const [id, props] of Object.entries(stack.tasks ?? {})) {
-      manifest.tasks.push({ stack: stack.name, id, file: absolute(props.consumer.code.file) });
-    }
-    for (const [id, props] of Object.entries(stack.queues ?? {})) {
-      manifest.queues.push({
-        stack: stack.name,
-        id,
-        file: props.consumer ? absolute(props.consumer.code.file) : undefined
-      });
-    }
-    for (const id of Object.keys(stack.caches ?? {})) {
-      manifest.caches.push({ stack: stack.name, id });
-    }
-    for (const id of Object.keys(stack.jobs ?? {})) {
-      manifest.jobs.push({ stack: stack.name, id });
-    }
-    for (const id of Object.keys(stack.instances ?? {})) {
-      manifest.instances.push({ stack: stack.name, id });
-    }
-  }
-  return manifest;
-};
-
-// src/cli/command/test.ts
-var waitForSearch2 = async (port, timeoutMs) => {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    try {
-      const res = await fetch(`http://localhost:${port}`);
-      if (res.ok) {
-        return;
-      }
-    } catch (_4) {}
-    await new Promise((resolve5) => setTimeout(resolve5, 500));
-  }
-  throw new Error("The local OpenSearch server never became ready.");
-};
 var test2 = (program3) => {
   program3.command("test").argument("[stacks...]", "Optionally filter stacks to test").option("-f --filters <string...>", "Optionally filter test files").description("Test your app").action(async (stacks, options) => {
     await layout(`test ${stacks ?? ""}`, async (props) => {
@@ -185210,36 +185293,8 @@ var test2 = (program3) => {
       if (tests.length === 0) {
         return "No tests found.";
       }
-      const manifest = createTestManifest(props.appConfig, props.stackConfigs);
-      const manifestFile = join58(directories.output, "test", "manifest.json");
-      let redis;
-      let killSearch;
-      manifest.servers = {};
-      let passed = false;
-      try {
-        if (manifest.searches.length > 0) {
-          const { download: download2, launch: launch2, VERSION_3_5_0_MIN: VERSION_3_5_0_MIN2 } = await Promise.resolve().then(() => (init_dist2(), exports_dist));
-          const port = await findFreePort();
-          const path6 = await download2(VERSION_3_5_0_MIN2);
-          killSearch = await launch2({
-            path: path6,
-            port,
-            host: "localhost",
-            version: VERSION_3_5_0_MIN2,
-            debug: false
-          });
-          await waitForSearch2(port, 60000);
-          manifest.servers.search = { domain: `localhost:${port}` };
-        }
-        if (manifest.caches.length > 0) {
-          redis = new RedisServer;
-          await redis.start(undefined, undefined, ["--databases", "256"]);
-          await redis.ping();
-          manifest.servers.redis = { host: "127.0.0.1", port: await redis.getPort() };
-        }
-        await mkdir12(join58(directories.output, "test"), { recursive: true });
-        await writeFile16(manifestFile, JSON.stringify(manifest));
-        passed = await runTests(tests, stacks, options?.filters, {
+      const passed = await withTestEnvironment(props.appConfig, props.stackConfigs, ({ manifest, manifestFile }) => {
+        return runTests(tests, stacks, options?.filters, {
           showLogs: true,
           manifest,
           env: {
@@ -185250,10 +185305,7 @@ var test2 = (program3) => {
             AWSLESS_TEST_MANIFEST: manifestFile
           }
         });
-      } finally {
-        await redis?.kill();
-        await killSearch?.();
-      }
+      });
       if (!passed) {
         throw new ExpectedError("Tests failed.");
       }