puts podUID!="" into IsNotPod

Fixes lint Signed-off-by: Christian Görg <christian.goerg@trumpf.com>
spiffe · Jul 27, 2022 · 2579119 · 2579119
1 parent d4eccac
commit 2579119
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/pkg/agent/plugin/workloadattestor/k8s/k8s.go b/pkg/agent/plugin/workloadattestor/k8s/k8s.go
@@ -198,7 +198,7 @@ func (p *Plugin) Attest(ctx context.Context, req *workloadattestorv1.AttestReque
 		var attestResponse *workloadattestorv1.AttestResponse
 		for _, item := range list.Items {
 			item := item
-			if podUID != "" && isNotPod(item.UID, podUID) {
+			if isNotPod(item.UID, podUID) {
 				continue
 			}
 

diff --git a/pkg/agent/plugin/workloadattestor/k8s/k8s_posix.go b/pkg/agent/plugin/workloadattestor/k8s/k8s_posix.go
@@ -177,5 +177,5 @@ func canonicalizePodUID(uid string) types.UID {
 }
 
 func isNotPod(itemPodUID, podUID types.UID) bool {
-	return itemPodUID != podUID
+	return podUID != "" && itemPodUID != podUID
 }
diff --git a/pkg/agent/plugin/workloadattestor/k8s/k8s_posix_test.go b/pkg/agent/plugin/workloadattestor/k8s/k8s_posix_test.go
@@ -22,7 +22,7 @@ import (
 const (
 	kindPodListFilePath                     = "testdata/kind_pod_list.json"
 	crioPodListFilePath                     = "testdata/crio_pod_list.json"
-	crioPodListDuplicateContainerIdFilePath = "testdata/crio_pod_list_duplicate_containerId.json"
+	crioPodListDuplicateContainerIDFilePath = "testdata/crio_pod_list_duplicate_containerId.json"
 
 	cgPidInPodFilePath        = "testdata/cgroups_pid_in_pod.txt"
 	cgPidInKindPodFilePath    = "testdata/cgroups_pid_in_kind_pod.txt"
@@ -132,7 +132,7 @@ func (s *Suite) TestAttestFailDuplicateContainerId() {
 	s.startInsecureKubelet()
 	p := s.loadInsecurePlugin()
 
-	s.requireAttestFailWithDuplicateContainerId(p)
+	s.requireAttestFailWithDuplicateContainerID(p)
 }
 
 func (s *Suite) TestAttestWithPidInPodSystemdCgroups() {
@@ -183,8 +183,8 @@ func (s *Suite) requireAttestSuccessWithCrioPod(p workloadattestor.WorkloadAttes
 	s.requireAttestSuccess(p, testCrioPodSelectors)
 }
 
-func (s *Suite) requireAttestFailWithDuplicateContainerId(p workloadattestor.WorkloadAttestor) {
-	s.addPodListResponse(crioPodListDuplicateContainerIdFilePath)
+func (s *Suite) requireAttestFailWithDuplicateContainerID(p workloadattestor.WorkloadAttestor) {
+	s.addPodListResponse(crioPodListDuplicateContainerIDFilePath)
 	s.addCgroupsResponse(cgPidInCrioPodFilePath)
 	s.requireAttestFailure(p, codes.Internal, "two pods found with same container Id")
 }