Merge branch 'master' into smallinsky/aws-ic-group-filter

gravitational · Jan 26, 2025 · 347b7ff · 347b7ff
2 parents 61b3e6f + 6b6b0cd
commit 347b7ff
Show file tree

Hide file tree

Showing 204 changed files with 1,355 additions and 1,221 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -58,6 +58,10 @@ issues:
     - linters: [govet]
       path-except: ^e/
       text: 'non-constant format string in call to github.com/gravitational/trace.'
+    # BlockUntilContext should indeed be favored, this exception exists because
+    # at this time there are too many offenders.
+    - linters: [staticcheck]
+      text: 'BlockUntil is deprecated: New code should prefer BlockUntilContext'
   exclude-use-default: true
   max-same-issues: 0
   max-issues-per-linter: 0

diff --git a/api/client/proto/event.pb.go b/api/client/proto/event.pb.go
diff --git a/api/gen/proto/go/teleport/accessgraph/v1/authorized_key.pb.go b/api/gen/proto/go/teleport/accessgraph/v1/authorized_key.pb.go
diff --git a/api/gen/proto/go/teleport/accessgraph/v1/private_key.pb.go b/api/gen/proto/go/teleport/accessgraph/v1/private_key.pb.go
diff --git a/api/gen/proto/go/teleport/accessgraph/v1/secrets_service.pb.go b/api/gen/proto/go/teleport/accessgraph/v1/secrets_service.pb.go
diff --git a/api/gen/proto/go/teleport/accesslist/v1/accesslist.pb.go b/api/gen/proto/go/teleport/accesslist/v1/accesslist.pb.go
diff --git a/api/gen/proto/go/teleport/accesslist/v1/accesslist_service.pb.go b/api/gen/proto/go/teleport/accesslist/v1/accesslist_service.pb.go