From 1d4d05c94ca092b4279cfc98af2f26d7d19fedb1 Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Tue, 14 Jun 2022 18:25:33 +0530 Subject: [PATCH] Improve relay audit log test --- pkg/service/relay_audit_query_test.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/service/relay_audit_query_test.go b/pkg/service/relay_audit_query_test.go index 85aad70..1a954e3 100644 --- a/pkg/service/relay_audit_query_test.go +++ b/pkg/service/relay_audit_query_test.go @@ -92,9 +92,13 @@ func TestGetRelayAuditLogByProjectsSimple(t *testing.T) { QueryString: "query-string", Projects: []string{"project-one", "project-two"}, Timefrom: "now-1h", - Type: "fake-type", - User: "fake-user", - Client: "fake-client", + Type: "test-type", + User: "test-user", + Client: "test-client", + Cluster: "test-cluster", + Namespace: "test-namespace", + Kind: "test-kind", + Method: "test-method", DashboardData: true, }, } @@ -110,7 +114,7 @@ func TestGetRelayAuditLogByProjectsSimple(t *testing.T) { if err != nil { t.Fatal("unable to unmarshall es request") } - expected := `{"_source":["json"],"aggs":{"group_by_cluster":{"aggs":{"group_by_namespace":{"terms":{"field":"json.ns","size":1000}},"group_by_username":{"terms":{"field":"json.un","size":1000}}},"terms":{"field":"json.cn","size":1000}},"group_by_kind":{"terms":{"field":"json.k"}},"group_by_method":{"terms":{"field":"json.m"}},"group_by_namespace":{"terms":{"field":"json.ns"}},"group_by_username":{"terms":{"field":"json.un"}}},"query":{"bool":{"filter":{"range":{"json.ts":{"gte":"now-1h","lt":"now"}}},"must":[{"term":{"json.un":"fake-user"}},{"terms":{"json.project":["project-one","project-two"]}},{"query_string":{"query":"query-string"}}]}},"size":0,"sort":{"json.ts":{"order":"desc"}}}` + expected := `{"_source":["json"],"aggs":{"group_by_cluster":{"aggs":{"group_by_namespace":{"terms":{"field":"json.ns","size":1000}},"group_by_username":{"terms":{"field":"json.un","size":1000}}},"terms":{"field":"json.cn","size":1000}},"group_by_kind":{"terms":{"field":"json.k"}},"group_by_method":{"terms":{"field":"json.m"}},"group_by_namespace":{"terms":{"field":"json.ns"}},"group_by_username":{"terms":{"field":"json.un"}}},"query":{"bool":{"filter":{"range":{"json.ts":{"gte":"now-1h","lt":"now"}}},"must":[{"term":{"json.un":"test-user"}},{"term":{"json.cn":"test-cluster"}},{"term":{"json.ns":"test-namespace"}},{"term":{"json.k":"test-kind"}},{"term":{"json.m":"test-method"}},{"terms":{"json.project":["project-one","project-two"]}},{"query_string":{"query":"query-string"}}]}},"size":0,"sort":{"json.ts":{"order":"desc"}}}` if strings.TrimSpace(esq.msg[0].String()) != expected { t.Errorf("incorrect es query; expected '%v', got '%v'", expected, strings.TrimSpace(esq.msg[0].String())) }