Merge branch 'master' into Keycloak-saml-sso-docs

.github/workflows/lint.yaml

@@ -235,7 +235,7 @@ jobs:
       - name: Check if Terraform resources are up to date
         # We have to add the current directory as a safe directory or else git commands will not work as expected.
         # The protoc-gen-terraform version must match the version in integrations/terraform/Makefile
-        run: git config --global --add safe.directory $(realpath .) && go install github.com/gravitational/protoc-gen-terraform@c91cc3ef4d7d0046c36cb96b1cd337e466c61225 && make terraform-resources-up-to-date
+        run: git config --global --add safe.directory $(realpath .) && go install github.com/gravitational/protoc-gen-terraform/[email protected] && make terraform-resources-up-to-date
 
   lint-rfd:
     name: Lint (RFD)

.golangci.yml

@@ -115,14 +115,6 @@ linters-settings:
             desc: 'use "crypto" or "x/crypto" instead'
       # Prevent importing any additional logging libraries.
       logging:
-        files:
-          # Integrations are still allowed to use logrus becuase they haven't
-          # been converted to slog yet. Once they use slog, remove this exception.
-          - '!**/integrations/**'
-          # The log package still contains the logrus formatter consumed by the integrations.
-          # Remove this exception when said formatter is deleted.
-          - '!**/lib/utils/log/**'
-          - '!**/lib/utils/cli.go'
         deny:
           - pkg: github.com/sirupsen/logrus
             desc: 'use "log/slog" instead'