File tree Expand file tree Collapse file tree 2 files changed +16
-6
lines changed
lambdas/functions/control-plane/src/aws Expand file tree Collapse file tree 2 files changed +16
-6
lines changed Original file line number Diff line number Diff line change @@ -861,22 +861,30 @@ function expectedCreateFleetRequest(expectedValues: ExpectedFleetRequestValues):
861861 {
862862 InstanceType : 'm5.large' ,
863863 SubnetId : 'subnet-123' ,
864- Priority : expectedValues . instanceTypePriorities ?. [ 'm5.large' ] ?? 0 ,
864+ ...( expectedValues . allocationStrategy === 'prioritized' && {
865+ Priority : expectedValues . instanceTypePriorities ?. [ 'm5.large' ] ?? 0 ,
866+ } ) ,
865867 } ,
866868 {
867869 InstanceType : 'c5.large' ,
868870 SubnetId : 'subnet-123' ,
869- Priority : expectedValues . instanceTypePriorities ?. [ 'c5.large' ] ?? 1 ,
871+ ...( expectedValues . allocationStrategy === 'prioritized' && {
872+ Priority : expectedValues . instanceTypePriorities ?. [ 'c5.large' ] ?? 1 ,
873+ } ) ,
870874 } ,
871875 {
872876 InstanceType : 'm5.large' ,
873877 SubnetId : 'subnet-456' ,
874- Priority : expectedValues . instanceTypePriorities ?. [ 'm5.large' ] ?? 0 ,
878+ ...( expectedValues . allocationStrategy === 'prioritized' && {
879+ Priority : expectedValues . instanceTypePriorities ?. [ 'm5.large' ] ?? 0 ,
880+ } ) ,
875881 } ,
876882 {
877883 InstanceType : 'c5.large' ,
878884 SubnetId : 'subnet-456' ,
879- Priority : expectedValues . instanceTypePriorities ?. [ 'c5.large' ] ?? 1 ,
885+ ...( expectedValues . allocationStrategy === 'prioritized' && {
886+ Priority : expectedValues . instanceTypePriorities ?. [ 'c5.large' ] ?? 1 ,
887+ } ) ,
880888 } ,
881889 ] ,
882890 } ,
Original file line number Diff line number Diff line change @@ -136,7 +136,7 @@ function generateFleetOverrides(
136136 SubnetId : s ,
137137 InstanceType : i as _InstanceType ,
138138 ImageId : amiId ,
139- Priority : instanceTypePriorities ?. [ i ] ?? index ,
139+ ... ( instanceTypePriorities !== undefined && { Priority : instanceTypePriorities [ i ] ?? index } ) ,
140140 } ;
141141 result . push ( item ) ;
142142 } ) ;
@@ -279,7 +279,9 @@ async function createInstances(
279279 runnerParameters . subnets ,
280280 runnerParameters . ec2instanceCriteria . instanceTypes ,
281281 amiIdOverride ,
282- runnerParameters . ec2instanceCriteria . instanceTypePriorities ,
282+ runnerParameters . ec2instanceCriteria . instanceAllocationStrategy === 'prioritized'
283+ ? ( runnerParameters . ec2instanceCriteria . instanceTypePriorities ?? { } )
284+ : undefined ,
283285 ) ,
284286 } ,
285287 ] ,
You can’t perform that action at this time.
0 commit comments