Merge branch 'main' into HEAD

hashicorp · Apr 24, 2024 · 1e9942d · 1e9942d
2 parents 26e1a58 + 312351d
commit 1e9942d
Show file tree

Hide file tree

Showing 240 changed files with 9,715 additions and 2,192 deletions.
diff --git a/.changelog/35991.txt b/.changelog/35991.txt
@@ -0,0 +1,11 @@
+```release-note:new-resource
+aws_globalaccelerator_cross_account_attachment
+```
+
+```release-note:enhancement
+resource/aws_eip: Add `arn` attribute
+```
+
+```release-note:enhancement
+data-source/aws_eip: Add `arn` attribute
+```
diff --git a/.changelog/36646.txt b/.changelog/36646.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_kinesis_firehose_delivery_stream: Add `snowflake_configuration` argument
+```
diff --git a/.changelog/36847.txt b/.changelog/36847.txt
@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_bcmdataexports_export
+```
diff --git a/.changelog/37040.txt b/.changelog/37040.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_api_gateway_rest_api: Correct set `root_resource_id` on resource Read
+```
diff --git a/.changelog/37042.txt b/.changelog/37042.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_appmesh_mesh: Add `spec.service_discovery` argument
+```
diff --git a/.changelog/37059.txt b/.changelog/37059.txt
@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_sagemaker_app_image_config: Add `code_editor_app_image_config` and `jupyter_lab_image_config.jupyter_lab_image_config` arguments
+```
+
+```release-note:enhancement
+resource/aws_sagemaker_app_image_config: Change `kernel_gateway_image_config.kernel_spec` MaxItems to 5
+```
diff --git a/.changelog/37066.txt b/.changelog/37066.txt
@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_servicecatalog_provisioned_product: Fixes error where tag values are not applied to products when tag values don't change.
+```
+
+```release-note:bug
+resource/aws_servicecatalog_portfolio: Fixes error where deletion fails if resource was deleted out of band.
+```
diff --git a/.ci/.semgrep-service-name0.yml b/.ci/.semgrep-service-name0.yml
@@ -4085,3 +4085,17 @@ rules:
             - pattern-not-regex: "^TestAccConfigService"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
+  - id: configservice-in-const-name
+    languages:
+      - go
+    message: Do not use "ConfigService" in const name inside configservice package
+    paths:
+      include:
+        - internal/service/configservice
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)ConfigService"
+    severity: WARNING
diff --git a/.ci/.semgrep-service-name1.yml b/.ci/.semgrep-service-name1.yml
@@ -1,19 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - id: configservice-in-const-name
-    languages:
-      - go
-    message: Do not use "ConfigService" in const name inside configservice package
-    paths:
-      include:
-        - internal/service/configservice
-    patterns:
-      - pattern: const $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)ConfigService"
-    severity: WARNING
   - id: configservice-in-var-name
     languages:
       - go
@@ -4093,3 +4079,18 @@ rules:
       - focus-metavariable: $NAME
       - pattern-not: func $NAME($T *testing.T) { ... }
     severity: WARNING
+  - id: iot-in-test-name
+    languages:
+      - go
+    message: Include "IoT" in test name
+    paths:
+      include:
+        - internal/service/iot/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccIoT"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
diff --git a/.ci/.semgrep-service-name2.yml b/.ci/.semgrep-service-name2.yml
@@ -1,20 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - id: iot-in-test-name
-    languages:
-      - go
-    message: Include "IoT" in test name
-    paths:
-      include:
-        - internal/service/iot/*_test.go
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-not-regex: "^TestAccIoT"
-            - pattern-regex: ^TestAcc.*
-    severity: WARNING
   - id: iot-in-const-name
     languages:
       - go
@@ -4080,3 +4065,49 @@ rules:
             - pattern-not-regex: "^TestAccRDS"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
+  - id: rds-in-const-name
+    languages:
+      - go
+    message: Do not use "RDS" in const name inside rds package
+    paths:
+      include:
+        - internal/service/rds
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)RDS"
+    severity: WARNING
+  - id: rds-in-var-name
+    languages:
+      - go
+    message: Do not use "RDS" in var name inside rds package
+    paths:
+      include:
+        - internal/service/rds
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)RDS"
+    severity: WARNING
+  - id: recyclebin-in-func-name
+    languages:
+      - go
+    message: Do not use "recyclebin" in func name inside rbin package
+    paths:
+      include:
+        - internal/service/rbin
+      exclude:
+        - internal/service/rbin/list_pages_gen.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)recyclebin"
+      - focus-metavariable: $NAME
+      - pattern-not: func $NAME($T *testing.T) { ... }
+    severity: WARNING
diff --git a/.ci/.semgrep-service-name3.yml b/.ci/.semgrep-service-name3.yml
@@ -1,51 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - id: rds-in-const-name
-    languages:
-      - go
-    message: Do not use "RDS" in const name inside rds package
-    paths:
-      include:
-        - internal/service/rds
-    patterns:
-      - pattern: const $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)RDS"
-    severity: WARNING
-  - id: rds-in-var-name
-    languages:
-      - go
-    message: Do not use "RDS" in var name inside rds package
-    paths:
-      include:
-        - internal/service/rds
-    patterns:
-      - pattern: var $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)RDS"
-    severity: WARNING
-  - id: recyclebin-in-func-name
-    languages:
-      - go
-    message: Do not use "recyclebin" in func name inside rbin package
-    paths:
-      include:
-        - internal/service/rbin
-      exclude:
-        - internal/service/rbin/list_pages_gen.go
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)recyclebin"
-      - focus-metavariable: $NAME
-      - pattern-not: func $NAME($T *testing.T) { ... }
-    severity: WARNING
   - id: recyclebin-in-const-name
     languages:
       - go
@@ -776,6 +730,67 @@ rules:
           patterns:
             - pattern-regex: "(?i)Route53Domains"
     severity: WARNING
+  - id: route53profiles-in-func-name
+    languages:
+      - go
+    message: Do not use "Route53Profiles" in func name inside route53profiles package
+    paths:
+      include:
+        - internal/service/route53profiles
+      exclude:
+        - internal/service/route53profiles/list_pages_gen.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Route53Profiles"
+      - focus-metavariable: $NAME
+      - pattern-not: func $NAME($T *testing.T) { ... }
+    severity: WARNING
+  - id: route53profiles-in-test-name
+    languages:
+      - go
+    message: Include "Route53Profiles" in test name
+    paths:
+      include:
+        - internal/service/route53profiles/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccRoute53Profiles"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
+  - id: route53profiles-in-const-name
+    languages:
+      - go
+    message: Do not use "Route53Profiles" in const name inside route53profiles package
+    paths:
+      include:
+        - internal/service/route53profiles
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Route53Profiles"
+    severity: WARNING
+  - id: route53profiles-in-var-name
+    languages:
+      - go
+    message: Do not use "Route53Profiles" in var name inside route53profiles package
+    paths:
+      include:
+        - internal/service/route53profiles
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Route53Profiles"
+    severity: WARNING
   - id: route53recoverycontrolconfig-in-func-name
     languages:
       - go

diff --git a/.ci/providerlint/go.mod b/.ci/providerlint/go.mod
@@ -3,7 +3,7 @@ module github.com/hashicorp/terraform-provider-aws/ci/providerlint
 go 1.22
 
 require (
-	github.com/aws/aws-sdk-go v1.51.24
+	github.com/aws/aws-sdk-go v1.51.27
 	github.com/bflad/tfproviderlint v0.29.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
 	golang.org/x/tools v0.13.0

diff --git a/.ci/providerlint/go.sum b/.ci/providerlint/go.sum
@@ -9,8 +9,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.51.24 h1:nwL5MaommPkwb7Ixk24eWkdx5HY4of1gD10kFFVAl6A=
-github.com/aws/aws-sdk-go v1.51.24/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+github.com/aws/aws-sdk-go v1.51.27 h1:ZprksHovT4rFfNBHB+Bc/0p4PTntAnTlZP39DMA/Qp8=
+github.com/aws/aws-sdk-go v1.51.27/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=

diff --git a/.ci/providerlint/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/.ci/providerlint/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
diff --git a/.ci/providerlint/vendor/modules.txt b/.ci/providerlint/vendor/modules.txt
@@ -28,7 +28,7 @@ github.com/agext/levenshtein
 # github.com/apparentlymart/go-textseg/v15 v15.0.0
 ## explicit; go 1.16
 github.com/apparentlymart/go-textseg/v15/textseg
-# github.com/aws/aws-sdk-go v1.51.24
+# github.com/aws/aws-sdk-go v1.51.27
 ## explicit; go 1.19
 github.com/aws/aws-sdk-go/aws/awserr
 github.com/aws/aws-sdk-go/aws/endpoints

diff --git a/.ci/tools/go.mod b/.ci/tools/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/pavius/impi v0.0.3
 	github.com/rhysd/actionlint v1.6.27
 	github.com/terraform-linters/tflint v0.50.3
-	github.com/uber-go/gopatch v0.3.0
+	github.com/uber-go/gopatch v0.4.0
 	mvdan.cc/gofumpt v0.6.0
 )
 
@@ -296,18 +296,18 @@ require (
 	go.uber.org/automaxprocs v1.5.3 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/crypto v0.22.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
-	golang.org/x/mod v0.16.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/net v0.24.0 // indirect
 	golang.org/x/oauth2 v0.16.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/term v0.18.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/term v0.19.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.19.0 // indirect
+	golang.org/x/tools v0.20.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/api v0.153.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect