@fjall/components-infrastructure 2.30.0 → 2.30.3

package/dist/lib/resources/aws/compute/ecsImages.js

@@ -1,29 +1,7 @@
-import { CfnParameter, Stack } from "aws-cdk-lib";
 import { ContainerImage } from "aws-cdk-lib/aws-ecs";
 import { Repository } from "aws-cdk-lib/aws-ecr";
-import { imageTagParameterName } from "@fjall/util";
 import { DEFAULT_ECS_FALLBACK_IMAGE } from "./ecsConstants.js";
-function buildImageTagDescription(serviceName) {
-    return `Image tag for ECS service ${serviceName}. Set by fjall deploy to the content-hash tag.`;
-}
-function getOrCreateImageTagParameter(ctx, serviceName) {
-    const stack = Stack.of(ctx.scope);
-    const paramLogicalId = imageTagParameterName(serviceName);
-    const description = buildImageTagDescription(serviceName);
-    const existing = stack.node.tryFindChild(paramLogicalId);
-    if (existing instanceof CfnParameter) {
-        if (existing.description !== description) {
-            throw new Error(`CfnParameter logical-ID collision: "${paramLogicalId}" is already registered for a different service. ` +
-                `Distinct service names cannot share a PascalCase identifier — rename one of the conflicting services.`);
-        }
-        return existing;
-    }
-    return new CfnParameter(stack, paramLogicalId, {
-        type: "String",
-        default: "latest",
-        description
-    });
-}
+import { getOrCreateImageTagParameter } from "./imageTagParameter.js";
 export function getContainerImage(ctx, serviceName, containerConfig, serviceProps) {
     const imageSource = containerConfig.image || serviceProps.image || ctx.props.ecrRepository;
     if (!imageSource) {
@@ -36,11 +14,11 @@ export function getContainerImage(ctx, serviceName, containerConfig, serviceProp
         if (isFullRegistryUrl) {
             return ContainerImage.fromRegistry(imageSource);
         }
-        const param = getOrCreateImageTagParameter(ctx, serviceName);
+        const param = getOrCreateImageTagParameter(ctx.scope, serviceName);
         return ContainerImage.fromEcrRepository(Repository.fromRepositoryName(ctx.scope, `${serviceName}${containerConfig.name}EcrRepo`, imageSource), param.valueAsString);
     }
     if (imageSource instanceof Repository) {
-        const param = getOrCreateImageTagParameter(ctx, serviceName);
+        const param = getOrCreateImageTagParameter(ctx.scope, serviceName);
         return ContainerImage.fromEcrRepository(imageSource, param.valueAsString);
     }
     return imageSource;

package/dist/lib/resources/aws/compute/ecsSpot.d.ts

@@ -0,0 +1,75 @@
+import { ContainerImage, type RepositoryImage } from "aws-cdk-lib/aws-ecs";
+import { Connections, type IConnectable, type IVpc } from "aws-cdk-lib/aws-ec2";
+import { Construct } from "constructs";
+import { type StackBuilder } from "../base/awsStack";
+import { type SecretValue } from "aws-cdk-lib";
+import { type IManagedPolicy, PolicyDocument, Role } from "aws-cdk-lib/aws-iam";
+import { Repository } from "aws-cdk-lib/aws-ecr";
+import { type KeyValue } from "../../../types";
+export declare enum ScalingType {
+    CPU = "ECSServiceAverageCPUUtilization",
+    MEMORY = "ECSServiceAverageMemoryUtilization"
+}
+export interface ContainerSecret {
+    [key: string]: SecretValue;
+}
+type Ec2ClusterProps = {
+    ecrRepository: Repository | RepositoryImage | string;
+    clusterName: string;
+    containerEntryPoint?: string[];
+    containerCommand?: string[];
+    containerEnvironment?: KeyValue;
+    containerSecrets?: ContainerSecret;
+    containerPort?: number;
+    cpu?: number;
+    parentDomain?: string;
+    desiredCount?: number;
+    healthCheckPath?: string;
+    listenerPort?: number;
+    memoryLimitMiB?: number;
+    publicLoadBalancer?: boolean;
+    scalingType?: ScalingType;
+    serviceName: string;
+    taskRoleInlinePolicies?: {
+        [name: string]: PolicyDocument;
+    };
+    taskRoleManagedPolicies?: IManagedPolicy[];
+    vpc?: IVpc;
+};
+export default class Ec2Cluster extends Construct implements IConnectable {
+    connections: Connections;
+    private cluster;
+    private autoScalingGroup;
+    private asgSecurityGroup;
+    private asgCapacityProvider;
+    private loadBalancer;
+    private loadBalancerSecurityGroup;
+    private loadBalancerListener;
+    private executionRole;
+    private taskDefinition;
+    private containerDefinition;
+    private ec2Service;
+    private scalingPolicy;
+    private hostedZone;
+    private certificate;
+    private aRecord;
+    private secrets;
+    constructor(scope: Construct, id: string, props: Ec2ClusterProps);
+    addCluster(props: Ec2ClusterProps): void;
+    addAutoScalingGroup(props: Ec2ClusterProps): void;
+    addSecrets(props: Ec2ClusterProps): void;
+    addExecutionRole(props: Ec2ClusterProps): void;
+    addTaskDefinition(props: Ec2ClusterProps): void;
+    addContainerDefinition(props: Ec2ClusterProps): void;
+    addEc2Service(props: Ec2ClusterProps): void;
+    addScalingPolicy(props: Ec2ClusterProps): void;
+    addLoadBalancer(props: Ec2ClusterProps): void;
+    removeAutoScalingGroup(): void;
+    addLoadBalancerListener(props: Ec2ClusterProps): void;
+    addHostedZone(props: Ec2ClusterProps): void;
+    registerLoadBalancerTargets(props: Ec2ClusterProps): void;
+    getImage(props: Ec2ClusterProps): ContainerImage;
+    getTaskRole(): Role | undefined;
+    static build(id: string, props: Ec2ClusterProps): (sb: StackBuilder) => Construct;
+}
+export {};