Skip to content

Commit c7409e3

Browse files
committed
Merge branch 'f-ec2-instance-action' into f-cloudfront-invalidate-cache-action
2 parents d261f65 + 56a0517 commit c7409e3

Some content is hidden

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

42 files changed

+2484
-49
lines changed

.changelog/43520.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_elasticache_user_group: Ignore `InvalidParameterValue: User xxx is not a member of user group xxx` errors during group modification
3+
```

.changelog/43809.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_odb_cloud_autonomous_vm_cluster
3+
```
4+
5+
```release-note:new-data-source
6+
aws_odb_cloud_autonomous_vm_cluster
7+
```

.changelog/44272.txt

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

.changelog/44310.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_sagemaker_endpoint_configuration: Fix panic when empty `async_inference_config.output_config.notification_config` block is specified
3+
```

.ci/tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/hashicorp/terraform-provider-aws/tools
33
go 1.24.6
44

55
require (
6-
github.com/YakDriver/tfproviderdocs v0.22.1-0.20250917010138-53a933aef5c1
6+
github.com/YakDriver/tfproviderdocs v0.23.1
77
github.com/client9/misspell v0.3.4
88
github.com/golangci/golangci-lint/v2 v2.4.0
99
github.com/hashicorp/copywrite v0.22.0

.ci/tools/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -700,8 +700,8 @@ github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/
700700
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g=
701701
github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
702702
github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
703-
github.com/YakDriver/tfproviderdocs v0.22.1-0.20250917010138-53a933aef5c1 h1:moyTxzqH04hNRjno6k4jOKovIVTrWdTJYPHF3YxCfUg=
704-
github.com/YakDriver/tfproviderdocs v0.22.1-0.20250917010138-53a933aef5c1/go.mod h1:SYOG1OK0JEAjkdSgYhMzDVRDuzF8qHAJewiNlrGba/Q=
703+
github.com/YakDriver/tfproviderdocs v0.23.1 h1:WlwEmm0A/ePEHpXyxUq2xf56+LUFmJtIWBKq7DvFjI0=
704+
github.com/YakDriver/tfproviderdocs v0.23.1/go.mod h1:n0ZCrOfASYMh/OmwI05/+mb74uph4GQGW+B/+UzFG2s=
705705
github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
706706
github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
707707
github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22

33
FEATURES:
44

5+
* **New Data Source:** `aws_billing_views` ([#44272](https://github.com/hashicorp/terraform-provider-aws/issues/44272))
6+
* **New Data Source:** `aws_odb_cloud_autonomous_vm_cluster` ([#43809](https://github.com/hashicorp/terraform-provider-aws/issues/43809))
57
* **New Data Source:** `aws_odb_cloud_exadata_infrastructure` ([#43650](https://github.com/hashicorp/terraform-provider-aws/issues/43650))
68
* **New Data Source:** `aws_odb_network` ([#43715](https://github.com/hashicorp/terraform-provider-aws/issues/43715))
79
* **New Resource:** `aws_controltower_baseline` ([#42397](https://github.com/hashicorp/terraform-provider-aws/issues/42397))
10+
* **New Resource:** `aws_odb_cloud_autonomous_vm_cluster` ([#43809](https://github.com/hashicorp/terraform-provider-aws/issues/43809))
811
* **New Resource:** `aws_odb_cloud_exadata_infrastructure` ([#43650](https://github.com/hashicorp/terraform-provider-aws/issues/43650))
912
* **New Resource:** `aws_odb_network` ([#43715](https://github.com/hashicorp/terraform-provider-aws/issues/43715))
1013

@@ -13,6 +16,10 @@ ENHANCEMENTS:
1316
* resource/aws_rds_global_cluster: Remove provider-side conflict between `source_db_cluster_identifier` and `engine` arguments ([#44252](https://github.com/hashicorp/terraform-provider-aws/issues/44252))
1417
* resource/aws_scheduler_schedule: Add `action_after_completion` argument ([#44264](https://github.com/hashicorp/terraform-provider-aws/issues/44264))
1518

19+
BUG FIXES:
20+
21+
* resource/aws_sagemaker_endpoint_configuration: Fix panic when empty `async_inference_config.output_config.notification_config` block is specified ([#44310](https://github.com/hashicorp/terraform-provider-aws/issues/44310))
22+
1623
## 6.13.0 (September 11, 2025)
1724

1825
ENHANCEMENTS:

GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ website-terrafmt: ## [CI] Website Checks / terrafmt
871871

872872
website-terrafmt-fix: ## [CI] Fix Website / terrafmt
873873
@echo "make: Fix Website / terrafmt..."
874-
@echo "make: terrafmt fix website/docs root files..."
874+
@echo "make: Fixing website/docs root files with terrafmt..."
875875
@find ./website/docs -maxdepth 1 -type f -name '*.markdown' -exec terrafmt fmt {} \;
876876
@for dir in $$(find ./website/docs -maxdepth 1 -type d ! -name docs ! -name cdktf | sort); do \
877877
echo "make: Fixing $$dir with terrafmt..."; \
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Copyright (c) HashiCorp, Inc.
2+
# SPDX-License-Identifier: MPL-2.0
3+
4+
# Autonomous VM Cluster with default maintenance window and minimum parameters
5+
resource "aws_odb_cloud_autonomous_vm_cluster" "avmc_with_minimum_parameters" {
6+
cloud_exadata_infrastructure_id = "<exadata_infra_id>" # refer your exadata infra id
7+
odb_network_id = "<odb_net_id>" # refer_your_odb_net_id
8+
display_name = "Ofake-avmc-my_avmc"
9+
autonomous_data_storage_size_in_tbs = 5
10+
memory_per_oracle_compute_unit_in_gbs = 2
11+
total_container_databases = 1
12+
cpu_core_count_per_node = 40
13+
license_model = "LICENSE_INCLUDED"
14+
# ids of db server. refer your exa infra. This is a manadatory fileld. Refer your cloud exadata infrastructure for db server id
15+
db_servers = ["<my_db_server_id>"]
16+
scan_listener_port_tls = 8561
17+
scan_listener_port_non_tls = 1024
18+
maintenance_window {
19+
preference = "NO_PREFERENCE"
20+
}
21+
22+
}
23+
24+
# Autonomous VM Cluster with all parameters
25+
resource "aws_odb_cloud_autonomous_vm_cluster" "test" {
26+
description = "my first avmc"
27+
time_zone = "UTC"
28+
cloud_exadata_infrastructure_id = "<aws_odb_cloud_exadata_infrastructure.test.id>"
29+
odb_network_id = "<aws_odb_network.test.id>"
30+
display_name = "Ofake_my avmc"
31+
autonomous_data_storage_size_in_tbs = 5
32+
memory_per_oracle_compute_unit_in_gbs = 2
33+
total_container_databases = 1
34+
cpu_core_count_per_node = 40
35+
license_model = "LICENSE_INCLUDED"
36+
db_servers = ["<my_db_server_1>", "<my_db_server_2>"]
37+
scan_listener_port_tls = 8561
38+
scan_listener_port_non_tls = 1024
39+
maintenance_window {
40+
days_of_week = [{ name = "MONDAY" }, { name = "TUESDAY" }]
41+
hours_of_day = [4, 16]
42+
lead_time_in_weeks = 3
43+
months = [{ name = "FEBRUARY" }, { name = "MAY" }, { name = "AUGUST" }, { name = "NOVEMBER" }]
44+
preference = "CUSTOM_PREFERENCE"
45+
weeks_of_month = [2, 4]
46+
}
47+
tags = {
48+
"env" = "dev"
49+
}
50+
51+
}

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,15 +290,15 @@ require (
290290
github.com/hashicorp/go-uuid v1.0.3
291291
github.com/hashicorp/go-version v1.7.0
292292
github.com/hashicorp/hcl/v2 v2.23.0
293-
github.com/hashicorp/terraform-json v0.27.1
294-
github.com/hashicorp/terraform-plugin-framework v1.16.0-beta.1.0.20250916190936-6af91641ed1e
293+
github.com/hashicorp/terraform-json v0.27.2
294+
github.com/hashicorp/terraform-plugin-framework v1.16.0
295295
github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0
296296
github.com/hashicorp/terraform-plugin-framework-timeouts v0.5.0
297297
github.com/hashicorp/terraform-plugin-framework-timetypes v0.5.0
298298
github.com/hashicorp/terraform-plugin-framework-validators v0.18.0
299-
github.com/hashicorp/terraform-plugin-go v0.29.0-beta.1.0.20250915194700-c3810b1245c0
299+
github.com/hashicorp/terraform-plugin-go v0.29.0
300300
github.com/hashicorp/terraform-plugin-log v0.9.0
301-
github.com/hashicorp/terraform-plugin-mux v0.21.0-alpha.1.0.20250916191442-c551d8bf1c4f
301+
github.com/hashicorp/terraform-plugin-mux v0.21.0
302302
github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
303303
github.com/hashicorp/terraform-plugin-testing v1.13.3
304304
github.com/jaswdr/faker/v2 v2.8.0

0 commit comments

Comments
 (0)