Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xds: support built-in Stdout audit logger type #6298

Merged
merged 21 commits into from
May 25, 2023
Merged

xds: support built-in Stdout audit logger type #6298

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4d8e4b7
Add test for building stdout logger
gtcooke94 May 18, 2023
f3b679c
Cleanup
gtcooke94 May 18, 2023
58b9e48
%s/steam/stream/
gtcooke94 May 18, 2023
599cb13
go mod tidy compat=1.17
gtcooke94 May 18, 2023
e5de42f
Add test with same name but generic config
gtcooke94 May 18, 2023
3f6f35a
mod tidy
gtcooke94 May 18, 2023
699a42f
vet
gtcooke94 May 18, 2023
218be79
mod tidy
gtcooke94 May 18, 2023
8d3c9c4
mod tidy
gtcooke94 May 18, 2023
f349cdc
mod tidy
gtcooke94 May 18, 2023
ed23d8f
Try different marshaler
gtcooke94 May 18, 2023
0861548
Address comment
gtcooke94 May 23, 2023
eb31885
Address comment
gtcooke94 May 23, 2023
32363cd
Cleanup test case
gtcooke94 May 23, 2023
5997a19
typo Stuct -> Struct
gtcooke94 May 24, 2023
ae08173
Address PR comments - cleanup getCustomConfig and testing types
gtcooke94 May 24, 2023
c283e73
unexport stdout logger
gtcooke94 May 24, 2023
2c689b1
Test cleanup
gtcooke94 May 24, 2023
58a309d
typo
gtcooke94 May 24, 2023
f719de2
simplify helper fn
gtcooke94 May 25, 2023
4cda2b3
use MarshalAny testutil
gtcooke94 May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions internal/xds/rbac/converter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
v3auditloggersstreampb "github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/audit_loggers/stream/v3"
"google.golang.org/grpc/authz/audit"
"google.golang.org/grpc/authz/audit/stdout"
"google.golang.org/grpc/internal/testutils"
"google.golang.org/protobuf/types/known/anypb"
)

Expand Down Expand Up @@ -175,10 +176,5 @@ func createUnsupportedPb(t *testing.T) *anypb.Any {
// proto that is not accepted in our custom config parsing. This was chosen
// because it is already imported.
pb := &v3rbacpb.RBAC_AuditLoggingOptions{}
customConfig, err := anypb.New(pb)
if err != nil {
t.Fatalf("createStdoutPb failed during anypb.New: %v", err)
}
return customConfig

return testutils.MarshalAny(pb)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you missed the point. Remove createUnsupportedPb and replace it with testutils.MarshalAny(&v3rbacpb.RBAC_AuditLoggingOptions{}). But this is fine too if you want, just remove the t parameter to this function since it's effectively unused.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I get it, changed

}