Merge branch 'main' into ec2-instance-action

Author: YakDriver

.changelog/43520.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_elasticache_user_group: Ignore `InvalidParameterValue: User xxx is not a member of user group xxx` errors during group modification
+```

.changelog/43809.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_odb_cloud_autonomous_vm_cluster
+```
+
+```release-note:new-data-source
+aws_odb_cloud_autonomous_vm_cluster
+```

.changelog/44272.txt

@@ -0,0 +1,3 @@
+```release-note:new-data-source
+aws_billing_views
+```

.changelog/44310.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_sagemaker_endpoint_configuration: Fix panic when empty `async_inference_config.output_config.notification_config` block is specified
+```

CHANGELOG.md

@@ -2,9 +2,12 @@
 
 FEATURES:
 
+* **New Data Source:** `aws_billing_views` ([#44272](https://github.com/hashicorp/terraform-provider-aws/issues/44272))
+* **New Data Source:** `aws_odb_cloud_autonomous_vm_cluster` ([#43809](https://github.com/hashicorp/terraform-provider-aws/issues/43809))
 * **New Data Source:** `aws_odb_cloud_exadata_infrastructure` ([#43650](https://github.com/hashicorp/terraform-provider-aws/issues/43650))
 * **New Data Source:** `aws_odb_network` ([#43715](https://github.com/hashicorp/terraform-provider-aws/issues/43715))
 * **New Resource:** `aws_controltower_baseline` ([#42397](https://github.com/hashicorp/terraform-provider-aws/issues/42397))
+* **New Resource:** `aws_odb_cloud_autonomous_vm_cluster` ([#43809](https://github.com/hashicorp/terraform-provider-aws/issues/43809))
 * **New Resource:** `aws_odb_cloud_exadata_infrastructure` ([#43650](https://github.com/hashicorp/terraform-provider-aws/issues/43650))
 * **New Resource:** `aws_odb_network` ([#43715](https://github.com/hashicorp/terraform-provider-aws/issues/43715))
 
@@ -13,6 +16,10 @@ ENHANCEMENTS:
 * 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))
 * resource/aws_scheduler_schedule: Add `action_after_completion` argument ([#44264](https://github.com/hashicorp/terraform-provider-aws/issues/44264))
 
+BUG FIXES:
+
+* 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))
+
 ## 6.13.0 (September 11, 2025)
 
 ENHANCEMENTS:

GNUmakefile

@@ -871,7 +871,7 @@ website-terrafmt: ## [CI] Website Checks / terrafmt
 
 website-terrafmt-fix: ## [CI] Fix Website / terrafmt
 	@echo "make: Fix Website / terrafmt..."
-	@echo "make: terrafmt fix website/docs root files..."
+	@echo "make: Fixing website/docs root files with terrafmt..."
 	@find ./website/docs -maxdepth 1 -type f -name '*.markdown' -exec terrafmt fmt {} \;
 	@for dir in $$(find ./website/docs -maxdepth 1 -type d ! -name docs ! -name cdktf | sort); do \
 		echo "make: Fixing $$dir with terrafmt..."; \

examples/odb/autonomous_vm_cluster.tf

@@ -0,0 +1,51 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+# Autonomous VM Cluster with default maintenance window and minimum parameters
+resource "aws_odb_cloud_autonomous_vm_cluster" "avmc_with_minimum_parameters" {
+  cloud_exadata_infrastructure_id       = "<exadata_infra_id>" # refer your exadata infra id
+  odb_network_id                        = "<odb_net_id>"       # refer_your_odb_net_id
+  display_name                          = "Ofake-avmc-my_avmc"
+  autonomous_data_storage_size_in_tbs   = 5
+  memory_per_oracle_compute_unit_in_gbs = 2
+  total_container_databases             = 1
+  cpu_core_count_per_node               = 40
+  license_model                         = "LICENSE_INCLUDED"
+  # ids of db server. refer your exa infra. This is a manadatory fileld. Refer your cloud exadata infrastructure for db server id
+  db_servers                 = ["<my_db_server_id>"]
+  scan_listener_port_tls     = 8561
+  scan_listener_port_non_tls = 1024
+  maintenance_window {
+    preference = "NO_PREFERENCE"
+  }
+
+}
+
+# Autonomous VM Cluster with all parameters
+resource "aws_odb_cloud_autonomous_vm_cluster" "test" {
+  description                           = "my first avmc"
+  time_zone                             = "UTC"
+  cloud_exadata_infrastructure_id       = "<aws_odb_cloud_exadata_infrastructure.test.id>"
+  odb_network_id                        = "<aws_odb_network.test.id>"
+  display_name                          = "Ofake_my avmc"
+  autonomous_data_storage_size_in_tbs   = 5
+  memory_per_oracle_compute_unit_in_gbs = 2
+  total_container_databases             = 1
+  cpu_core_count_per_node               = 40
+  license_model                         = "LICENSE_INCLUDED"
+  db_servers                            = ["<my_db_server_1>", "<my_db_server_2>"]
+  scan_listener_port_tls                = 8561
+  scan_listener_port_non_tls            = 1024
+  maintenance_window {
+    days_of_week       = [{ name = "MONDAY" }, { name = "TUESDAY" }]
+    hours_of_day       = [4, 16]
+    lead_time_in_weeks = 3
+    months             = [{ name = "FEBRUARY" }, { name = "MAY" }, { name = "AUGUST" }, { name = "NOVEMBER" }]
+    preference         = "CUSTOM_PREFERENCE"
+    weeks_of_month     = [2, 4]
+  }
+  tags = {
+    "env" = "dev"
+  }
+
+}

internal/service/acm/sweep.go

@@ -9,7 +9,9 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/acm"
+	awstypes "github.com/aws/aws-sdk-go-v2/service/acm/types"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-provider-aws/internal/enum"
 	"github.com/hashicorp/terraform-provider-aws/internal/sweep"
 	"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2"
 )
@@ -48,7 +50,12 @@ func sweepCertificates(region string) error {
 	conn := client.ACMClient(ctx)
 	var sweepResources []sweep.Sweepable
 
-	input := acm.ListCertificatesInput{}
+	input := acm.ListCertificatesInput{
+		Includes: &awstypes.Filters{
+			// By default, ListCertificates only returns  RSA_1024 and RSA_2048 certificates
+			KeyTypes: enum.EnumValues[awstypes.KeyAlgorithm](),
+		},
+	}
 	pages := acm.NewListCertificatesPaginator(conn, &input)
 	for pages.HasMorePages() {
 		page, err := pages.NextPage(ctx)

internal/service/apigateway/sweep.go

@@ -305,7 +305,7 @@ func sweepDomainNames(region string) error {
 		for _, v := range page.Items {
 			r := resourceDomainName()
 			d := r.Data(nil)
-			d.SetId(aws.ToString(v.DomainName))
+			d.SetId(domainNameCreateResourceID(aws.ToString(v.DomainName), aws.ToString(v.DomainNameId)))
 
 			sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client))
 		}

internal/service/athena/data_catalog.go

@@ -198,6 +198,9 @@ func resourceDataCatalogDelete(ctx context.Context, d *schema.ResourceData, meta
 	if errs.IsA[*types.ResourceNotFoundException](err) {
 		return diags
 	}
+	if errs.IsAErrorMessageContains[*types.InvalidRequestException](err, "was not found") {
+		return diags
+	}
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "deleting Athena Data Catalog (%s): %s", d.Id(), err)