@intentius/chant-lexicon-aws 0.18.20 → 0.18.22

package/src/plugin.ts

@@ -475,6 +475,7 @@ aws cloudformation wait stack-update-complete --stack-name my-app-prod`,
     environment: string;
     buildOutput: string;
     entityNames: string[];
+    stack?: string;
     owned?: boolean;
   }): Promise<Record<string, ResourceMetadata>> {
     const { getRuntime } = await import("@intentius/chant/runtime-adapter");
@@ -490,9 +491,10 @@ aws cloudformation wait stack-update-complete --stack-name my-app-prod`,
       );
     }
 
-    // Derive stack name: environment-based convention
-    // Try to parse the build output to detect stack name from Metadata or use convention
-    const stackName = `${options.environment}`;
+    // Derive stack name. A multi-stack project passes the explicit CloudFormation
+    // stack this observation targets (see `stacks` in ChantConfig); otherwise the
+    // single-stack convention is the stack named after the environment (#932).
+    const stackName = options.stack ?? `${options.environment}`;
 
     // Describe stack resources. Inject --endpoint-url from AWS_ENDPOINT_URL so a
     // local emulator (Floci) is observed instead of real AWS (#926) — behold
@@ -577,14 +579,16 @@ aws cloudformation wait stack-update-complete --stack-name my-app-prod`,
 
   async exportResources(options: {
     environment: string;
+    stack?: string;
     selector?: ResourceSelector;
     owned?: boolean;
   }): Promise<ExportedTemplate> {
     const { getRuntime } = await import("@intentius/chant/runtime-adapter");
     const rt = getRuntime();
 
-    // Same stack-name convention as describeResources.
-    const stackName = `${options.environment}`;
+    // Same stack-name convention as describeResources: an explicit multi-stack
+    // stack name (#932), else the stack named after the environment.
+    const stackName = options.stack ?? `${options.environment}`;
 
     const result = await rt.spawn(applyAwsEndpointArgv([
       "aws", "cloudformation", "get-template",
@@ -614,8 +618,8 @@ aws cloudformation wait stack-update-complete --stack-name my-app-prod`,
   // describe-stack-resources is too thin; the deployed template (exportResources)
   // carries the references. Resolve its `{Ref}`/`{Fn::GetAtt}` intrinsics to bare
   // logical ids so the reference resolver matches them.
-  async enrichLiveAttrs(options: { environment: string; owned?: boolean }): Promise<Record<string, Record<string, unknown>>> {
-    const template = await this.exportResources!({ environment: options.environment, owned: options.owned });
+  async enrichLiveAttrs(options: { environment: string; stack?: string; owned?: boolean }): Promise<Record<string, Record<string, unknown>>> {
+    const template = await this.exportResources!({ environment: options.environment, stack: options.stack, owned: options.owned });
     return resolveTemplateAttrs(template);
   },