Skip to content

chore(lambda): migrate Nx packages to 23.1.3 #5395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
edersonbrilhante wants to merge 4 commits into
base: main
Choose a base branch
from
Open

chore(lambda): migrate Nx packages to 23.1.3 #5395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
127679d
chore(lambda): migrate Nx packages to 23.1.3
edersonbrilhante Sep 8, 2026
910b8b5
Merge branch 'main' into chore/update-nx-23-migration
edersonbrilhante Sep 18, 2026
ac8edc8
chore: update packages
edersonbrilhante Sep 18, 2026
a2a5988
style: fix formatting
edersonbrilhante Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions lambdas/functions/termination-watcher/src/types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
import { EventBridgeEvent } from 'aws-lambda';

// eslint-disable-next-line @typescript-eslint/no-empty-object-type
export interface SpotInterruptionWarning<SpotTerminationDetail>
extends EventBridgeEvent<'EC2 Spot Instance Interruption Warning', SpotTerminationDetail> {}
export interface SpotInterruptionWarning<SpotTerminationDetail> extends EventBridgeEvent<
'EC2 Spot Instance Interruption Warning',
SpotTerminationDetail
> {}

interface SpotTerminationDetail {
'instance-id': string;
'instance-action': string;
}

// eslint-disable-next-line @typescript-eslint/no-empty-object-type
export interface BidEvictedEvent<BidEvictedDetail>
extends EventBridgeEvent<'AWS Service Event via CloudTrail', BidEvictedDetail> {}
export interface BidEvictedEvent<BidEvictedDetail> extends EventBridgeEvent<
'AWS Service Event via CloudTrail',
BidEvictedDetail
> {}

interface BidEvictedDetail {
eventVersion: string;
Expand Down Expand Up @@ -49,7 +53,9 @@ export interface InstanceStateChangeDetail {
}

// eslint-disable-next-line @typescript-eslint/no-empty-object-type
export interface InstanceStateChangeEvent
extends EventBridgeEvent<'EC2 Instance State-change Notification', InstanceStateChangeDetail> {}
export interface InstanceStateChangeEvent extends EventBridgeEvent<
'EC2 Instance State-change Notification',
InstanceStateChangeDetail
> {}

export type TerminationWatcherEvent = SpotInterruptionWarning<SpotTerminationDetail> | InstanceStateChangeEvent;
5 changes: 1 addition & 4 deletions lambdas/libs/compute-providers/aws/ec2/src/runner-create-result.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
export type Ec2RunnerFailureCode =
| `aws-name:${string}`
| `aws-code:${string}`
| `aws-fault:${'client' | 'server'}`
| `aws-http:${number}`;
`aws-name:${string}` | `aws-code:${string}` | `aws-fault:${'client' | 'server'}` | `aws-http:${number}`;

export interface Ec2RunnerCreateResult {
instances: string[];
Expand Down
15 changes: 6 additions & 9 deletions lambdas/libs/compute-providers/aws/ec2/src/runners.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,7 @@ function sanitizeAllocationStrategy(
): SpotAllocationStrategy | FleetOnDemandAllocationStrategy {
const validStrategies = targetCapacityType === 'spot' ? SPOT_ALLOCATION_STRATEGIES : ON_DEMAND_ALLOCATION_STRATEGIES;
return (validStrategies.includes(strategy) ? strategy : 'lowest-price') as
| SpotAllocationStrategy
| FleetOnDemandAllocationStrategy;
SpotAllocationStrategy | FleetOnDemandAllocationStrategy;
}

function generateFleetOverrides(
Expand All @@ -289,13 +288,11 @@ function generateFleetOverrides(
const amiIdToUse = ec2OverrideConfig?.ImageId ?? amiId;

if (ec2OverrideConfig?.InstanceRequirements) {
return subnetsToUse.map(
(subnetId): FleetLaunchTemplateOverridesRequest => ({
SubnetId: subnetId,
ImageId: amiIdToUse,
...ec2OverrideConfig,
}),
);
return subnetsToUse.map((subnetId): FleetLaunchTemplateOverridesRequest => ({
SubnetId: subnetId,
ImageId: amiIdToUse,
...ec2OverrideConfig,
}));
}

const instanceTypesToUse = ec2OverrideConfig?.InstanceType ? [ec2OverrideConfig.InstanceType] : instancesTypes;
Expand Down
28 changes: 11 additions & 17 deletions lambdas/nx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,28 @@
}
},
{
"plugin": "@nx/vite/plugin",
"plugin": "@nx/vite/plugin"
},
{
"plugin": "@nx/vitest",
"options": {
"targetName": "test"
"testTargetName": "test"
}
}
],
"targetDefaults": {
"build": {
"inputs": [
"{projectRoot}/src/index.ts"
],
"dependsOn": [
"default",
"^default",
"^build"
],
"inputs": ["{projectRoot}/src/index.ts"],
"dependsOn": ["default", "^default", "^build"],
"executor": "@nx/workspace:run-commands",
"cache": true
},
"dist": {
"outputs": [
"{projectRoot}/dist/**/*"
],
"dependsOn": [
"build"
],
"outputs": ["{projectRoot}/dist/**/*"],
"dependsOn": ["build"],
"executor": "@nx/workspace:run-commands",
"cache": true
}
}
},
"analytics": false
}
9 changes: 5 additions & 4 deletions lambdas/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@
},
"devDependencies": {
"@eslint/eslintrc": "^3.3.1",
"@nx/eslint": "22.5.4",
"@nx/js": "^22.5.4",
"@nx/vite": "^22.5.4",
"@nx/eslint": "23.1.3",
"@nx/js": "23.1.3",
"@nx/vite": "23.1.3",
"@nx/vitest": "23.1.3",
"@swc-node/register": "~1.11.1",
"@swc/core": "~1.15.8",
"@swc/helpers": "~0.5.18",
Expand All @@ -38,7 +39,7 @@
"chalk": "^5.6.2",
"eslint": "^9.39.2",
"eslint-plugin-prettier": "5.5.4",
"nx": "22.3.3",
"nx": "23.1.3",
"prettier": "^3.6.2",
"ts-node": "^10.9.2",
"ts-node-dev": "^2.0.0",
Expand Down
Loading
Loading