Merge branch 'main' into b-sns-policy-principal-race

.actrc

@@ -1,3 +1,3 @@
 # Needed for testing our workflows
--P ubuntu-latest=ghcr.io/catthehacker/ubuntu:full-18.04
--P medium=ghcr.io/catthehacker/ubuntu:full-18.04
+-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-22.04
+-P medium=ghcr.io/catthehacker/ubuntu:act-22.04

.changelog/27472.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_prometheus_workspace: Create a logging configuration on resource update if none existed previously
+```

.changelog/29223.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+provider: Masks authentication fields in HTTP header logging
+```
+
+```release-note:enhancement
+provider: Adds structured fields in logging
+```

.changelog/29243.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_s3_bucket: Fix crash when `logging` is empty
+```

.changelog/29245.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_kms_grant: Retries until valid principal ARNs are returned instead of not updating state
+```

.ci/.semgrep.yml

@@ -226,8 +226,6 @@ rules:
     paths:
       include:
         - internal/
-      exclude:
-        - internal/service/apigateway/integration.go
     patterns:
       - pattern-either:
           - pattern: |

.ci/providerlint/go.mod

@@ -3,7 +3,7 @@ module github.com/hashicorp/terraform-provider-aws/ci/providerlint
 go 1.19
 
 require (
-	github.com/aws/aws-sdk-go v1.44.191
+	github.com/aws/aws-sdk-go v1.44.194
 	github.com/bflad/tfproviderlint v0.28.1
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
 	golang.org/x/tools v0.1.12

.ci/providerlint/go.sum

@@ -63,8 +63,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY
 github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
 github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
-github.com/aws/aws-sdk-go v1.44.191 h1:GnbkalCx/AgobaorDMFCa248acmk+91+aHBQOk7ljzU=
-github.com/aws/aws-sdk-go v1.44.191/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.194 h1:1ZDK+QDcc5oRbZGgRZSz561eR8XVizXCeGpoZKo33NU=
+github.com/aws/aws-sdk-go v1.44.194/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 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.28.1 h1:7f54/ynV6/lK5/1EyG7tHtc4sMdjJSEFGjZNRJKwBs8=

.ci/providerlint/vendor/modules.txt

@@ -4,7 +4,7 @@ github.com/agext/levenshtein
 # github.com/apparentlymart/go-textseg/v13 v13.0.0
 ## explicit; go 1.16
 github.com/apparentlymart/go-textseg/v13/textseg
-# github.com/aws/aws-sdk-go v1.44.191
+# github.com/aws/aws-sdk-go v1.44.194
 ## explicit; go 1.11
 github.com/aws/aws-sdk-go/aws/awserr
 github.com/aws/aws-sdk-go/aws/endpoints

.ci/semgrep/aws/arn.yml

@@ -3,5 +3,8 @@ rules:
     languages: [go]
     message: Prefer `aws.IsARN` to `strings.HasPrefix`
     patterns:
-      - pattern: strings.HasPrefix($STR, "arn:")
+      - pattern: strings.HasPrefix($STR, $ARN)
+      - metavariable-regex:
+          metavariable: $ARN
+          regex: ^\"arn:[^"]*\"$
     severity: WARNING