Merge branch 'main' into f-aws_iam_role-upgrade-to-framework-and-inli…

…ne-poliy-change

.changelog/33412.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_instance: Fix `ReservationCapacityExceeded` errors when updating `instance_type` and `capacity_reservation_specification.capacity_reservation_target.capacity_reservation_id`
+```

.changelog/34055.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_verifiedaccess_group: Add `sse_configuration` argument
+```

.changelog/34367.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_emr_cluster: Properly normalize `launch_specifications.on_demand_specification.allocation_strategy` and `launch_specifications.spot_specification.allocation_strategy` values to fix perpetual state differences
+```

.changelog/35500.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_db_instance: Add `domain_auth_secret_arn`, `domain_dns_ips`, `domain_fqdn`, and `domain_ou` arguments to support [self-managed Active Directory](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_SQLServer_SelfManagedActiveDirectory.html)
+```

.changelog/35542.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_glue_trigger: Add configurable `timeouts`
+```

.changelog/35569.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_cloudwatch_metric_stream: Add plan-time validation of `output_format`
+```

.changelog/35582.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_osis_pipeline
+```

.changelog/35589.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_db_instance: Creating resource from point-in-time recovery now handles `password` attribute correctly
+```

.changelog/35590.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_s3_bucket_metric: Add `filter.access_point` argument
+```

.changelog/35630.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_dynamodb_table: Ensure that `replica`s are always set on Read
+```

.changelog/35671.txt

@@ -0,0 +1,15 @@
+```release-note:bug
+resource/aws_lb_listener: Was not storing `default_action[].forward` in state if only a single `target_group` was set.
+```
+
+```release-note:bug
+resource/aws_lb_listener_rule: Was not storing `action[].forward` in state if only a single `target_group` was set.
+```
+
+```release-note:bug
+resource/aws_lb_listener: Was incorrectly reporting conflicting `default_action[].target_group_arn` when `ignore_changes` was set.
+```
+
+```release-note:bug
+resource/aws_lb_listener_rule: Was incorrectly reporting conflicting `action[].target_group_arn` when `ignore_changes` was set.
+```

.changelog/35672.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_kinesis_firehose_delivery_stream: Change `extended_s3_configuration.processing_configuration.processors.parameters` from `TypeList` to `TypeSet` as order is not significant
+```

.changelog/35678.txt

@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_lb_listener: Fixes unexpected diff when using `default_action` parameters which don't match the `type`.
+```
+
+```release-note:bug
+resource/aws_lb_listener_rule: Fixes unexpected diff when using `action` parameters which don't match the `type`.
+```

.changelog/35694.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_lambda_function: Resolve consecutive diff issue in `logging_config` when values for `application_log_level` or `system_log_level` are not specified
+```

.changelog/35698.txt

@@ -0,0 +1,15 @@
+```release-note:enhancement
+data-source/aws_rds_orderable_db_instance: Improve search functionality and options by adding `engine_latest_version` and `supports_clusters` arguments and converting `read_replica_capable`, `supported_engine_modes`, `supported_network_types`, and `supports_multi_az` to arguments for use as search criteria
+```
+
+```release-note:enhancement
+data-source/aws_rds_engine_version: Improve search functionality and options by adding `latest`, `preferred_major_targets`, and `preferred_upgrade_targets`. Add `version_actual` attribute
+```
+
+```release-note:new-data-source
+aws_db_parameter_group
+```
+
+```release-note:enhancement
+data-source/aws_neptune_cluster_instance: Add `skip_final_snapshot` argument
+```

.changelog/35703.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_redshift_data_share_authorization
+```

.changelog/35736.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_eks_access_policy_association: Retry IAM eventual consistency errors on create
+```

.changelog/35738.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_medialive_channel: Added `client_cache` to `hls_group_settings`.
+```

.ci/.golangci2.yml

@@ -49,7 +49,7 @@ issues:
     - linters:
         - staticcheck
       path: "internal/service/cloudtrail"
-      text: "SA1019: \\w+.(\\w+) is deprecated: (\\w+) has been deprecated"
+      text: "SA1019: \\w+.(\\w+) is deprecated: This member has been deprecated"
     - linters:
         - staticcheck
       path: internal/service/detective/

.ci/.semgrep-service-name0.yml

@@ -1695,6 +1695,65 @@ rules:
           patterns:
             - pattern-regex: "(?i)Bedrock"
     severity: WARNING
+  - id: bedrockagent-in-func-name
+    languages:
+      - go
+    message: Do not use "BedrockAgent" in func name inside bedrockagent package
+    paths:
+      include:
+        - internal/service/bedrockagent
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)BedrockAgent"
+            - pattern-not-regex: ^TestAcc.*
+      - focus-metavariable: $NAME
+    severity: WARNING
+  - id: bedrockagent-in-test-name
+    languages:
+      - go
+    message: Include "BedrockAgent" in test name
+    paths:
+      include:
+        - internal/service/bedrockagent/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccBedrockAgent"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
+  - id: bedrockagent-in-const-name
+    languages:
+      - go
+    message: Do not use "BedrockAgent" in const name inside bedrockagent package
+    paths:
+      include:
+        - internal/service/bedrockagent
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)BedrockAgent"
+    severity: WARNING
+  - id: bedrockagent-in-var-name
+    languages:
+      - go
+    message: Do not use "BedrockAgent" in var name inside bedrockagent package
+    paths:
+      include:
+        - internal/service/bedrockagent
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)BedrockAgent"
+    severity: WARNING
   - id: budgets-in-func-name
     languages:
       - go
@@ -3794,35 +3853,3 @@ rules:
           patterns:
             - pattern-regex: "(?i)ConfigService"
     severity: WARNING
-  - id: connect-in-func-name
-    languages:
-      - go
-    message: Do not use "Connect" in func name inside connect package
-    paths:
-      include:
-        - internal/service/connect
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)Connect"
-            - pattern-not-regex: .*uickConnect.*
-            - pattern-not-regex: ^TestAcc.*
-      - focus-metavariable: $NAME
-    severity: WARNING
-  - id: connect-in-test-name
-    languages:
-      - go
-    message: Include "Connect" in test name
-    paths:
-      include:
-        - internal/service/connect/*_test.go
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-not-regex: "^TestAccConnect"
-            - pattern-regex: ^TestAcc.*
-    severity: WARNING

.ci/.semgrep-service-name1.yml

@@ -1,5 +1,37 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: connect-in-func-name
+    languages:
+      - go
+    message: Do not use "Connect" in func name inside connect package
+    paths:
+      include:
+        - internal/service/connect
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Connect"
+            - pattern-not-regex: .*uickConnect.*
+            - pattern-not-regex: ^TestAcc.*
+      - focus-metavariable: $NAME
+    severity: WARNING
+  - id: connect-in-test-name
+    languages:
+      - go
+    message: Include "Connect" in test name
+    paths:
+      include:
+        - internal/service/connect/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccConnect"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
   - id: connect-in-const-name
     languages:
       - go
@@ -3806,33 +3838,3 @@ rules:
           patterns:
             - pattern-regex: "(?i)IoTAnalytics"
     severity: WARNING
-  - id: iotanalytics-in-var-name
-    languages:
-      - go
-    message: Do not use "IoTAnalytics" in var name inside iotanalytics package
-    paths:
-      include:
-        - internal/service/iotanalytics
-    patterns:
-      - pattern: var $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)IoTAnalytics"
-    severity: WARNING
-  - id: iotevents-in-func-name
-    languages:
-      - go
-    message: Do not use "IoTEvents" in func name inside iotevents package
-    paths:
-      include:
-        - internal/service/iotevents
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)IoTEvents"
-            - pattern-not-regex: ^TestAcc.*
-      - focus-metavariable: $NAME
-    severity: WARNING

.ci/.semgrep-service-name2.yml

@@ -1,5 +1,35 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: iotanalytics-in-var-name
+    languages:
+      - go
+    message: Do not use "IoTAnalytics" in var name inside iotanalytics package
+    paths:
+      include:
+        - internal/service/iotanalytics
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)IoTAnalytics"
+    severity: WARNING
+  - id: iotevents-in-func-name
+    languages:
+      - go
+    message: Do not use "IoTEvents" in func name inside iotevents package
+    paths:
+      include:
+        - internal/service/iotevents
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)IoTEvents"
+            - pattern-not-regex: ^TestAcc.*
+      - focus-metavariable: $NAME
+    severity: WARNING
   - id: iotevents-in-test-name
     languages:
       - go
@@ -3809,17 +3839,3 @@ rules:
             - pattern-not-regex: "^TestAccRedshift"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
-  - id: redshift-in-const-name
-    languages:
-      - go
-    message: Do not use "Redshift" in const name inside redshift package
-    paths:
-      include:
-        - internal/service/redshift
-    patterns:
-      - pattern: const $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)Redshift"
-    severity: WARNING

.ci/.semgrep-service-name3.yml

@@ -1,5 +1,19 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: redshift-in-const-name
+    languages:
+      - go
+    message: Do not use "Redshift" in const name inside redshift package
+    paths:
+      include:
+        - internal/service/redshift
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Redshift"
+    severity: WARNING
   - id: redshift-in-var-name
     languages:
       - go

.ci/providerlint/go.mod

@@ -3,7 +3,7 @@ module github.com/hashicorp/terraform-provider-aws/ci/providerlint
 go 1.20
 
 require (
-	github.com/aws/aws-sdk-go v1.50.9
+	github.com/aws/aws-sdk-go v1.50.14
 	github.com/bflad/tfproviderlint v0.29.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.32.0
 	golang.org/x/tools v0.13.0

.ci/providerlint/go.sum

@@ -7,8 +7,8 @@ github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki
 github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
 github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
 github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
-github.com/aws/aws-sdk-go v1.50.9 h1:yX66aKnEtRc/uNV/1EH8CudRT5aLwVwcSwTBphuVPt8=
-github.com/aws/aws-sdk-go v1.50.9/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+github.com/aws/aws-sdk-go v1.50.14 h1:m1bxKtd1lJpNnl+Owah0+UPRuS9f3GFvxBPgc8RiodE=
+github.com/aws/aws-sdk-go v1.50.14/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/bflad/gopaniccheck v0.1.0 h1:tJftp+bv42ouERmUMWLoUn/5bi/iQZjHPznM00cP/bU=
 github.com/bflad/gopaniccheck v0.1.0/go.mod h1:ZCj2vSr7EqVeDaqVsWN4n2MwdROx1YL+LFo47TSWtsA=
 github.com/bflad/tfproviderlint v0.29.0 h1:zxKYAAM6IZ4ace1a3LX+uzMRIMP8L+iOtEc+FP2Yoow=