feat(codebuild): add custom instance type and VPC to Fleets #34572

isker · 2025-05-29T01:13:26Z

https://aws.amazon.com/about-aws/whats-new/2025/04/aws-codebuild-ec2-instance-type-configurable-storage-size/

CodeBuild now supports specifying specific EC2 instance types to serve as fleet compute.

Add this support to the Fleet construct by way of adding CUSTOM_INSTANCE_TYPE to the FleetComputeType enum, and instanceType to ComputeConfiguration.

Also, add VPC support to Fleet. This mirrors the VPC support in Project. When using Fleets, the VPC configured on the Project is disallowed by CloudFormation. Only the VPC on the Fleet applies. VPC support required adding a Role to the Fleet to handle provisioning EC2 network interfaces in the configured VPC.

Describe any new or updated permissions being added

When configuring a VPC on a Fleet, IAM permissions are granted to a CodeBuild Role as described here.

Description of how you validated changes

Unit and integration tests.

Checklist

My code adheres to the CONTRIBUTING GUIDE and DESIGN GUIDELINES

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

...sting/framework-integ/test/aws-codebuild/test/integ.project-fleet-attribute-based-compute.ts

packages/aws-cdk-lib/aws-codebuild/README.md

isker · 2025-05-29T01:20:17Z

...-testing/framework-integ/test/aws-codebuild/test/integ.project-fleet-custom-instance-type.ts

+      // Incredibly, if you pass a SubnetSelection that produces more than 1
+      // subnet, you currently get this error:
+      // > Resource handler returned message: "Invalid vpc config: the maximum number of subnets is 1
+      // This seems like a terrible limitation from the CodeBuild team.
+      // maxAzs: 2,


This is bad. If anyone at AWS can talk to the CodeBuild team... I've never seen another service that demands a single subnet like this. The CloudFormation types claim you can use "up to 16" but anything more than 1 fails at deploy time.

@ozelalisen maybe you can forward this complaint internally 🥲.

Will follow up on this

isker · 2025-06-14T20:36:35Z

@alvazjor why did main get force pushed here? Every PR now has many conflicts that are challenging to resolve :(.

aws-cdk-automation · 2025-06-16T00:13:52Z

This PR cannot be merged because it has conflicts. Please resolve them. The PR will be considered stale and closed if it remains in an unmergeable state.

aws-cdk-automation · 2025-06-16T01:23:17Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
Commit ID: b26bef7
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

badmintoncryer

Thank you for your work! I've added some minor comments.

Is there a reason for combining the two features - VPC and Instance Type support - into a single PR? I feel these should typically be split into one feature per PR.

packages/aws-cdk-lib/aws-codebuild/lib/fleet.ts

isker · 2025-08-20T19:30:08Z

Thank you for your work! I've added some minor comments.

Thank you very much for reviewing.

Is there a reason for combining the two features - VPC and Instance Type support - into a single PR? I feel these should typically be split into one feature per PR.

The reason I've combined them is that I want to use both of these features myself. I do not think they strictly depend on one another, but because they modify code in the same place, if I were to split them up, whichever branch merged first would conflict with the other. So, it was easier for me to develop them together. So, I hope this it's okay to do it like this.

isker · 2025-08-21T06:19:28Z

I have rebased and am rerunning the new integration tests in this PR, as main has changed the snapshots. It takes a really long time to run integration tests that involve fleets, because fleet instances must exist for at least an hour before they can be deleted. I will hopefully finish it tomorrow and then will push the fixed tests.

isker · 2025-08-21T14:11:57Z

😕 the main build succeeds but I don't understand either of the other jobs that failed. Especially the security guardian one, seems all unrelated to my changes.

badmintoncryer

Thank you for the thorough deployment verification. As noted in the comments, while there is a discrepancy between the documentation and the IAM policy, I understand that the implementation is correct.

Since large PRs tend to get deprioritized for review, I think it would be better for both of us to limit future PRs to a single feature.

badmintoncryer · 2025-08-22T13:46:37Z

I don't think you need to worry much about CI processes like Security Guardian, as they are flaky and their failures don't affect the review status.
Also, due to a separate issue, the needs-maintainer-review label is currently not being attached. Please wait while we address this.

#35268

isker · 2025-08-27T01:41:59Z

@badmintoncryer do you know how to get the label added now that #35268 is fixed?

badmintoncryer · 2025-08-27T15:43:23Z

@isker Normally, this issue should have been resolved by merging the main branch, but it seems it has not been fixed yet.

isker · 2025-08-29T21:41:54Z

Still no label 🥲.

isker · 2025-08-29T21:48:11Z

it seems it has not been fixed yet.

@badmintoncryer is there an open issue for this?

isker · 2025-09-24T02:58:48Z

Hi @ozelalisen, I see you assigned yourself a while ago. I would be grateful for a review.

packages/aws-cdk-lib/aws-codebuild/README.md

packages/aws-cdk-lib/aws-codebuild/lib/fleet.ts

packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-fleet.ts

packages/aws-cdk-lib/aws-codebuild/lib/fleet.ts

Pull request has been modified.

isker · 2025-09-29T19:29:51Z

@ozelalisen I think I've addressed everything, please take another look.

ozelalisen · 2025-09-30T15:22:40Z

@isker There are some merge conflicts, once you resolve them, I'll approve the PR

https://aws.amazon.com/about-aws/whats-new/2025/04/aws-codebuild-ec2-instance-type-configurable-storage-size/ CodeBuild now supports specifying specific EC2 instance types to serve as fleet compute. Add this support to the Fleet construct by way of adding CUSTOM_INSTANCE_TYPE to the FleetComputeType enum, and `instanceType` to `ComputeConfiguration`. Also, add VPC support to Fleet. This mirrors the VPC support in Project. When using Fleets, the VPC configured on the Project does nothing. Only the VPC on the Fleet applies. This required adding a Role to the Fleet to handle provisioning EC2 network interfaces in the configured VPC.

ozelalisen

Thank you for this PR, LGTM, just left minor comment regarding permissions for future reference

ozelalisen · 2025-09-30T16:39:20Z

packages/aws-cdk-lib/aws-codebuild/lib/fleet.ts

+        'ec2:CreateNetworkInterface',
+        'ec2:DeleteNetworkInterface',
+        'ec2:ModifyNetworkInterfaceAttribute',


The IAM permissions in this PR appear to be correct and align with AWS CodeBuild's official documentation. I also encountered deployment errors related to The service role is not authorized to perform ec2:CreateNetworkInterface when scoping down to subnetArns. Given this limitation, it is okay to merge this PR

ozelalisen · 2025-09-30T16:39:40Z

...-testing/framework-integ/test/aws-codebuild/test/integ.project-fleet-custom-instance-type.ts

+      // Incredibly, if you pass a SubnetSelection that produces more than 1
+      // subnet, you currently get this error:
+      // > Resource handler returned message: "Invalid vpc config: the maximum number of subnets is 1
+      // This seems like a terrible limitation from the CodeBuild team.
+      // maxAzs: 2,


Will follow up on this

github-actions · 2025-09-30T16:51:40Z

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

aws-cdk-automation requested a review from a team May 29, 2025 01:13

github-actions bot added p2 repeat-contributor [Pilot] contributed between 3-5 PRs to the CDK labels May 29, 2025

isker commented May 29, 2025

View reviewed changes

isker force-pushed the codebuild-fleet-custom-instance-type-vpc branch from 28828ff to d7ab2f0 Compare May 29, 2025 02:13

aws-cdk-automation added the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label May 29, 2025

github-actions bot mentioned this pull request Jun 1, 2025

Monthly PR metrics report #34601

Closed

isker force-pushed the codebuild-fleet-custom-instance-type-vpc branch 3 times, most recently from 8256ca3 to 3a75586 Compare June 12, 2025 03:47

alvazjor force-pushed the main branch from 8397000 to 8808998 Compare June 12, 2025 10:40

aws-cdk-automation removed the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Jun 14, 2025

isker force-pushed the codebuild-fleet-custom-instance-type-vpc branch from 3a75586 to b26bef7 Compare June 16, 2025 00:51

aws-cdk-automation added the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Jun 16, 2025

badmintoncryer suggested changes Aug 20, 2025

View reviewed changes

aws-cdk-automation removed the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Aug 20, 2025

isker force-pushed the codebuild-fleet-custom-instance-type-vpc branch from b26bef7 to 2966716 Compare August 21, 2025 04:20

isker force-pushed the codebuild-fleet-custom-instance-type-vpc branch from 2966716 to 99d2d1e Compare August 21, 2025 13:33

isker requested a review from badmintoncryer August 22, 2025 02:06

badmintoncryer approved these changes Aug 22, 2025

View reviewed changes

isker force-pushed the codebuild-fleet-custom-instance-type-vpc branch from 99d2d1e to 8e64358 Compare August 29, 2025 21:14

isker force-pushed the codebuild-fleet-custom-instance-type-vpc branch from 8e64358 to 6214d0b Compare September 3, 2025 04:21

alvazjor added the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Sep 3, 2025

ozelalisen self-assigned this Sep 9, 2025

ozelalisen previously requested changes Sep 25, 2025

View reviewed changes

aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Sep 25, 2025

isker force-pushed the codebuild-fleet-custom-instance-type-vpc branch from 6214d0b to 03a3894 Compare September 25, 2025 21:53

isker force-pushed the codebuild-fleet-custom-instance-type-vpc branch 2 times, most recently from 92dfd15 to 39ec36e Compare September 26, 2025 03:13

isker requested a review from ozelalisen September 26, 2025 03:17

ozelalisen added the pr/needs-further-review PR requires additional review from our team specialists due to the scope or complexity of changes. label Sep 30, 2025

isker force-pushed the codebuild-fleet-custom-instance-type-vpc branch from 39ec36e to aa23ae8 Compare September 30, 2025 16:19

ozelalisen approved these changes Sep 30, 2025

View reviewed changes

ozelalisen merged commit 5c2781b into aws:main Sep 30, 2025
20 checks passed

github-actions bot locked as resolved and limited conversation to collaborators Sep 30, 2025

feat(codebuild): add custom instance type and VPC to Fleets #34572

feat(codebuild): add custom instance type and VPC to Fleets #34572

Uh oh!

Conversation

isker commented May 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Describe any new or updated permissions being added

Description of how you validated changes

Checklist

Uh oh!

Uh oh!

Uh oh!

isker May 29, 2025

Choose a reason for hiding this comment

Uh oh!

isker Sep 26, 2025

Choose a reason for hiding this comment

Uh oh!

ozelalisen Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

isker commented Jun 14, 2025

Uh oh!

aws-cdk-automation commented Jun 16, 2025

Uh oh!

aws-cdk-automation commented Jun 16, 2025

AWS CodeBuild CI Report

Uh oh!

badmintoncryer left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

isker commented Aug 20, 2025

Uh oh!

isker commented Aug 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

isker commented Aug 21, 2025

Uh oh!

badmintoncryer left a comment

Choose a reason for hiding this comment

Uh oh!

badmintoncryer commented Aug 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

isker commented Aug 27, 2025

Uh oh!

badmintoncryer commented Aug 27, 2025

Uh oh!

isker commented Aug 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

isker commented Aug 29, 2025

Uh oh!

isker commented Sep 24, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

isker commented Sep 29, 2025

Uh oh!

ozelalisen commented Sep 30, 2025

Uh oh!

ozelalisen left a comment

Choose a reason for hiding this comment

Uh oh!

ozelalisen Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

ozelalisen Sep 30, 2025

isker commented May 29, 2025 •

edited

Loading

isker commented Aug 21, 2025 •

edited

Loading

badmintoncryer commented Aug 22, 2025 •

edited

Loading

isker commented Aug 29, 2025 •

edited

Loading