Merge branch 'master' into mysql-user-activated-callback-procedure

.github/workflows/dependency-review.yaml

@@ -25,4 +25,5 @@ jobs:
         pkg:cargo/asn1-rs,
         pkg:cargo/asn1-rs-derive,
         pkg:cargo/asn1-rs-impl,
-        pkg:cargo/der-parser
+        pkg:cargo/der-parser,
+        pkg:npm/prettier

api/client/events.go

@@ -343,6 +343,10 @@ func EventToGRPC(in types.Event) (*proto.Event, error) {
 		out.Resource = &proto.Event_AccessListReview{
 			AccessListReview: accesslistv1conv.ToReviewProto(r),
 		}
+	case *types.PluginStaticCredentialsV1:
+		out.Resource = &proto.Event_PluginStaticCredentials{
+			PluginStaticCredentials: r,
+		}
 	default:
 		return nil, trace.BadParameter("resource type %T is not supported", in.Resource)
 	}
@@ -609,6 +613,9 @@ func EventFromGRPC(in *proto.Event) (*types.Event, error) {
 	} else if r := in.GetIdentityCenterAccountAssignment(); r != nil {
 		out.Resource = types.Resource153ToLegacy(r)
 		return &out, nil
+	} else if r := in.GetPluginStaticCredentials(); r != nil {
+		out.Resource = r
+		return &out, nil
 	} else {
 		return nil, trace.BadParameter("received unsupported resource %T", in.Resource)
 	}