Skip to content

Commit

Permalink
Merge pull request #37970 from WestonReed/weston/fix-codebuild-timeou…
Browse files Browse the repository at this point in the history
…t-maximum

bugfix: Update maximum build_timeout for codebuild from 8 hours to 36 hours
  • Loading branch information
ewbankkit authored Jun 14, 2024
2 parents c4dc627 + e2634d9 commit ea4ad9b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .changelog/37970.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_codebuild_project: Increase maximum values of `build_batch_config.timeout_in_mins` and `build_timeout` from `480` (8 hours) to `2160` (36 hours)
```
4 changes: 2 additions & 2 deletions internal/service/codebuild/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ func resourceProject() *schema.Resource {
"timeout_in_mins": {
Type: schema.TypeInt,
Optional: true,
ValidateFunc: validation.IntBetween(5, 480),
ValidateFunc: validation.IntBetween(5, 2160),
},
},
},
Expand All @@ -181,7 +181,7 @@ func resourceProject() *schema.Resource {
Type: schema.TypeInt,
Optional: true,
Default: 60,
ValidateFunc: validation.IntBetween(5, 480),
ValidateFunc: validation.IntBetween(5, 2160),
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
switch environmentType := types.EnvironmentType(d.Get("environment.0.type").(string)); environmentType {
case types.EnvironmentTypeArmLambdaContainer, types.EnvironmentTypeLinuxLambdaContainer:
Expand Down
4 changes: 2 additions & 2 deletions internal/service/codebuild/project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ func TestAccCodeBuildProject_buildBatchConfigDelete(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "build_batch_config.0.restrictions.#", acctest.Ct1),
resource.TestCheckResourceAttr(resourceName, "build_batch_config.0.restrictions.0.compute_types_allowed.#", acctest.Ct0),
resource.TestCheckResourceAttr(resourceName, "build_batch_config.0.restrictions.0.maximum_builds_allowed", acctest.Ct10),
resource.TestCheckResourceAttr(resourceName, "build_batch_config.0.timeout_in_mins", "480"),
resource.TestCheckResourceAttr(resourceName, "build_batch_config.0.timeout_in_mins", "2160"),
),
},
{
Expand Down Expand Up @@ -3918,7 +3918,7 @@ build_batch_config {
}
service_role = aws_iam_role.test.arn
timeout_in_mins = 480
timeout_in_mins = 2160
}
`

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ The following arguments are optional:

* `badge_enabled` - (Optional) Generates a publicly-accessible URL for the projects build badge. Available as `badge_url` attribute when enabled.
* `build_batch_config` - (Optional) Defines the batch build options for the project.
* `build_timeout` - (Optional) Number of minutes, from 5 to 480 (8 hours), for AWS CodeBuild to wait until timing out any related build that does not get marked as completed. The default is 60 minutes. The `build_timeout` property is not available on the `Lambda` compute type.
* `build_timeout` - (Optional) Number of minutes, from 5 to 2160 (36 hours), for AWS CodeBuild to wait until timing out any related build that does not get marked as completed. The default is 60 minutes. The `build_timeout` property is not available on the `Lambda` compute type.
* `cache` - (Optional) Configuration block. Detailed below.
* `concurrent_build_limit` - (Optional) Specify a maximum number of concurrent builds for the project. The value specified must be greater than 0 and less than the account concurrent running builds limit.
* `description` - (Optional) Short description of the project.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/codebuild_project.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ The following arguments are optional:

* `badge_enabled` - (Optional) Generates a publicly-accessible URL for the projects build badge. Available as `badge_url` attribute when enabled.
* `build_batch_config` - (Optional) Defines the batch build options for the project.
* `build_timeout` - (Optional) Number of minutes, from 5 to 480 (8 hours), for AWS CodeBuild to wait until timing out any related build that does not get marked as completed. The default is 60 minutes. The `build_timeout` property is not available on the `Lambda` compute type.
* `build_timeout` - (Optional) Number of minutes, from 5 to 2160 (36 hours), for AWS CodeBuild to wait until timing out any related build that does not get marked as completed. The default is 60 minutes. The `build_timeout` property is not available on the `Lambda` compute type.
* `cache` - (Optional) Configuration block. Detailed below.
* `concurrent_build_limit` - (Optional) Specify a maximum number of concurrent builds for the project. The value specified must be greater than 0 and less than the account concurrent running builds limit.
* `description` - (Optional) Short description of the project.
Expand Down

0 comments on commit ea4ad9b

Please sign in to comment.