Merge branch 'main' into t-skip-TeamCity-testing-EOL

# Conflicts:
#	.teamcity/components/generated/services_all.kt

Author: ewbankkit

.ci/.semgrep-service-name0.yml

@@ -4465,17 +4465,3 @@ rules:
           patterns:
             - pattern-regex: "(?i)ConfigService"
     severity: WARNING
-  - id: configservice-in-var-name
-    languages:
-      - go
-    message: Do not use "ConfigService" in var name inside configservice package
-    paths:
-      include:
-        - "/internal/service/configservice"
-    patterns:
-      - pattern: var $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)ConfigService"
-    severity: WARNING

.ci/.semgrep-service-name1.yml

@@ -1,5 +1,19 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: configservice-in-var-name
+    languages:
+      - go
+    message: Do not use "ConfigService" in var name inside configservice package
+    paths:
+      include:
+        - "/internal/service/configservice"
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)ConfigService"
+    severity: WARNING
   - id: connect-in-func-name
     languages:
       - go
@@ -4446,50 +4460,3 @@ rules:
           patterns:
             - pattern-regex: "(?i)IoT"
     severity: WARNING
-  - id: iot-in-var-name
-    languages:
-      - go
-    message: Do not use "IoT" in var name inside iot package
-    paths:
-      include:
-        - "/internal/service/iot"
-    patterns:
-      - pattern: var $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)IoT"
-    severity: WARNING
-  - id: ipam-in-test-name
-    languages:
-      - go
-    message: Include "IPAM" in test name
-    paths:
-      include:
-        - "/internal/service/ec2/ipam_*_test.go"
-    patterns:
-      - pattern: func $NAME( ... )
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-not-regex: "^TestAccIPAM"
-            - pattern-regex: ^TestAcc.*
-    severity: WARNING
-  - id: ivs-in-func-name
-    languages:
-      - go
-    message: Do not use "IVS" in func name inside ivs package
-    paths:
-      include:
-        - "/internal/service/ivs"
-      exclude:
-        - "/internal/service/ivs/list_pages_gen.go"
-    patterns:
-      - pattern: func $NAME( ... )
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)IVS"
-      - focus-metavariable: $NAME
-      - pattern-not: func $NAME($T *testing.T)
-    severity: WARNING

.ci/.semgrep-service-name2.yml

@@ -1,5 +1,52 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: iot-in-var-name
+    languages:
+      - go
+    message: Do not use "IoT" in var name inside iot package
+    paths:
+      include:
+        - "/internal/service/iot"
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)IoT"
+    severity: WARNING
+  - id: ipam-in-test-name
+    languages:
+      - go
+    message: Include "IPAM" in test name
+    paths:
+      include:
+        - "/internal/service/ec2/ipam_*_test.go"
+    patterns:
+      - pattern: func $NAME( ... )
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccIPAM"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
+  - id: ivs-in-func-name
+    languages:
+      - go
+    message: Do not use "IVS" in func name inside ivs package
+    paths:
+      include:
+        - "/internal/service/ivs"
+      exclude:
+        - "/internal/service/ivs/list_pages_gen.go"
+    patterns:
+      - pattern: func $NAME( ... )
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)IVS"
+      - focus-metavariable: $NAME
+      - pattern-not: func $NAME($T *testing.T)
+    severity: WARNING
   - id: ivs-in-test-name
     languages:
       - go
@@ -1432,67 +1479,6 @@ rules:
           patterns:
             - pattern-regex: "(?i)Logs"
     severity: WARNING
-  - id: lookoutmetrics-in-func-name
-    languages:
-      - go
-    message: Do not use "LookoutMetrics" in func name inside lookoutmetrics package
-    paths:
-      include:
-        - "/internal/service/lookoutmetrics"
-      exclude:
-        - "/internal/service/lookoutmetrics/list_pages_gen.go"
-    patterns:
-      - pattern: func $NAME( ... )
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)LookoutMetrics"
-      - focus-metavariable: $NAME
-      - pattern-not: func $NAME($T *testing.T)
-    severity: WARNING
-  - id: lookoutmetrics-in-test-name
-    languages:
-      - go
-    message: Include "LookoutMetrics" in test name
-    paths:
-      include:
-        - "/internal/service/lookoutmetrics/*_test.go"
-    patterns:
-      - pattern: func $NAME( ... )
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-not-regex: "^TestAccLookoutMetrics"
-            - pattern-regex: ^TestAcc.*
-    severity: WARNING
-  - id: lookoutmetrics-in-const-name
-    languages:
-      - go
-    message: Do not use "LookoutMetrics" in const name inside lookoutmetrics package
-    paths:
-      include:
-        - "/internal/service/lookoutmetrics"
-    patterns:
-      - pattern: const $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)LookoutMetrics"
-    severity: WARNING
-  - id: lookoutmetrics-in-var-name
-    languages:
-      - go
-    message: Do not use "LookoutMetrics" in var name inside lookoutmetrics package
-    paths:
-      include:
-        - "/internal/service/lookoutmetrics"
-    patterns:
-      - pattern: var $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)LookoutMetrics"
-    severity: WARNING
   - id: m2-in-func-name
     languages:
       - go

.teamcity/components/generated/services_all.kt

@@ -144,7 +144,6 @@ val services = mapOf(
     "lightsail" to ServiceSpec("Lightsail", regionOverride = "us-east-1"),
     "location" to ServiceSpec("Location"),
     "logs" to ServiceSpec("CloudWatch Logs"),
-    "lookoutmetrics" to ServiceSpec("Lookout for Metrics"),
     "macie2" to ServiceSpec("Macie"),
     "mediaconnect" to ServiceSpec("Elemental MediaConnect"),
     "mediaconvert" to ServiceSpec("Elemental MediaConvert"),

CHANGELOG.md

@@ -5,6 +5,7 @@ ENHANCEMENTS:
 * action/aws_lambda_invoke: Add `tenant_id` argument ([#45170](https://github.com/hashicorp/terraform-provider-aws/issues/45170))
 * data-source/aws_lambda_function: Add `tenancy_config` attribute ([#45170](https://github.com/hashicorp/terraform-provider-aws/issues/45170))
 * data-source/aws_lambda_invocation: Add `tenant_id` argument ([#45170](https://github.com/hashicorp/terraform-provider-aws/issues/45170))
+* resoource/aws_ecs_capacity_provider: Add `managed_instances_provider.infrastructure_optimization` argument ([#45142](https://github.com/hashicorp/terraform-provider-aws/issues/45142))
 * resource/aws_lambda_function: Add `tenancy_config` argument ([#45170](https://github.com/hashicorp/terraform-provider-aws/issues/45170))
 * resource/aws_lambda_invocation: Add `tenant_id` argument ([#45170](https://github.com/hashicorp/terraform-provider-aws/issues/45170))
 

go.mod

@@ -163,7 +163,6 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/licensemanager v1.37.0
 	github.com/aws/aws-sdk-go-v2/service/lightsail v1.50.7
 	github.com/aws/aws-sdk-go-v2/service/location v1.50.5
-	github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.37.2
 	github.com/aws/aws-sdk-go-v2/service/m2 v1.26.6
 	github.com/aws/aws-sdk-go-v2/service/macie2 v1.50.5
 	github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.46.1

go.sum

@@ -347,8 +347,6 @@ github.com/aws/aws-sdk-go-v2/service/lightsail v1.50.7 h1:o5kT+nFYZbestjv0GWibkV
 github.com/aws/aws-sdk-go-v2/service/lightsail v1.50.7/go.mod h1:x+omzRoqYYFX+H8/va+Gt2Yg4xGaHZMRowr77Y/UGIA=
 github.com/aws/aws-sdk-go-v2/service/location v1.50.5 h1:W+btCDgh5jJSEb4UT/u3/OKp8yW4kmgpoyDxLNEoz2Q=
 github.com/aws/aws-sdk-go-v2/service/location v1.50.5/go.mod h1:4Qh2hQkY2QVsH3Km3nMSyokJI79SjVjHaEFvYXPTXLQ=
-github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.37.2 h1:IXo/4IslBFio+k7Pm0gLptSh+B2GvSZQKRTDwfs9jkc=
-github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.37.2/go.mod h1:tF6+C2s8Ru1RIyN1jPJR4VVk10Zz7pBhrYgZ72rFy7c=
 github.com/aws/aws-sdk-go-v2/service/m2 v1.26.6 h1:zpwYmq7xX44rrjO86D1lqUPGWDsEL1fxnY6dOcWCd6g=
 github.com/aws/aws-sdk-go-v2/service/m2 v1.26.6/go.mod h1:QIrh5zZOXwPjwk3llMjstgEh5W8wFhmezc2AyZ7g614=
 github.com/aws/aws-sdk-go-v2/service/macie2 v1.50.5 h1:cw3M/pkIjK1KFjvGWFqNCdJqmQU2LSB926+8SJujaC8=