From 4a4a33e5f2714231ec81be81d932b8b5eb0cd399 Mon Sep 17 00:00:00 2001 From: josunect Date: Thu, 9 May 2024 09:57:12 +0100 Subject: [PATCH] Update tests with new format --- business/workloads_test.go | 2 +- tests/data/logs/ztunnel.log | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/business/workloads_test.go b/business/workloads_test.go index aad981f556..1e9eaf147b 100644 --- a/business/workloads_test.go +++ b/business/workloads_test.go @@ -735,7 +735,7 @@ func TestGetZtunnelPodLogsProxy(t *testing.T) { require.Equal(1, len(podLogs.Entries)) entry := podLogs.Entries[0] - assert.Equal("[ztunnel] src.addr=10.244.0.16:51748 src.workload=\"productpage-v1-87d54dd59-fzflt\" src.namespace=\"bookinfo\" src.identity=\"spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage\" dst.addr=10.244.0.11:15008 dst.service=\"details.bookinfo.svc.cluster.local\" dst.workload=\"details-v1-cf74bb974-wg44w\" dst.namespace=\"bookinfo\" dst.identity=\"spiffe://cluster.local/ns/bookinfo/sa/bookinfo-details\" direction=\"outbound\" bytes_sent=200 bytes_recv=358 duration=\"1ms\"\n", entry.Message) + assert.Equal("[ztunnel] src.addr=10.244.0.16:51748 src.workload=productpage-v1-87d54dd59-fzflt src.namespace=bookinfo src.identity=\"spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage\" dst.addr=10.244.0.11:15008 dst.service=details.bookinfo.svc.cluster.local dst.workload=details-v1-cf74bb974-wg44w dst.namespace=bookinfo dst.identity=\"spiffe://cluster.local/ns/bookinfo/sa/bookinfo-details\" direction=\"outbound\" bytes_sent=200 bytes_recv=358 duration=\"1ms\"\n", entry.Message) assert.Equal("2024-04-12 10:31:51.078", entry.Timestamp) assert.NotNil(entry.AccessLog) assert.Equal("358", entry.AccessLog.BytesReceived) diff --git a/tests/data/logs/ztunnel.log b/tests/data/logs/ztunnel.log index a496c0e0d7..b336a98f74 100644 --- a/tests/data/logs/ztunnel.log +++ b/tests/data/logs/ztunnel.log @@ -1,11 +1,11 @@ -2024-04-12T10:17:44.080629Z info access connection complete src.addr=10.244.0.16:52008 src.workload="productpage-v1-87d54dd59-fzflt" src.namespace="bookinfo" src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.14:15008 dst.service="reviews.bookinfo.svc.cluster.local" dst.workload="reviews-v2-6f9b55c5db-vnpzr" dst.namespace="bookinfo" dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-reviews" direction="outbound" bytes_sent=200 bytes_recv=603 duration="2ms" -2024-04-12T10:17:44.081519Z info access connection complete src.addr=10.244.0.5:45896 src.workload="istio-ingressgateway-cbdcbb75c-9q9nb" src.namespace="istio-system" src.identity="spiffe://cluster.local/ns/istio-system/sa/istio-ingressgateway-service-account" dst.addr=10.244.0.16:9080 dst.hbone_addr="10.244.0.16:9080" dst.service="productpage.bookinfo.svc.cluster.local" dst.workload="productpage-v1-87d54dd59-fzflt" dst.namespace="productpage" dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" direction="inbound" bytes_sent=5483 bytes_recv=1551 duration="8ms" -2024-04-12T10:31:51.078103Z info access connection complete src.addr=10.244.0.16:51748 src.workload="productpage-v1-87d54dd59-fzflt" src.namespace="bookinfo" src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.11:15008 dst.service="details.bookinfo.svc.cluster.local" dst.workload="details-v1-cf74bb974-wg44w" dst.namespace="bookinfo" dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-details" direction="outbound" bytes_sent=200 bytes_recv=358 duration="1ms" -2024-04-12T14:25:33.985405Z info access connection complete src.addr=10.244.0.16:59115 src.workload="productpage-v1-87d54dd59-p4c4f" src.namespace="bookinfo" src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.14:9080 dst.hbone_addr="10.244.0.14:9080" dst.service="reviews.bookinfo.svc.cluster.local" dst.workload="reviews-v3-7d99fd7978-qfjpc" dst.namespace="reviews" dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-reviews" direction="inbound" bytes_sent=599 bytes_recv=200 duration="6ms" -2024-04-12T14:25:33.985492Z info access connection complete src.addr=10.244.0.16:35204 src.workload="productpage-v1-87d54dd59-p4c4f" src.namespace="bookinfo" src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.14:15008 dst.service="reviews.bookinfo.svc.cluster.local" dst.workload="reviews-v3-7d99fd7978-qfjpc" dst.namespace="bookinfo" dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-reviews" direction="outbound" bytes_sent=200 bytes_recv=599 duration="6ms" -2024-04-12T14:25:33.986169Z info access connection complete src.addr=10.244.0.4:52330 src.workload="istio-ingressgateway-cbdcbb75c-hhcwn" src.namespace="istio-system" src.identity="spiffe://cluster.local/ns/istio-system/sa/istio-ingressgateway-service-account" dst.addr=10.244.0.16:9080 dst.hbone_addr="10.244.0.16:9080" dst.service="productpage.bookinfo.svc.cluster.local" dst.workload="productpage-v1-87d54dd59-p4c4f" dst.namespace="productpage" dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" direction="inbound" bytes_sent=5479 bytes_recv=1551 duration="12ms" -2024-04-12T14:25:34.984574Z info access connection complete src.addr=10.244.0.16:60951 src.workload="productpage-v1-87d54dd59-p4c4f" src.namespace="bookinfo" src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.12:9080 dst.hbone_addr="10.244.0.12:9080" dst.service="details.bookinfo.svc.cluster.local" dst.workload="details-v1-cf74bb974-p9prp" dst.namespace="details" dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-details" direction="inbound" bytes_sent=358 bytes_recv=200 duration="2ms" -2024-04-12T14:25:34.984677Z info access connection complete src.addr=10.244.0.16:60370 src.workload="productpage-v1-87d54dd59-p4c4f" src.namespace="bookinfo" src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.12:15008 dst.service="details.bookinfo.svc.cluster.local" dst.workload="details-v1-cf74bb974-p9prp" dst.namespace="details" dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-details" direction="outbound" bytes_sent=200 bytes_recv=358 duration="2ms" -2024-04-12T14:25:34.992728Z info access connection complete src.addr=10.244.0.16:54463 src.workload="productpage-v1-87d54dd59-p4c4f" src.namespace="bookinfo" src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.15:9080 dst.hbone_addr="10.244.0.15:9080" dst.service="reviews.bookinfo.svc.cluster.local" dst.workload="reviews-v2-6f9b55c5db-7nxdq" dst.namespace="reviews" dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-reviews" direction="inbound" bytes_sent=603 bytes_recv=200 duration="7ms" -2024-04-12T14:25:34.992838Z info access connection complete src.addr=10.244.0.16:35220 src.workload="productpage-v1-87d54dd59-p4c4f" src.namespace="bookinfo" src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.15:15008 dst.service="reviews.bookinfo.svc.cluster.local" dst.workload="reviews-v2-6f9b55c5db-7nxdq" dst.namespace="reviews" dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-reviews" direction="outbound" bytes_sent=200 bytes_recv=603 duration="7ms" -2024-04-12T14:25:34.993735Z info access connection complete src.addr=10.244.0.4:52330 src.workload="istio-ingressgateway-cbdcbb75c-hhcwn" src.namespace="istio-system" src.identity="spiffe://cluster.local/ns/istio-system/sa/istio-ingressgateway-service-account" dst.addr=10.244.0.16:9080 dst.hbone_addr="10.244.0.16:9080" dst.service="productpage.bookinfo.svc.cluster.local" dst.workload="productpage-v1-87d54dd59-p4c4f" dst.namespace="productpage" dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" direction="inbound" bytes_sent=5483 bytes_recv=1551 duration="18ms" \ No newline at end of file +2024-04-12T10:17:44.080629Z info access connection complete src.addr=10.244.0.16:52008 src.workload=productpage-v1-87d54dd59-fzflt src.namespace=bookinfo src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.14:15008 dst.service=reviews.bookinfo.svc.cluster.local dst.workload=reviews-v2-6f9b55c5db-vnpzr dst.namespace=bookinfo dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-reviews" direction="outbound" bytes_sent=200 bytes_recv=603 duration="2ms" +2024-04-12T10:17:44.081519Z info access connection complete src.addr=10.244.0.5:45896 src.workload=istio-ingressgateway-cbdcbb75c-9q9nb src.namespace=istio-system src.identity="spiffe://cluster.local/ns/istio-system/sa/istio-ingressgateway-service-account" dst.addr=10.244.0.16:9080 dst.hbone_addr="10.244.0.16:9080" dst.service=productpage.bookinfo.svc.cluster.local dst.workload=productpage-v1-87d54dd59-fzflt dst.namespace=productpage dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" direction="inbound" bytes_sent=5483 bytes_recv=1551 duration="8ms" +2024-04-12T10:31:51.078103Z info access connection complete src.addr=10.244.0.16:51748 src.workload=productpage-v1-87d54dd59-fzflt src.namespace=bookinfo src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.11:15008 dst.service=details.bookinfo.svc.cluster.local dst.workload=details-v1-cf74bb974-wg44w dst.namespace=bookinfo dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-details" direction="outbound" bytes_sent=200 bytes_recv=358 duration="1ms" +2024-04-12T14:25:33.985405Z info access connection complete src.addr=10.244.0.16:59115 src.workload=productpage-v1-87d54dd59-p4c4f src.namespace=bookinfo src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.14:9080 dst.hbone_addr="10.244.0.14:9080" dst.service=reviews.bookinfo.svc.cluster.local dst.workload=reviews-v3-7d99fd7978-qfjpc dst.namespace=reviews dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-reviews" direction="inbound" bytes_sent=599 bytes_recv=200 duration="6ms" +2024-04-12T14:25:33.985492Z info access connection complete src.addr=10.244.0.16:35204 src.workload=productpage-v1-87d54dd59-p4c4f src.namespace=bookinfo src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.14:15008 dst.service=reviews.bookinfo.svc.cluster.local dst.workload=reviews-v3-7d99fd7978-qfjpc dst.namespace=bookinfo dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-reviews" direction="outbound" bytes_sent=200 bytes_recv=599 duration="6ms" +2024-04-12T14:25:33.986169Z info access connection complete src.addr=10.244.0.4:52330 src.workload=istio-ingressgateway-cbdcbb75c-hhcwn src.namespace=istio-system src.identity="spiffe://cluster.local/ns/istio-system/sa/istio-ingressgateway-service-account" dst.addr=10.244.0.16:9080 dst.hbone_addr="10.244.0.16:9080" dst.service=productpage.bookinfo.svc.cluster.local dst.workload=productpage-v1-87d54dd59-p4c4f dst.namespace="productpage" dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" direction="inbound" bytes_sent=5479 bytes_recv=1551 duration="12ms" +2024-04-12T14:25:34.984574Z info access connection complete src.addr=10.244.0.16:60951 src.workload=productpage-v1-87d54dd59-p4c4f src.namespace=bookinfo src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.12:9080 dst.hbone_addr="10.244.0.12:9080" dst.service=details.bookinfo.svc.cluster.local dst.workload=details-v1-cf74bb974-p9prp dst.namespace=details dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-details" direction="inbound" bytes_sent=358 bytes_recv=200 duration="2ms" +2024-04-12T14:25:34.984677Z info access connection complete src.addr=10.244.0.16:60370 src.workload=productpage-v1-87d54dd59-p4c4f src.namespace=bookinfo src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.12:15008 dst.service=details.bookinfo.svc.cluster.local dst.workload=details-v1-cf74bb974-p9prp dst.namespace=details dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-details" direction="outbound" bytes_sent=200 bytes_recv=358 duration="2ms" +2024-04-12T14:25:34.992728Z info access connection complete src.addr=10.244.0.16:54463 src.workload=productpage-v1-87d54dd59-p4c4f src.namespace=bookinfo src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.15:9080 dst.hbone_addr="10.244.0.15:9080" dst.service=reviews.bookinfo.svc.cluster.local dst.workload=reviews-v2-6f9b55c5db-7nxdq dst.namespace=reviews dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-reviews" direction="inbound" bytes_sent=603 bytes_recv=200 duration="7ms" +2024-04-12T14:25:34.992838Z info access connection complete src.addr=10.244.0.16:35220 src.workload=productpage-v1-87d54dd59-p4c4f src.namespace=bookinfo src.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" dst.addr=10.244.0.15:15008 dst.service=reviews.bookinfo.svc.cluster.local dst.workload=reviews-v2-6f9b55c5db-7nxdq dst.namespace=reviews dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-reviews" direction="outbound" bytes_sent=200 bytes_recv=603 duration="7ms" +2024-04-12T14:25:34.993735Z info access connection complete src.addr=10.244.0.4:52330 src.workload=istio-ingressgateway-cbdcbb75c-hhcwn src.namespace=istio-system src.identity="spiffe://cluster.local/ns/istio-system/sa/istio-ingressgateway-service-account" dst.addr=10.244.0.16:9080 dst.hbone_addr="10.244.0.16:9080" dst.service=productpage.bookinfo.svc.cluster.local dst.workload=productpage-v1-87d54dd59-p4c4f dst.namespace=productpage dst.identity="spiffe://cluster.local/ns/bookinfo/sa/bookinfo-productpage" direction="inbound" bytes_sent=5483 bytes_recv=1551 duration="18ms" \ No newline at end of file