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 @@ -808,22 +808,30 @@ function expectedCreateFleetRequest(expectedValues: ExpectedFleetRequestValues):
808808 {
809809 InstanceType : 'm5.large' ,
810810 SubnetId : 'subnet-123' ,
811- Priority : expectedValues . instanceTypePriorities ?. [ 'm5.large' ] ?? 0 ,
811+ ...( expectedValues . allocationStrategy === 'prioritized' && {
812+ Priority : expectedValues . instanceTypePriorities ?. [ 'm5.large' ] ?? 0 ,
813+ } ) ,
812814 } ,
813815 {
814816 InstanceType : 'c5.large' ,
815817 SubnetId : 'subnet-123' ,
816- Priority : expectedValues . instanceTypePriorities ?. [ 'c5.large' ] ?? 1 ,
818+ ...( expectedValues . allocationStrategy === 'prioritized' && {
819+ Priority : expectedValues . instanceTypePriorities ?. [ 'c5.large' ] ?? 1 ,
820+ } ) ,
817821 } ,
818822 {
819823 InstanceType : 'm5.large' ,
820824 SubnetId : 'subnet-456' ,
821- Priority : expectedValues . instanceTypePriorities ?. [ 'm5.large' ] ?? 0 ,
825+ ...( expectedValues . allocationStrategy === 'prioritized' && {
826+ Priority : expectedValues . instanceTypePriorities ?. [ 'm5.large' ] ?? 0 ,
827+ } ) ,
822828 } ,
823829 {
824830 InstanceType : 'c5.large' ,
825831 SubnetId : 'subnet-456' ,
826- Priority : expectedValues . instanceTypePriorities ?. [ 'c5.large' ] ?? 1 ,
832+ ...( expectedValues . allocationStrategy === 'prioritized' && {
833+ Priority : expectedValues . instanceTypePriorities ?. [ 'c5.large' ] ?? 1 ,
834+ } ) ,
827835 } ,
828836 ] ,
829837 } ,
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