From 5bc1de265966bb9a220454a5fdcc6a7a342e82d6 Mon Sep 17 00:00:00 2001 From: LiZhenCheng9527 Date: Sat, 27 Jul 2024 15:17:35 +0800 Subject: [PATCH] golint fix Signed-off-by: LiZhenCheng9527 --- pkg/auth/rbac.go | 2 +- pkg/controller/telemetry/metric_test.go | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/auth/rbac.go b/pkg/auth/rbac.go index ed3ae4917..f0deef71a 100644 --- a/pkg/auth/rbac.go +++ b/pkg/auth/rbac.go @@ -504,7 +504,7 @@ func isEmptyMatch(m *security.Match) bool { // todo : get identity form tls connection func (r *Rbac) getIdentityByIp(ip []byte) Identity { var networkAddress cache.NetworkAddress - networkAddress.Address, _ = netip.AddrFromSlice(restoreIPv4(ip)) + networkAddress.Address, _ = netip.AddrFromSlice(ip) workload := r.workloadCache.GetWorkloadByAddr(networkAddress) if workload == nil { log.Warnf("get workload from ip %v FAILED", ip) diff --git a/pkg/controller/telemetry/metric_test.go b/pkg/controller/telemetry/metric_test.go index 7658c791a..010550633 100644 --- a/pkg/controller/telemetry/metric_test.go +++ b/pkg/controller/telemetry/metric_test.go @@ -24,6 +24,7 @@ import ( "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" "github.com/stretchr/testify/assert" + "kmesh.net/kmesh/api/v2/workloadapi" "kmesh.net/kmesh/pkg/controller/workload/cache" ) @@ -253,7 +254,7 @@ func TestBuildMetricsToPrometheus(t *testing.T) { } } -func TestbuildWorkloadMetric(t *testing.T) { +func TestBuildWorkloadMetric(t *testing.T) { type args struct { dstWorkload *workloadapi.Workload srcWorkload *workloadapi.Workload @@ -318,7 +319,7 @@ func TestbuildWorkloadMetric(t *testing.T) { t.Run(tt.name, func(t *testing.T) { actualLabels := buildWorkloadMetric(tt.args.dstWorkload, tt.args.srcWorkload) expectMap := struct2map(tt.want) - actualMap := struct2map(&actualLabels) + actualMap := struct2map(actualLabels) assert.Equal(t, expectMap, actualMap) }) } @@ -501,7 +502,7 @@ func TestBuildServiceMetric(t *testing.T) { {192, 168, 224, 22}, }, Services: map[string]*workloadapi.PortList{ - "kmesh-system/kmesh.kmesh-system.svc.cluster.local": &workloadapi.PortList{ + "kmesh-system/kmesh.kmesh-system.svc.cluster.local": { Ports: []*workloadapi.Port{ { TargetPort: 80,