From 99864fdf943e67090983d8f1d4e619e2ab8ffd6a Mon Sep 17 00:00:00 2001 From: Benjamin Pracht Date: Wed, 6 Aug 2025 22:17:42 +0200 Subject: [PATCH 1/3] Redact external_id field --- egress/redact.go | 1 + egress/redact_test.go | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/egress/redact.go b/egress/redact.go index 2badc20bc..6ab1d8ade 100644 --- a/egress/redact.go +++ b/egress/redact.go @@ -9,6 +9,7 @@ func RedactUpload(req UploadRequest) { if s3 := req.GetS3(); s3 != nil { s3.AccessKey = utils.Redact(s3.AccessKey, "{access_key}") s3.Secret = utils.Redact(s3.Secret, "{secret}") + s3.AssumeRoleExternalId = utils.Redact(s3.AssumeRoleExternalId, "{external_id}") return } diff --git a/egress/redact_test.go b/egress/redact_test.go index 5b7412f85..2f0e6d14a 100644 --- a/egress/redact_test.go +++ b/egress/redact_test.go @@ -13,8 +13,9 @@ var ( file = &livekit.EncodedFileOutput{ Output: &livekit.EncodedFileOutput_S3{ S3: &livekit.S3Upload{ - AccessKey: "ACCESS_KEY", - Secret: "LONG_SECRET_STRING", + AccessKey: "ACCESS_KEY", + Secret: "LONG_SECRET_STRING", + AssumeRoleExternalId: "EXTERNAL_ID", }, }, } @@ -52,6 +53,7 @@ func TestRedactUpload(t *testing.T) { require.Equal(t, "{access_key}", cl.(*livekit.EncodedFileOutput).Output.(*livekit.EncodedFileOutput_S3).S3.AccessKey) require.Equal(t, "{secret}", cl.(*livekit.EncodedFileOutput).Output.(*livekit.EncodedFileOutput_S3).S3.Secret) + require.Equal(t, "{external_id}", cl.(*livekit.EncodedFileOutput).Output.(*livekit.EncodedFileOutput_S3).S3.AssumeRoleExternalId) cl = proto.Clone(image) RedactUpload(cl.(UploadRequest)) From 14ea73fd23b0e8a5195f9b916f5a156c6ec66eb8 Mon Sep 17 00:00:00 2001 From: Benjamin Pracht Date: Thu, 7 Aug 2025 12:53:15 +0200 Subject: [PATCH 2/3] Create ninety-dolls-wait.md --- .changeset/ninety-dolls-wait.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/ninety-dolls-wait.md diff --git a/.changeset/ninety-dolls-wait.md b/.changeset/ninety-dolls-wait.md new file mode 100644 index 000000000..1fb51a3c6 --- /dev/null +++ b/.changeset/ninety-dolls-wait.md @@ -0,0 +1,5 @@ +--- +"@livekit/protocol": patch +--- + +Redact external_id field From 320411693b104c73416026bccaac8abc0c58ceeb Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 10:53:50 +0000 Subject: [PATCH 3/3] generated protobuf --- infra/link.pb.go | 2 +- livekit/livekit_agent.pb.go | 2 +- livekit/livekit_agent_dispatch.pb.go | 2 +- livekit/livekit_analytics.pb.go | 2 +- livekit/livekit_cloud_agent.pb.go | 2 +- livekit/livekit_egress.pb.go | 2 +- livekit/livekit_ingress.pb.go | 2 +- livekit/livekit_internal.pb.go | 2 +- livekit/livekit_metrics.pb.go | 2 +- livekit/livekit_models.pb.go | 2 +- livekit/livekit_room.pb.go | 2 +- livekit/livekit_rtc.pb.go | 2 +- livekit/livekit_rtc_v2.pb.go | 2 +- livekit/livekit_sip.pb.go | 2 +- livekit/livekit_webhook.pb.go | 2 +- replay/cloud_replay.pb.go | 2 +- rpc/agent.pb.go | 2 +- rpc/agent_dispatch.pb.go | 2 +- rpc/analytics.pb.go | 2 +- rpc/egress.pb.go | 2 +- rpc/ingress.pb.go | 2 +- rpc/io.pb.go | 2 +- rpc/keepalive.pb.go | 2 +- rpc/participant.pb.go | 2 +- rpc/rest_signal.pb.go | 2 +- rpc/room.pb.go | 2 +- rpc/roommanager.pb.go | 2 +- rpc/signal.pb.go | 2 +- rpc/signalv2.pb.go | 2 +- rpc/signalv2_types.pb.go | 2 +- rpc/sip.pb.go | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/infra/link.pb.go b/infra/link.pb.go index 3f515496c..cf0f99bd6 100644 --- a/infra/link.pb.go +++ b/infra/link.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: infra/link.proto diff --git a/livekit/livekit_agent.pb.go b/livekit/livekit_agent.pb.go index 87f17709b..759b335d5 100644 --- a/livekit/livekit_agent.pb.go +++ b/livekit/livekit_agent.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_agent.proto diff --git a/livekit/livekit_agent_dispatch.pb.go b/livekit/livekit_agent_dispatch.pb.go index 1d3e88ff1..3e20f2f92 100644 --- a/livekit/livekit_agent_dispatch.pb.go +++ b/livekit/livekit_agent_dispatch.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_agent_dispatch.proto diff --git a/livekit/livekit_analytics.pb.go b/livekit/livekit_analytics.pb.go index e26aa158a..c30db267b 100644 --- a/livekit/livekit_analytics.pb.go +++ b/livekit/livekit_analytics.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_analytics.proto diff --git a/livekit/livekit_cloud_agent.pb.go b/livekit/livekit_cloud_agent.pb.go index e9a9ba42f..3b079df34 100644 --- a/livekit/livekit_cloud_agent.pb.go +++ b/livekit/livekit_cloud_agent.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_cloud_agent.proto diff --git a/livekit/livekit_egress.pb.go b/livekit/livekit_egress.pb.go index 3be208f5d..0ac5a13ae 100644 --- a/livekit/livekit_egress.pb.go +++ b/livekit/livekit_egress.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_egress.proto diff --git a/livekit/livekit_ingress.pb.go b/livekit/livekit_ingress.pb.go index d89b90b8b..2c4375a53 100644 --- a/livekit/livekit_ingress.pb.go +++ b/livekit/livekit_ingress.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_ingress.proto diff --git a/livekit/livekit_internal.pb.go b/livekit/livekit_internal.pb.go index 0b073c3fa..927145127 100644 --- a/livekit/livekit_internal.pb.go +++ b/livekit/livekit_internal.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_internal.proto diff --git a/livekit/livekit_metrics.pb.go b/livekit/livekit_metrics.pb.go index 24107c911..cf20dc645 100644 --- a/livekit/livekit_metrics.pb.go +++ b/livekit/livekit_metrics.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_metrics.proto diff --git a/livekit/livekit_models.pb.go b/livekit/livekit_models.pb.go index abb893bca..56d0f0cd2 100644 --- a/livekit/livekit_models.pb.go +++ b/livekit/livekit_models.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_models.proto diff --git a/livekit/livekit_room.pb.go b/livekit/livekit_room.pb.go index 3f40440dd..1a3d59d24 100644 --- a/livekit/livekit_room.pb.go +++ b/livekit/livekit_room.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_room.proto diff --git a/livekit/livekit_rtc.pb.go b/livekit/livekit_rtc.pb.go index 0ed6286e7..b80e88c7e 100644 --- a/livekit/livekit_rtc.pb.go +++ b/livekit/livekit_rtc.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_rtc.proto diff --git a/livekit/livekit_rtc_v2.pb.go b/livekit/livekit_rtc_v2.pb.go index ed817a9ad..4321e5544 100644 --- a/livekit/livekit_rtc_v2.pb.go +++ b/livekit/livekit_rtc_v2.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_rtc_v2.proto diff --git a/livekit/livekit_sip.pb.go b/livekit/livekit_sip.pb.go index e772b8ea8..bb82eae5c 100644 --- a/livekit/livekit_sip.pb.go +++ b/livekit/livekit_sip.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_sip.proto diff --git a/livekit/livekit_webhook.pb.go b/livekit/livekit_webhook.pb.go index 4966b69d4..c2cf94fdf 100644 --- a/livekit/livekit_webhook.pb.go +++ b/livekit/livekit_webhook.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: livekit_webhook.proto diff --git a/replay/cloud_replay.pb.go b/replay/cloud_replay.pb.go index 79f0fa20b..160869ba3 100644 --- a/replay/cloud_replay.pb.go +++ b/replay/cloud_replay.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: cloud_replay.proto diff --git a/rpc/agent.pb.go b/rpc/agent.pb.go index ff74d5cc9..171d0751c 100644 --- a/rpc/agent.pb.go +++ b/rpc/agent.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/agent.proto diff --git a/rpc/agent_dispatch.pb.go b/rpc/agent_dispatch.pb.go index 8bf02b5ad..f9a0e6bb7 100644 --- a/rpc/agent_dispatch.pb.go +++ b/rpc/agent_dispatch.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/agent_dispatch.proto diff --git a/rpc/analytics.pb.go b/rpc/analytics.pb.go index 0dfb4b27d..870edc928 100644 --- a/rpc/analytics.pb.go +++ b/rpc/analytics.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/analytics.proto diff --git a/rpc/egress.pb.go b/rpc/egress.pb.go index a8bb36c6c..b9f0b1f14 100644 --- a/rpc/egress.pb.go +++ b/rpc/egress.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/egress.proto diff --git a/rpc/ingress.pb.go b/rpc/ingress.pb.go index a423e58eb..380f40060 100644 --- a/rpc/ingress.pb.go +++ b/rpc/ingress.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/ingress.proto diff --git a/rpc/io.pb.go b/rpc/io.pb.go index 63e13128c..8ffddfaf6 100644 --- a/rpc/io.pb.go +++ b/rpc/io.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/io.proto diff --git a/rpc/keepalive.pb.go b/rpc/keepalive.pb.go index 4343fe09b..2611dd365 100644 --- a/rpc/keepalive.pb.go +++ b/rpc/keepalive.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/keepalive.proto diff --git a/rpc/participant.pb.go b/rpc/participant.pb.go index 30bc46527..7c314f478 100644 --- a/rpc/participant.pb.go +++ b/rpc/participant.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/participant.proto diff --git a/rpc/rest_signal.pb.go b/rpc/rest_signal.pb.go index 5cd0515f6..d837b44f8 100644 --- a/rpc/rest_signal.pb.go +++ b/rpc/rest_signal.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/rest_signal.proto diff --git a/rpc/room.pb.go b/rpc/room.pb.go index 1f30939cb..8e82a0eaf 100644 --- a/rpc/room.pb.go +++ b/rpc/room.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/room.proto diff --git a/rpc/roommanager.pb.go b/rpc/roommanager.pb.go index 9c6b087c1..ed6116e3f 100644 --- a/rpc/roommanager.pb.go +++ b/rpc/roommanager.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/roommanager.proto diff --git a/rpc/signal.pb.go b/rpc/signal.pb.go index 836c731e1..1f41b8778 100644 --- a/rpc/signal.pb.go +++ b/rpc/signal.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/signal.proto diff --git a/rpc/signalv2.pb.go b/rpc/signalv2.pb.go index c78b88461..b6630f904 100644 --- a/rpc/signalv2.pb.go +++ b/rpc/signalv2.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/signalv2.proto diff --git a/rpc/signalv2_types.pb.go b/rpc/signalv2_types.pb.go index fc0892906..453d42e32 100644 --- a/rpc/signalv2_types.pb.go +++ b/rpc/signalv2_types.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/signalv2_types.proto diff --git a/rpc/sip.pb.go b/rpc/sip.pb.go index f3e26ebbe..aa782b216 100644 --- a/rpc/sip.pb.go +++ b/rpc/sip.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc v4.23.4 // source: rpc/sip.proto