@kensio/yulin 1.21.3 → 1.21.4

package/dist/service/cloudformation/template/condition/sim-cfn-condition-expression.d.ts

@@ -16,9 +16,9 @@ interface SimCfnConditionExpressionProperties {
  *
  * The tree is `Fn::Equals` at the leaves and `Fn::And`, `Fn::Or` and `Fn::Not`
  * above them, with `{ "Condition": "OtherCondition" }` handing off to the
- * Condition of that name. Where that other Condition comes from is the
- * evaluator's business, so it arrives as a reader rather than being looked up
- * here.
+ * Condition of that name. `Fn::If` picks one of two conditions by the answer to
+ * a third. Where a named Condition comes from is the evaluator's business, so it
+ * arrives as a reader rather than being looked up here.
  *
  * A function name this simulation has no behaviour for is refused rather than
  * read as false, which would deploy a Stack the template did not describe. The
@@ -39,6 +39,15 @@ export declare class SimCfnConditionExpression {
     evaluate(expression: SimCfnTemplateValue): boolean;
     private apply;
     private operands;
+    /**
+     * Evaluate whichever of an `Fn::If`'s two conditions its Condition selects.
+     *
+     * Only the selected one is evaluated, as CloudFormation resolves only the
+     * branch it takes. The name goes through the same reader a
+     * `{ "Condition": ... }` reference uses, so an `Fn::If` that closes a cycle
+     * is caught by the chain the evaluator carries rather than recursing.
+     */
+    private selected;
     private negated;
 }
 export {};

package/dist/service/cloudformation/template/condition/sim-cfn-condition-expression.js

@@ -5,9 +5,9 @@ import { SimCfnValueShape, } from "../value/sim-cfn-value-shape.js";
  *
  * The tree is `Fn::Equals` at the leaves and `Fn::And`, `Fn::Or` and `Fn::Not`
  * above them, with `{ "Condition": "OtherCondition" }` handing off to the
- * Condition of that name. Where that other Condition comes from is the
- * evaluator's business, so it arrives as a reader rather than being looked up
- * here.
+ * Condition of that name. `Fn::If` picks one of two conditions by the answer to
+ * a third. Where a named Condition comes from is the evaluator's business, so it
+ * arrives as a reader rather than being looked up here.
  *
  * A function name this simulation has no behaviour for is refused rather than
  * read as false, which would deploy a Stack the template did not describe. The
@@ -54,6 +54,9 @@ export class SimCfnConditionExpression {
         if (functionName === "Fn::Not") {
             return this.negated(value);
         }
+        if (functionName === "Fn::If") {
+            return this.selected(value);
+        }
         if (functionName === "Condition") {
             return this.named(this.shape.string(value, `${this.label} Condition reference`));
         }
@@ -67,6 +70,29 @@ export class SimCfnConditionExpression {
         }
         return listed.map((operand) => this.evaluate(operand));
     }
+    /**
+     * Evaluate whichever of an `Fn::If`'s two conditions its Condition selects.
+     *
+     * Only the selected one is evaluated, as CloudFormation resolves only the
+     * branch it takes. The name goes through the same reader a
+     * `{ "Condition": ... }` reference uses, so an `Fn::If` that closes a cycle
+     * is caught by the chain the evaluator carries rather than recursing.
+     */
+    selected(value) {
+        const listed = this.shape.list(value, `${this.label} Fn::If`);
+        if (listed.length !== 3) {
+            throw this.error(`${this.label} Fn::If must be a list of a Condition name and two ` +
+                "conditions");
+        }
+        const conditionName = listed[0];
+        const whenTrue = listed[1];
+        const whenFalse = listed[2];
+        assertDefined(conditionName, `${this.label} Fn::If Condition name`);
+        assertDefined(whenTrue, `${this.label} Fn::If condition if true`);
+        assertDefined(whenFalse, `${this.label} Fn::If condition if false`);
+        const selected = this.named(this.shape.string(conditionName, `${this.label} Fn::If Condition name`));
+        return this.evaluate(selected ? whenTrue : whenFalse);
+    }
     negated(value) {
         const listed = this.shape.list(value, `${this.label} Fn::Not`);
         if (listed.length !== 1) {

package/dist/service/cloudformation/template/condition/sim-cfn-output-conditions.d.ts

@@ -0,0 +1,28 @@
+import type { SimCfnTemplateValueRecord } from "../value/sim-cfn-template-value.js";
+import type { SimCfnConditions } from "./sim-cfn-conditions.js";
+interface SimCfnOutputConditionsProperties {
+    readonly conditions: SimCfnConditions;
+    readonly stackName?: string | undefined;
+}
+/**
+ * Applies the Output-level `Condition` attribute to a template's Outputs.
+ *
+ * An Output whose Condition is false is left out of the Stack altogether. It is
+ * never resolved, so it is absent from `stack.outputs` and from `DescribeStacks`,
+ * and the export name it carries is never published for another Stack to import.
+ *
+ * Naming a Condition the template does not define fails the deployment, the way
+ * it does on a Resource. An Output that quietly disappeared because its
+ * Condition was misspelled is worse than a Stack that refuses to deploy.
+ */
+export declare class SimCfnOutputConditions {
+    private readonly conditions;
+    private readonly stackName;
+    constructor(properties: SimCfnOutputConditionsProperties);
+    /**
+     * Whether the template asked for this Output but its Condition is false.
+     */
+    excludes(outputKey: string, outputTemplate: SimCfnTemplateValueRecord): boolean;
+    private error;
+}
+export {};

package/dist/service/cloudformation/template/condition/sim-cfn-output-conditions.js

@@ -0,0 +1,39 @@
+/**
+ * Applies the Output-level `Condition` attribute to a template's Outputs.
+ *
+ * An Output whose Condition is false is left out of the Stack altogether. It is
+ * never resolved, so it is absent from `stack.outputs` and from `DescribeStacks`,
+ * and the export name it carries is never published for another Stack to import.
+ *
+ * Naming a Condition the template does not define fails the deployment, the way
+ * it does on a Resource. An Output that quietly disappeared because its
+ * Condition was misspelled is worse than a Stack that refuses to deploy.
+ */
+export class SimCfnOutputConditions {
+    conditions;
+    stackName;
+    constructor(properties) {
+        this.conditions = properties.conditions;
+        this.stackName = properties.stackName;
+    }
+    /**
+     * Whether the template asked for this Output but its Condition is false.
+     */
+    excludes(outputKey, outputTemplate) {
+        const conditionName = outputTemplate["Condition"];
+        if (conditionName === undefined) {
+            return false;
+        }
+        if (typeof conditionName !== "string") {
+            throw this.error(`Output ${outputKey} Condition must be a string`);
+        }
+        if (!this.conditions.has(conditionName)) {
+            throw this.error(`Output ${outputKey} names Condition ${conditionName}, which the ` +
+                "template does not define");
+        }
+        return !this.conditions.value(conditionName);
+    }
+    error(detail) {
+        return new Error(`Sim CloudFormation Stack ${this.stackName ?? "unknown"} ${detail}`);
+    }
+}

package/dist/service/cloudformation/template/node/fn/find-in-map/sim-cfn-fn-find-in-map.d.ts

@@ -1,14 +1,26 @@
 import { SimCfnNode } from "../../sim-cfn-node.js";
 import type { SimCfnResolveContext } from "../../../resolve/sim-cfn-resolve-context.js";
 import type { SimCfnTemplateValue } from "../../../value/sim-cfn-template-value.js";
+interface SimCfnFnFindInMapProperties {
+    readonly mapName: SimCfnNode;
+    readonly topLevelKey: SimCfnNode;
+    readonly secondLevelKey: SimCfnNode;
+    readonly defaultValue?: SimCfnNode | undefined;
+}
 /**
  * Simulated CloudFormation `Fn::FindInMap` intrinsic function.
+ *
+ * The fourth argument a template can carry, `{ "DefaultValue": ... }`, answers
+ * a lookup the Mappings section has no value for. Without it a missing map or
+ * key fails the Resource, because a template that reads a key it never wrote is
+ * a mistake worth being told about.
  */
 export declare class SimCfnFnFindInMap extends SimCfnNode {
     private readonly mapName;
     private readonly topLevelKey;
     private readonly secondLevelKey;
-    constructor(mapName: SimCfnNode, topLevelKey: SimCfnNode, secondLevelKey: SimCfnNode);
+    private readonly defaultValue;
+    constructor(properties: SimCfnFnFindInMapProperties);
     /**
      * Resolve a value from the template Mappings section.
      */
@@ -17,6 +29,18 @@ export declare class SimCfnFnFindInMap extends SimCfnNode {
      * Collect referenced names from every key expression.
      */
     referencedNames(): string[];
+    /**
+     * The `DefaultValue` a lookup falls back to, or a failure naming the path.
+     */
+    private missing;
+    /**
+     * The expression left for a later pass, once a key can be a string.
+     *
+     * The `DefaultValue` goes back with it, so the lookup that eventually reads
+     * the Mappings still has the answer for a key that is not there.
+     */
+    private unresolved;
     private resolveKey;
     private isResolvedKey;
 }
+export {};

package/dist/service/cloudformation/template/node/fn/find-in-map/sim-cfn-fn-find-in-map.js

@@ -1,19 +1,25 @@
 import { SimCfnNode } from "../../sim-cfn-node.js";
 import { isRecord } from "../../../../../../util/type-guard/record.js";
-import { assertDefined } from "../../../../../../util/type-guard/defined.js";
 import { isSimCfnUnresolvedExpression } from "../../../value/sim-cfn-unresolved-expression.js";
 /**
  * Simulated CloudFormation `Fn::FindInMap` intrinsic function.
+ *
+ * The fourth argument a template can carry, `{ "DefaultValue": ... }`, answers
+ * a lookup the Mappings section has no value for. Without it a missing map or
+ * key fails the Resource, because a template that reads a key it never wrote is
+ * a mistake worth being told about.
  */
 export class SimCfnFnFindInMap extends SimCfnNode {
     mapName;
     topLevelKey;
     secondLevelKey;
-    constructor(mapName, topLevelKey, secondLevelKey) {
+    defaultValue;
+    constructor(properties) {
         super();
-        this.mapName = mapName;
-        this.topLevelKey = topLevelKey;
-        this.secondLevelKey = secondLevelKey;
+        this.mapName = properties.mapName;
+        this.topLevelKey = properties.topLevelKey;
+        this.secondLevelKey = properties.secondLevelKey;
+        this.defaultValue = properties.defaultValue;
     }
     /**
      * Resolve a value from the template Mappings section.
@@ -25,19 +31,18 @@ export class SimCfnFnFindInMap extends SimCfnNode {
         if (!this.isResolvedKey(mapName) ||
             !this.isResolvedKey(topLevelKey) ||
             !this.isResolvedKey(secondLevelKey)) {
-            return {
-                "Fn::FindInMap": [mapName, topLevelKey, secondLevelKey],
-            };
+            return this.unresolved([mapName, topLevelKey, secondLevelKey], context);
         }
         // oxlint-disable-next-line security/detect-object-injection
         const topLevel = context.mappings?.[mapName]?.[topLevelKey];
-        /* v8 ignore if -- defensive */
         if (!isRecord(topLevel)) {
-            throw new Error(`Sim CloudFormation Fn::FindInMap could not find map ${mapName}.${topLevelKey}`);
+            return this.missing(`${mapName}.${topLevelKey}`, context);
         }
         // oxlint-disable-next-line security/detect-object-injection
         const value = topLevel[secondLevelKey];
-        assertDefined(value, `Sim CloudFormation Fn::FindInMap could not find map ${mapName}.${topLevelKey}.${secondLevelKey}`);
+        if (value === undefined) {
+            return this.missing(`${mapName}.${topLevelKey}.${secondLevelKey}`, context);
+        }
         return value;
     }
     /**
@@ -49,8 +54,35 @@ export class SimCfnFnFindInMap extends SimCfnNode {
             ...this.mapName.referencedNames(),
             ...this.topLevelKey.referencedNames(),
             ...this.secondLevelKey.referencedNames(),
+            ...(this.defaultValue?.referencedNames() ?? []),
         ];
     }
+    /**
+     * The `DefaultValue` a lookup falls back to, or a failure naming the path.
+     */
+    missing(path, context) {
+        if (this.defaultValue !== undefined) {
+            return this.defaultValue.resolve(context);
+        }
+        throw new Error(`Sim CloudFormation Fn::FindInMap could not find map ${path}`);
+    }
+    /**
+     * The expression left for a later pass, once a key can be a string.
+     *
+     * The `DefaultValue` goes back with it, so the lookup that eventually reads
+     * the Mappings still has the answer for a key that is not there.
+     */
+    unresolved(keys, context) {
+        if (this.defaultValue === undefined) {
+            return { "Fn::FindInMap": [...keys] };
+        }
+        return {
+            "Fn::FindInMap": [
+                ...keys,
+                { DefaultValue: this.defaultValue.resolve(context) },
+            ],
+        };
+    }
     resolveKey(node, context) {
         const value = node.resolve(context);
         if (typeof value === "string") {

package/dist/service/cloudformation/template/parse/fn/find-in-map/sim-cfn-fn-find-in-map-parser.d.ts

@@ -9,6 +9,13 @@ export declare class SimCfnFnFindInMapParser {
     constructor(valueParser: SimCfnValueParser);
     /**
      * Parse and validate the value inside a Fn::FindInMap expression.
+     *
+     * The optional fourth argument is the `{ "DefaultValue": ... }` object
+     * CloudFormation answers a missing map or key with.
      */
     parse(value: SimCfnTemplateValue): SimCfnFunctionFindInMap;
+    /**
+     * Parse the fourth argument, which the template need not carry.
+     */
+    private defaultValue;
 }

package/dist/service/cloudformation/template/parse/fn/find-in-map/sim-cfn-fn-find-in-map-parser.js

@@ -1,5 +1,6 @@
 import { SimCfnFnFindInMap as SimCfnFunctionFindInMap } from "../../../node/fn/find-in-map/sim-cfn-fn-find-in-map.js";
 import { assertDefined } from "../../../../../../util/type-guard/defined.js";
+import { isRecord } from "../../../../../../util/type-guard/record.js";
 /**
  * Parses CloudFormation Fn::FindInMap values.
  */
@@ -10,10 +11,14 @@ export class SimCfnFnFindInMapParser {
     }
     /**
      * Parse and validate the value inside a Fn::FindInMap expression.
+     *
+     * The optional fourth argument is the `{ "DefaultValue": ... }` object
+     * CloudFormation answers a missing map or key with.
      */
     parse(value) {
-        if (!Array.isArray(value) || value.length !== 3) {
-            throw new Error("Sim CloudFormation Fn::FindInMap value must be [mapName, topLevelKey, secondLevelKey]");
+        if (!Array.isArray(value) || value.length < 3 || value.length > 4) {
+            throw new Error("Sim CloudFormation Fn::FindInMap value must be [mapName, " +
+                'topLevelKey, secondLevelKey] with an optional { "DefaultValue": ... }');
         }
         const mapName = value[0];
         const topLevelKey = value[1];
@@ -21,6 +26,27 @@ export class SimCfnFnFindInMapParser {
         assertDefined(mapName, "Fn::FindInMap map name");
         assertDefined(topLevelKey, "Fn::FindInMap top level key");
         assertDefined(secondLevelKey, "Fn::FindInMap second level key");
-        return new SimCfnFunctionFindInMap(this.valueParser.parse(mapName), this.valueParser.parse(topLevelKey), this.valueParser.parse(secondLevelKey));
+        return new SimCfnFunctionFindInMap({
+            mapName: this.valueParser.parse(mapName),
+            topLevelKey: this.valueParser.parse(topLevelKey),
+            secondLevelKey: this.valueParser.parse(secondLevelKey),
+            defaultValue: this.defaultValue(value[3]),
+        });
+    }
+    /**
+     * Parse the fourth argument, which the template need not carry.
+     */
+    defaultValue(value) {
+        if (value === undefined) {
+            return undefined;
+        }
+        if (!isRecord(value) ||
+            Object.keys(value).length !== 1 ||
+            !("DefaultValue" in value)) {
+            throw new Error('Sim CloudFormation Fn::FindInMap fourth value must be { "DefaultValue": ... }');
+        }
+        const defaultValue = value["DefaultValue"];
+        assertDefined(defaultValue, "Fn::FindInMap DefaultValue");
+        return this.valueParser.parse(defaultValue);
     }
 }

package/dist/service/cloudformation/template/sim-cfn-command-template.d.ts

@@ -0,0 +1,40 @@
+import type { SimAws } from "../../aws/sim-aws.js";
+import type { SimAwsAccountRegionScope } from "../../aws/sim-aws-account-region-scope.js";
+import type { SimCloudFormationStackName } from "../stack/sim-cfn-stack.type.js";
+import type { SimCfnExports } from "../export/sim-cfn-exports.js";
+import type { SimCloudFormationParameterInput } from "../parameters/sim-cfn-parameters.type.js";
+import { type CfnTemplateBodyRecord, SimCfnTemplate } from "./sim-cfn-template.js";
+interface SimCfnCommandTemplateContext {
+    readonly simAws: SimAws;
+    readonly accountRegionScope: SimAwsAccountRegionScope;
+    readonly stackName: SimCloudFormationStackName;
+    /** The ID of the Stack the template is for, where the Stack has one yet. */
+    readonly stackId?: string | undefined;
+    /** The command input the template's Parameter values are read from. */
+    readonly input: SimCloudFormationParameterInput;
+    readonly exports?: SimCfnExports | undefined;
+}
+interface SimCfnCommandTemplateProperties extends SimCfnCommandTemplateContext {
+    readonly templateBody: string;
+}
+interface SimCfnHeldTemplateProperties extends SimCfnCommandTemplateContext {
+    /** The parsed template the Stack is already deployed from. */
+    readonly template: CfnTemplateBodyRecord;
+}
+/**
+ * The template a Stack command was sent, parsed against its Parameter values.
+ *
+ * A Parameter of type `AWS::SSM::Parameter::Value` reads simulated Parameter
+ * Store, so parsing needs the simulation the command arrived at as well as the
+ * body it carried.
+ */
+export declare function simCfnCommandTemplate(properties: SimCfnCommandTemplateProperties): SimCfnTemplate;
+/**
+ * The template a Stack already holds, read against new Parameter values.
+ *
+ * What `UsePreviousTemplate` updates from. The Stack holds the template parsed
+ * rather than as a body, so this takes the parsed one straight back rather than
+ * putting it through the parsing and SAM expansion it has already been through.
+ */
+export declare function simCfnHeldTemplate(properties: SimCfnHeldTemplateProperties): SimCfnTemplate;
+export {};

package/dist/service/cloudformation/template/sim-cfn-command-template.js

@@ -0,0 +1,45 @@
+import { SimCfnParameters } from "../parameters/sim-cfn-parameters.js";
+import { makeSimCfnParameterStore } from "../parameters/store/sim-cfn-parameter-store.js";
+import { SimCfnTemplate, } from "./sim-cfn-template.js";
+/**
+ * The template a Stack command was sent, parsed against its Parameter values.
+ *
+ * A Parameter of type `AWS::SSM::Parameter::Value` reads simulated Parameter
+ * Store, so parsing needs the simulation the command arrived at as well as the
+ * body it carried.
+ */
+export function simCfnCommandTemplate(properties) {
+    const { stackName, stackId, accountRegionScope, exports } = properties;
+    return SimCfnTemplate.fromTemplateBody(properties.templateBody, {
+        stackName,
+        stackId,
+        parameters: commandParameters(properties),
+        accountRegionScope,
+        exports,
+    });
+}
+/**
+ * The template a Stack already holds, read against new Parameter values.
+ *
+ * What `UsePreviousTemplate` updates from. The Stack holds the template parsed
+ * rather than as a body, so this takes the parsed one straight back rather than
+ * putting it through the parsing and SAM expansion it has already been through.
+ */
+export function simCfnHeldTemplate(properties) {
+    const { template, stackName, stackId, accountRegionScope, exports } = properties;
+    return new SimCfnTemplate({
+        template,
+        stackName,
+        stackId,
+        parameters: commandParameters(properties),
+        accountRegionScope,
+        exports,
+    });
+}
+function commandParameters(properties) {
+    const { simAws, accountRegionScope, stackName } = properties;
+    return SimCfnParameters.fromInput(properties.input, {
+        stackName,
+        parameterStore: makeSimCfnParameterStore({ simAws, accountRegionScope }),
+    });
+}

package/dist/service/cloudformation/template/sim-cfn-template.d.ts

@@ -31,11 +31,13 @@ interface SimCfnTemplateProperties {
     readonly template: CfnTemplateBodyRecord;
     readonly parameters?: SimCfnParameters | undefined;
     readonly stackName?: string | undefined;
+    readonly stackId?: string | undefined;
     readonly accountRegionScope?: SimAwsAccountRegionScope | undefined;
     readonly exports?: SimCfnExports | undefined;
 }
 interface SimCfnTemplateFromBodyProperties {
     readonly stackName?: string | undefined;
+    readonly stackId?: string | undefined;
     readonly parameters?: SimCfnParameters | undefined;
     readonly accountRegionScope?: SimAwsAccountRegionScope | undefined;
     readonly exports?: SimCfnExports | undefined;
@@ -48,6 +50,8 @@ interface SimCfnTemplateFromBodyProperties {
 export declare class SimCfnTemplate {
     readonly template: CfnTemplateBodyRecord;
     readonly stackName: string | undefined;
+    /** The unique ID of the Stack this template is being deployed as. */
+    readonly stackId: string | undefined;
     readonly parameters: SimCfnParameters;
     /** The export names a Stack deployed from this template can import. */
     readonly exports: SimCfnExports | undefined;
@@ -81,6 +85,9 @@ export declare class SimCfnTemplate {
      *
      * Resource-backed intrinsic functions are left unresolved here because
      * Outputs are resolved after Resource creation.
+     *
+     * An Output whose `Condition` attribute is false is left out entirely, so it
+     * never reaches the Stack's Outputs and publishes no export.
      */
     outputTemplates(): SimCfnOutputTemplateRecord[];
     /**

package/dist/service/cloudformation/template/sim-cfn-template.js

@@ -5,6 +5,7 @@ import { SimCfnTemplateBodyValidator } from "./sim-cfn-template-body-validator.j
 import { parseSimCfnTemplateBody } from "./sim-cfn-template-body-parse.js";
 import { SimCfnPseudoParameters } from "../parameters/pseudo/sim-cfn-pseudo-parameters.js";
 import { SimCfnConditionEvaluator } from "./condition/sim-cfn-condition-evaluator.js";
+import { SimCfnOutputConditions } from "./condition/sim-cfn-output-conditions.js";
 import { SimCfnResourceConditions } from "./condition/sim-cfn-resource-conditions.js";
 import { samExpandedTemplate } from "../sam/sim-cfn-sam-expansion.js";
 /**
@@ -15,15 +16,18 @@ import { samExpandedTemplate } from "../sam/sim-cfn-sam-expansion.js";
 export class SimCfnTemplate {
     template;
     stackName;
+    /** The unique ID of the Stack this template is being deployed as. */
+    stackId;
     parameters;
     /** The export names a Stack deployed from this template can import. */
     exports;
     accountRegionScope;
     evaluatedConditions;
     constructor(properties) {
-        const { template, parameters, stackName, accountRegionScope, exports } = properties;
+        const { template, parameters, stackName, stackId, accountRegionScope, exports, } = properties;
         this.template = template;
         this.stackName = stackName;
+        this.stackId = stackId;
         this.accountRegionScope = accountRegionScope;
         this.exports = exports;
         const validator = new SimCfnTemplateBodyValidator({ template, stackName });
@@ -49,6 +53,7 @@ export class SimCfnTemplate {
             template: samExpandedTemplate(template),
             parameters: properties.parameters,
             stackName: properties.stackName,
+            stackId: properties.stackId,
             accountRegionScope: properties.accountRegionScope,
             exports: properties.exports,
         });
@@ -86,13 +91,21 @@ export class SimCfnTemplate {
      *
      * Resource-backed intrinsic functions are left unresolved here because
      * Outputs are resolved after Resource creation.
+     *
+     * An Output whose `Condition` attribute is false is left out entirely, so it
+     * never reaches the Stack's Outputs and publishes no export.
      */
     outputTemplates() {
         const valueResolver = this.valueResolver();
+        const outputConditions = new SimCfnOutputConditions({
+            conditions: this.conditions(),
+            stackName: this.stackName,
+        });
         return Object.entries(this.template.Outputs ?? {})
             .filter((entry) => {
             return isRecord(entry[1]);
         })
+            .filter(([outputKey, outputTemplate]) => !outputConditions.excludes(outputKey, outputTemplate))
             .map(([outputKey, outputTemplate]) => ({
             outputKey,
             template: valueResolver.resolveRecordFor(`Sim CloudFormation Output ${outputKey}`, outputTemplate),
@@ -107,6 +120,7 @@ export class SimCfnTemplate {
         return new SimCfnPseudoParameters({
             accountRegionScope: this.accountRegionScope,
             stackName: this.stackName,
+            stackId: this.stackId,
         });
     }
     /**

package/dist/service/cloudfront/origin/custom/sim-cf-custom-origin-request.d.ts

@@ -1,8 +1,10 @@
+import type { SimCloudFrontBehavior } from "../../behaviour/sim-cloud-front-behavior.js";
 import type { SimCfForwardedToOrigin } from "../../origin-request-policy/sim-cf-forwarded-to-origin.js";
 interface SimCfCustomOriginRequestProperties {
     readonly domainName: string;
     readonly originPath: string;
     readonly request: Request;
+    readonly viewerProtocolPolicy?: SimCloudFrontBehavior["viewerProtocolPolicy"] | undefined;
     /**
      * What the Behavior's cache policy and origin request policy carry to the
      * Origin between them.

package/dist/service/cloudfront/origin/custom/sim-cf-custom-origin-request.js

@@ -1,4 +1,5 @@
 import { SimAwsLocalUrl } from "../../../../serve/http/url/sim-aws-local-url.js";
+import { isSimAwsLocalRequest, simAwsRequestHostname, } from "../../../../serve/http/url/sim-aws-request-hostname.js";
 import { stripSimAwsControlHeaders } from "../../../iam/request/sim-aws-control-headers.js";
 import { simCfForwardedOriginHeaders, simCfForwardedOriginSearch, } from "./sim-cf-custom-origin-forwarding.js";
 /**
@@ -23,6 +24,7 @@ export function simCfCustomOriginRequest(properties) {
     originUrl.pathname = originRequestPath(properties.originPath, viewerUrl.pathname);
     originUrl.search = simCfForwardedOriginSearch(viewerUrl.search, forwarded);
     const headers = simCfForwardedOriginHeaders(request.headers, forwarded);
+    applyAwsFacingViewerOrigin(headers, request, properties.viewerProtocolPolicy);
     headers.set("host", originUrl.host);
     // Who the Origin request is from is the Origin's business, not the viewer's,
     // so a viewer's own control headers are dropped before the Origin's are
@@ -51,6 +53,53 @@ export function simCfCustomOriginRequest(properties) {
         signal: request.signal,
     });
 }
+/**
+ * Replace the local same-origin value a browser sends with the origin the
+ * viewer would use against CloudFront.
+ *
+ * https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/RequestAndResponseBehaviorCustomOrigin.html
+ */
+function applyAwsFacingViewerOrigin(headers, viewerRequest, viewerProtocolPolicy) {
+    const value = headers.get("origin");
+    if (value === null || !isSimAwsLocalRequest(viewerRequest)) {
+        return;
+    }
+    const origin = originUrl(value);
+    if (origin === undefined || origin.origin !== viewerOrigin(viewerRequest)) {
+        return;
+    }
+    origin.hostname = simAwsRequestHostname(viewerRequest);
+    origin.port = "";
+    if (viewerProtocolPolicy === "redirect-to-https" ||
+        viewerProtocolPolicy === "https-only") {
+        origin.protocol = "https:";
+    }
+    headers.set("origin", origin.origin);
+}
+/**
+ * The local origin the viewer used, including the Host header when it differs
+ * from the Request URL.
+ */
+function viewerOrigin(request) {
+    const url = new URL(request.url);
+    const host = request.headers.get("host");
+    if (host !== null) {
+        url.host = host;
+    }
+    return url.origin;
+}
+/**
+ * Read a serialized Origin without rejecting the request when it is `null` or
+ * malformed. CloudFront forwards those values unchanged.
+ */
+function originUrl(value) {
+    try {
+        return new URL(value);
+    }
+    catch {
+        return undefined;
+    }
+}
 /**
  * Prefix the Origin path to the request path, as CloudFront does.
  */

package/dist/service/cloudfront/origin/custom/sim-cloudfront-custom-origin.js

@@ -60,6 +60,7 @@ export class SimCloudFrontCustomOrigin {
             domainName: this.domainName,
             originPath: this.originPath,
             request: request.req,
+            viewerProtocolPolicy: request.behavior.viewerProtocolPolicy,
             forwarded: simCfBehaviorForwardedToOrigin(request.behavior, this.policies),
             customHeaders: this.customHeaders,
             signingHeaders: this.signer.forRequest(request),

package/dist/service/cloudfront/origin/s3/sim-cf-s3-origin-responses.js

@@ -21,6 +21,7 @@ export class SimCfS3OriginResponses {
     foundObject(object, request) {
         const headers = simS3ObjectResponseHeaders({
             metadata: object.metadata.values,
+            userMetadata: object.metadata.userDefined,
             bodyLength: object.body.length,
             etag: simS3QuotedETag(object.etag),
             lastModified: object.lastModified,

package/dist/service/cognito/serve/page/sim-cognito-provider-page.js

@@ -44,7 +44,7 @@ export class SimCognitoProviderPage {
      */
     claimFields(provider) {
         return simCognitoMappedClaimNames(provider)
-            .map((claimName) => this.markup.field(`${simCognitoClaimFieldPrefix}${claimName}`, `${claimName} claim`, "text", simCognitoDefaultClaim(claimName)))
+            .map((claimName) => this.markup.field(`${simCognitoClaimFieldPrefix}${claimName}`, `${claimName} claim`, "text", simCognitoDefaultClaim(provider, claimName)))
             .join("");
     }
 }