Skip to content

Commit 9e21769

Browse files
ewbankkitewbankkit
committed
Merge branch 'main' into f-aws_transfer_host_key
# Conflicts: # internal/service/transfer/exports_test.go # internal/service/transfer/service_package_gen.go
2 parents ea09c56 + 2df1874 commit 9e21769

38 files changed

+3816
-343
lines changed

‎.changelog/42708.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:new-resource
2+
aws_transfer_web_app
3+
```
4+
5+
```release-note:new-resource
6+
aws_transfer_web_app_customization
7+
```

‎.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/... \

‎.teamcity/scripts/provider_tests/unit_tests.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ set -euo pipefail
66

77
go test \
88
./internal/acctest/... \
9+
./internal/actionwait/... \
910
./internal/attrmap/... \
1011
./internal/backoff/... \
1112
./internal/conns/... \

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ FEATURES:
44

55
* **New Resource:** `aws_prometheus_resource_policy` ([#44256](https://github.com/hashicorp/terraform-provider-aws/issues/44256))
66

7+
ENHANCEMENTS:
8+
9+
* 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 ([#44540](https://github.com/hashicorp/terraform-provider-aws/issues/44540))
10+
711
BUG FIXES:
812

913
* resource/aws_datazone_environment: Correctly updates `glossary_terms`. ([#44491](https://github.com/hashicorp/terraform-provider-aws/issues/44491))

‎go.mod‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ require (
4040
github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.6
4141
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.3
4242
github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.5
43-
github.com/aws/aws-sdk-go-v2/service/backup v1.47.7
43+
github.com/aws/aws-sdk-go-v2/service/backup v1.48.0
4444
github.com/aws/aws-sdk-go-v2/service/batch v1.57.10
4545
github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.8
4646
github.com/aws/aws-sdk-go-v2/service/bedrock v1.47.2
4747
github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.6
48-
github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.6.0
48+
github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.7.0
4949
github.com/aws/aws-sdk-go-v2/service/billing v1.8.0
5050
github.com/aws/aws-sdk-go-v2/service/budgets v1.39.2
5151
github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.6
5252
github.com/aws/aws-sdk-go-v2/service/chime v1.40.5
5353
github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.6
5454
github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.27.0
55-
github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.35.0
55+
github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.36.0
5656
github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.5
5757
github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.6
5858
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.67.0
@@ -130,7 +130,7 @@ require (
130130
github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.6
131131
github.com/aws/aws-sdk-go-v2/service/glacier v1.31.6
132132
github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.6
133-
github.com/aws/aws-sdk-go-v2/service/glue v1.129.1
133+
github.com/aws/aws-sdk-go-v2/service/glue v1.130.0
134134
github.com/aws/aws-sdk-go-v2/service/grafana v1.31.6
135135
github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.6
136136
github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.6
@@ -166,14 +166,14 @@ require (
166166
github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.6
167167
github.com/aws/aws-sdk-go-v2/service/m2 v1.25.6
168168
github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.6
169-
github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.6
169+
github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.45.0
170170
github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.6
171-
github.com/aws/aws-sdk-go-v2/service/medialive v1.83.2
171+
github.com/aws/aws-sdk-go-v2/service/medialive v1.84.0
172172
github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.6
173173
github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.3
174174
github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.6
175175
github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.6
176-
github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.6
176+
github.com/aws/aws-sdk-go-v2/service/memorydb v1.32.0
177177
github.com/aws/aws-sdk-go-v2/service/mgn v1.37.5
178178
github.com/aws/aws-sdk-go-v2/service/mq v1.34.4
179179
github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.6
@@ -201,16 +201,16 @@ require (
201201
github.com/aws/aws-sdk-go-v2/service/pricing v1.39.6
202202
github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.6
203203
github.com/aws/aws-sdk-go-v2/service/qldb v1.30.6
204-
github.com/aws/aws-sdk-go-v2/service/quicksight v1.94.3
204+
github.com/aws/aws-sdk-go-v2/service/quicksight v1.94.4
205205
github.com/aws/aws-sdk-go-v2/service/ram v1.34.6
206206
github.com/aws/aws-sdk-go-v2/service/rbin v1.26.6
207-
github.com/aws/aws-sdk-go-v2/service/rds v1.108.0
207+
github.com/aws/aws-sdk-go-v2/service/rds v1.108.1
208208
github.com/aws/aws-sdk-go-v2/service/redshift v1.59.0
209209
github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.6
210210
github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.8
211211
github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.5
212212
github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.6
213-
github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.6
213+
github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.22.0
214214
github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.7
215215
github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.6
216216
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.6
@@ -280,7 +280,7 @@ require (
280280
github.com/goccy/go-yaml v1.18.0
281281
github.com/google/go-cmp v0.7.0
282282
github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0
283-
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66
283+
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.67
284284
github.com/hashicorp/awspolicyequivalence v1.7.0
285285
github.com/hashicorp/cli v1.1.7
286286
github.com/hashicorp/go-cleanhttp v0.5.2
@@ -369,7 +369,7 @@ require (
369369
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
370370
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
371371
github.com/zclconf/go-cty v1.17.0 // indirect
372-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
372+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
373373
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.63.0 // indirect
374374
go.opentelemetry.io/otel v1.38.0 // indirect
375375
go.opentelemetry.io/otel/metric v1.38.0 // indirect

0 commit comments

Comments
 (0)