@fjall/components-infrastructure 3.0.0 → 3.1.0

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

@@ -151,6 +151,9 @@ export class Ec2Instance extends Construct {
             ...(props.capacityRebalance !== undefined && {
                 capacityRebalance: props.capacityRebalance
             }),
+            ...(props.maxInstanceLifetime !== undefined && {
+                maxInstanceLifetime: props.maxInstanceLifetime
+            }),
             cooldown: Duration.seconds(60),
             groupMetrics: [GroupMetrics.all()],
             ...(resolvedUpdatePolicy !== undefined && {
@@ -165,7 +168,7 @@ export class Ec2Instance extends Construct {
                 TerminationPolicy.OLDEST_LAUNCH_CONFIGURATION,
                 TerminationPolicy.CLOSEST_TO_NEXT_INSTANCE_HOUR
             ],
-            ssmSessionPermissions: true
+            ssmSessionPermissions: props.ssmSessionPermissions ?? true
         };
         // Support spot instances via mixed instances policy
         if (props.spotCapacityPercentage !== undefined &&
@@ -262,6 +265,22 @@ export class Ec2Instance extends Construct {
     }
 }
 function validateEc2InstanceProps(props) {
+    if (props.spotCapacityPercentage !== undefined) {
+        if (!Number.isInteger(props.spotCapacityPercentage) ||
+            props.spotCapacityPercentage < 0 ||
+            props.spotCapacityPercentage > 100) {
+            throw new Error(`Ec2Instance.spotCapacityPercentage must be an integer between 0 and 100; got ${props.spotCapacityPercentage}`);
+        }
+    }
+    if (props.minCapacity !== undefined &&
+        (!Number.isInteger(props.minCapacity) || props.minCapacity < 0)) {
+        throw new Error(`Ec2Instance.minCapacity must be a non-negative integer; got ${props.minCapacity}`);
+    }
+    if (props.maxCapacity !== undefined &&
+        props.minCapacity !== undefined &&
+        props.maxCapacity < props.minCapacity) {
+        throw new Error(`Ec2Instance.maxCapacity (${props.maxCapacity}) must be >= minCapacity (${props.minCapacity})`);
+    }
     if (props.persistentDataVolume !== undefined) {
         const azs = props.vpcSubnets?.availabilityZones;
         if (azs === undefined || azs.length !== 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fjall/components-infrastructure",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
   "bin": {
@@ -67,8 +67,8 @@
   },
   "dependencies": {
     "@aws-sdk/client-organizations": "^3.1038.0",
-    "@fjall/generator": "^3.0.0",
-    "@fjall/util": "^3.0.0",
+    "@fjall/generator": "^3.1.0",
+    "@fjall/util": "^3.1.0",
     "constructs": "^10.6.0"
   },
   "overrides": {
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "gitHead": "848a386e3e2244401b76faabd02818c682d231e8"
+  "gitHead": "0f27cc5e260fdf218d33de546ba8610be89e1d81"
 }