Skip to content

Commit bfc8ac2

Browse files
committed
Merge commit '09ca2c92a03e9d689cc441f59bd48e99eaadec0a' into HEAD
2 parents 21594fe + 09ca2c9 commit bfc8ac2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3786
-696
lines changed

.changelog/43590.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/aws_s3_bucket_lifecycle_configuration: Do not warn if no filter element is set
3+
```

.changelog/44256.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
aws_prometheus_resource_policy
3+
```

.changelog/44491.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
```release-note:bug
2+
resource/aws_datazone_environment: Prevents `unknown value` error when optional `account_identifier` is not specified.
3+
```
4+
5+
```release-note:bug
6+
resource/aws_datazone_environment: Prevents `unknown value` error when optional `account_region` is not specified.
7+
```
8+
9+
```release-note:bug
10+
resource/aws_datazone_environment: Properly passes `blueprint_identifier` on creation.
11+
```
12+
13+
```release-note:bug
14+
resource/aws_datazone_environment: Prevents error when updating.
15+
```
16+
17+
```release-note:bug
18+
resource/aws_datazone_environment: Prevents occasional `unexpected state` error when deleting.
19+
```
20+
21+
```release-note:bug
22+
resource/aws_datazone_environment: Sets values for `user_parameters` when importing.
23+
```
24+
25+
```release-note:bug
26+
resource/aws_datazone_environment: Values in `user_parameters` should not be updateable.
27+
```
28+
29+
```release-note:bug
30+
resource/aws_datazone_environment: Correctly updates `glossary_terms`.
31+
```
32+
33+
```release-note:bug
34+
resource/aws_datazone_project: No longer ignores errors when deleting.
35+
```
36+
37+
```release-note:bug
38+
resource/aws_datazone_project: No longer returns error when already deleting.
39+
```

.changelog/44505.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/aws_launch_template: `kms_key_id` validation now accepts key ID, alias, and alias ARN in addition to key ARN
3+
```

.changelog/44540.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_lambda_event_source_mapping: Add `schema_registry_config` configuration blocks to `amazon_managed_kafka_event_source_config` and `self_managed_kafka_event_source_config` blocks
3+
```

.ci/providerlint/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.6
44

55
require (
66
github.com/bflad/tfproviderlint v0.31.0
7-
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66
7+
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.67
88
github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.1
99
golang.org/x/tools v0.37.0
1010
)

.ci/providerlint/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
5454
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
5555
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
5656
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
57-
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66 h1:HA6blfR0h6kGnw4oJ92tZzghubreIkWbQJ4NVNqS688=
58-
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66/go.mod h1:7kTJVbY5+igob9Q5N6KO81EGEKDNI9FpjujB31uI/n0=
57+
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.67 h1:IS4mjtvkLHXWI5yn/t9ILOUiBqPePMFaO4IRh5pcMk4=
58+
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.67/go.mod h1:l81jrdpcZSWUsJs4BGFfdGScefSYEFQRLMQRG3uyvT0=
5959
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
6060
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
6161
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -163,8 +163,8 @@ github.com/zclconf/go-cty v1.17.0 h1:seZvECve6XX4tmnvRzWtJNHdscMtYEx5R7bnnVyd/d0
163163
github.com/zclconf/go-cty v1.17.0/go.mod h1:wqFzcImaLTI6A5HfsRwB0nj5n0MRZFwmey8YoFPPs3U=
164164
github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
165165
github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
166-
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
167-
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
166+
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
167+
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
168168
go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
169169
go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
170170
go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=

.github/workflows/readiness_comment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
150150
- name: Check for Existing Comment
151151
id: prc
152-
uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
152+
uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad # v4.0.0
153153
with:
154154
issue-number: ${{ github.event.pull_request.number }}
155155
comment-author: "github-actions[bot]"
@@ -168,7 +168,7 @@ jobs:
168168
if: |
169169
steps.start.outcome != 'skipped'
170170
|| steps.corrected.outcome != 'skipped'
171-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
171+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
172172
with:
173173
token: ${{ secrets.GITHUB_TOKEN }}
174174
issue-number: ${{ github.event.pull_request.number }}

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
stale:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
10+
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
1111
with:
1212
repo-token: ${{ secrets.GITHUB_TOKEN }}
1313
days-before-stale: 720

.teamcity/scripts/provider_tests/acceptance_tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ fi
3434

3535
TF_ACC=1 go test \
3636
./internal/acctest/... \
37+
./internal/actionwait/... \
3738
./internal/attrmap/... \
3839
./internal/backoff/... \
3940
./internal/conns/... \

0 commit comments

Comments
 (0)