Skip to content

Commit a2a325c

Browse files
authored
Merge pull request #34121 from digglife/f-build_batch_config_delete
Fix build_batch_config cannot be removed problem
2 parents c2df295 + 99bfcb3 commit a2a325c

26 files changed

+2978
-2653
lines changed

.changelog/34121.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/aws_codebuild_project: Allow `build_batch_config` to be removed on Update
3+
```

go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ require (
2727
github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.8.6
2828
github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.15.7
2929
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.31.0
30+
github.com/aws/aws-sdk-go-v2/service/codebuild v1.28.0
3031
github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.10.6
3132
github.com/aws/aws-sdk-go-v2/service/codecommit v1.20.1
3233
github.com/aws/aws-sdk-go-v2/service/codedeploy v1.22.3

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.15.7 h1:8sBfx7QkDZ6dgfUNXWH
7777
github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.15.7/go.mod h1:P1EMD13hrBE2KUw030w482Eyk2NmOFIvGqmgNi4XRDc=
7878
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.31.0 h1:Rk+Ft0Mu/eiNt2iJ2oS8Gf1h5m6q5crwS8cmlTylnvM=
7979
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.31.0/go.mod h1:jZNaJEtn9TLi3pfxycLz79HVkKxP8ZdYm92iaNFgBsA=
80+
github.com/aws/aws-sdk-go-v2/service/codebuild v1.28.0 h1:ueiaIwSz96QKCX+xfb4dWC681xycSLybAFOz3X11U7s=
81+
github.com/aws/aws-sdk-go-v2/service/codebuild v1.28.0/go.mod h1:kHgLQLdLEqmcxQxDuGjz1naXvaUvBMMKolAJECBwYtw=
8082
github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.10.6 h1:WLVD5wFI3yC1u/8L9bNeZ9+VURSdKjGA1Q+n+F1355Y=
8183
github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.10.6/go.mod h1:/lHwoB/rkF3eWMJPvm9wXN7y1THwqCLCOrF7xzA2u9E=
8284
github.com/aws/aws-sdk-go-v2/service/codecommit v1.20.1 h1:FJx0hebVW2EfD5eJjRSkQdWsqFTvZSCSitnMHcOxxko=

internal/conns/awsclient_gen.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/service/codebuild/consts.go

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ import (
77
"time"
88
)
99

10-
const (
11-
ResNameReportGroup = "Report Group"
12-
ResNameWebhook = "Webhook"
13-
)
14-
1510
const (
1611
propagationTimeout = 2 * time.Minute
1712
)

internal/service/codebuild/errors.go

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Copyright (c) HashiCorp, Inc.
2+
// SPDX-License-Identifier: MPL-2.0
3+
4+
package codebuild
5+
6+
import (
7+
"github.com/aws/aws-sdk-go-v2/service/codebuild/types"
8+
)
9+
10+
var (
11+
errCodeResourceNotFoundException = (*types.ResourceNotFoundException)(nil).ErrorCode()
12+
)
+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Copyright (c) HashiCorp, Inc.
2+
// SPDX-License-Identifier: MPL-2.0
3+
4+
package codebuild
5+
6+
// Exports for use in tests only.
7+
var (
8+
ResourceProject = resourceProject
9+
ResourceReportGroup = resourceReportGroup
10+
ResourceResourcePolicy = resourceResourcePolicy
11+
ResourceSourceCredential = resourceSourceCredential
12+
ResourceWebhook = resourceWebhook
13+
14+
FindProjectByNameOrARN = findProjectByNameOrARN
15+
FindReportGroupByARN = findReportGroupByARN
16+
FindResourcePolicyByARN = findResourcePolicyByARN
17+
FindSourceCredentialsByARN = findSourceCredentialsByARN
18+
FindSourceCredentials = findSourceCredentials
19+
FindWebhookByProjectName = findWebhookByProjectName
20+
)

internal/service/codebuild/find.go

-114
This file was deleted.

internal/service/codebuild/generate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) HashiCorp, Inc.
22
// SPDX-License-Identifier: MPL-2.0
33

4-
//go:generate go run ../../generate/tags/main.go -ServiceTagsSlice
4+
//go:generate go run ../../generate/tags/main.go -AWSSDKVersion=2 -ServiceTagsSlice -SkipAWSServiceImp
55
//go:generate go run ../../generate/servicepackage/main.go
66
// ONLY generate directives and package declaration! Do not add anything else to this file.
77

0 commit comments

Comments
 (0)