Skip to content

Commit 239dcf2

Browse files
style: fix formatting issues
1 parent e737fab commit 239dcf2

3 files changed

Lines changed: 27 additions & 18 deletions

File tree

lambdas/functions/control-plane/src/aws/runners.d.ts

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
import { DefaultTargetCapacityType, InstanceRequirementsRequest, SpotAllocationStrategy, _InstanceType, Placement, FleetBlockDeviceMappingRequest } from '@aws-sdk/client-ec2';
1+
import {
2+
DefaultTargetCapacityType,
3+
InstanceRequirementsRequest,
4+
SpotAllocationStrategy,
5+
_InstanceType,
6+
Placement,
7+
FleetBlockDeviceMappingRequest,
8+
} from '@aws-sdk/client-ec2';
29

310
export type RunnerType = 'Org' | 'Repo';
411

@@ -30,17 +37,17 @@ export interface ListRunnerFilters {
3037
}
3138

3239
export interface Ec2OverrideConfig {
33-
InstanceType?: _InstanceType
34-
MaxPrice?: string
35-
SubnetId?: string
36-
AvailabilityZone?: string
37-
WeightedCapacity?: number
38-
Priority?: number
39-
Placement?: Placement
40-
BlockDeviceMappings?: FleetBlockDeviceMappingRequest[]
41-
InstanceRequirements?: InstanceRequirementsRequest
42-
ImageId?: string
43-
AvailabilityZoneId?: string
40+
InstanceType?: _InstanceType;
41+
MaxPrice?: string;
42+
SubnetId?: string;
43+
AvailabilityZone?: string;
44+
WeightedCapacity?: number;
45+
Priority?: number;
46+
Placement?: Placement;
47+
BlockDeviceMappings?: FleetBlockDeviceMappingRequest[];
48+
InstanceRequirements?: InstanceRequirementsRequest;
49+
ImageId?: string;
50+
AvailabilityZoneId?: string;
4451
}
4552

4653
export interface RunnerInputParameters {

lambdas/functions/control-plane/src/aws/runners.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,12 @@ function generateFleetOverrides(
128128
ec2OverrideConfig?: Runners.Ec2OverrideConfig,
129129
): FleetLaunchTemplateOverridesRequest[] {
130130
const result: FleetLaunchTemplateOverridesRequest[] = [];
131-
131+
132132
// Use override values if available, otherwise use parameter arrays
133133
const subnetsToUse = ec2OverrideConfig?.SubnetId ? [ec2OverrideConfig.SubnetId] : subnetIds;
134134
const instanceTypesToUse = ec2OverrideConfig?.InstanceType ? [ec2OverrideConfig.InstanceType] : instancesTypes;
135135
const amiIdToUse = ec2OverrideConfig?.ImageId ?? amiId;
136-
136+
137137
subnetsToUse.forEach((s) => {
138138
instanceTypesToUse.forEach((i) => {
139139
const item: FleetLaunchTemplateOverridesRequest = {

lambdas/functions/control-plane/src/scale-runners/scale-up.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ export async function scaleUp(payloads: ActionRequestMessageSQS[]): Promise<stri
439439
if (ec2OverrideConfig) {
440440
logger.debug('EC2 override config parsed from labels', {
441441
ec2OverrideConfig,
442-
});
442+
});
443443
}
444444
} else {
445445
logger.debug('No dynamic EC2 labels found on message');
@@ -910,7 +910,7 @@ function parseEc2OverrideConfig(labels: string[]): Ec2OverrideConfig | undefined
910910
ebs.SnapshotId = value;
911911
}
912912
}
913-
913+
914914
// Block Device Mappings (Non-EBS)
915915
else if (key === 'block-device-virtual-name') {
916916
config.BlockDeviceMappings = config.BlockDeviceMappings || [{ DeviceName: '/dev/sda1', Ebs: {} }];
@@ -1032,8 +1032,10 @@ function parseEc2OverrideConfig(labels: string[]): Ec2OverrideConfig | undefined
10321032
config.InstanceRequirements.RequireEncryptionInTransit = value.toLowerCase() === 'true';
10331033
} else if (key === 'baseline-performance-cpu-family') {
10341034
config.InstanceRequirements = config.InstanceRequirements || {};
1035-
config.InstanceRequirements.BaselinePerformanceFactors = config.InstanceRequirements.BaselinePerformanceFactors || {};
1036-
config.InstanceRequirements.BaselinePerformanceFactors.Cpu = config.InstanceRequirements.BaselinePerformanceFactors.Cpu || {};
1035+
config.InstanceRequirements.BaselinePerformanceFactors =
1036+
config.InstanceRequirements.BaselinePerformanceFactors || {};
1037+
config.InstanceRequirements.BaselinePerformanceFactors.Cpu =
1038+
config.InstanceRequirements.BaselinePerformanceFactors.Cpu || {};
10371039
config.InstanceRequirements.BaselinePerformanceFactors.Cpu.References = [{ InstanceFamily: value }];
10381040
}
10391041
}

0 commit comments

Comments
 (0)