pkg/podres: update mocked PodResourcesListerClient

Update mocked implementation of k8s.io/kubelet/pkg/apis/podresources/v1.PodResourcesListerClient. The mocked implementation is moved to a separate "mocks" subpackage as it's for an external interface. This patch also adds code for auto-generation for the mocked interface.
marquiz · Apr 18, 2023 · e2d5ba1 · e2d5ba1
1 parent ba4b9b3
commit e2d5ba1
Show file tree

Hide file tree

Showing 4 changed files with 137 additions and 81 deletions.
diff --git a/pkg/podres/client.go b/pkg/podres/client.go
@@ -16,6 +16,8 @@ limitations under the License.
 
 package podres
 
+//go:generate mockery --srcpkg=k8s.io/kubelet/pkg/apis/podresources/v1 --name PodResourcesListerClient
+
 import (
 	"fmt"
 	"log"

diff --git a/pkg/podres/mock_PodResourcesListerClient.go b/pkg/podres/mock_PodResourcesListerClient.go
diff --git a/pkg/podres/mocks/PodResourcesListerClient.go b/pkg/podres/mocks/PodResourcesListerClient.go
diff --git a/pkg/resourcemonitor/podresourcesscanner_test.go b/pkg/resourcemonitor/podresourcesscanner_test.go
@@ -33,7 +33,7 @@ import (
 	v1 "k8s.io/kubelet/pkg/apis/podresources/v1"
 
 	"sigs.k8s.io/node-feature-discovery/pkg/apihelper"
-	"sigs.k8s.io/node-feature-discovery/pkg/podres"
+	mockv1 "sigs.k8s.io/node-feature-discovery/pkg/podres/mocks"
 )
 
 func TestPodScanner(t *testing.T) {
@@ -54,7 +54,7 @@ func TestPodScanner(t *testing.T) {
 	}
 
 	Convey("When I scan for pod resources using fake client and no namespace", t, func() {
-		mockPodResClient := new(podres.MockPodResourcesListerClient)
+		mockPodResClient := new(mockv1.PodResourcesListerClient)
 		mockAPIHelper := new(apihelper.MockAPIHelpers)
 		mockClient := &k8sclient.Clientset{}
 		computePodFingerprint := true
@@ -676,7 +676,7 @@ func TestPodScanner(t *testing.T) {
 	})
 
 	Convey("When I scan for pod resources using fake client and given namespace", t, func() {
-		mockPodResClient := new(podres.MockPodResourcesListerClient)
+		mockPodResClient := new(mockv1.PodResourcesListerClient)
 		mockAPIHelper := new(apihelper.MockAPIHelpers)
 		mockClient := &k8sclient.Clientset{}
 		computePodFingerprint := false
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,8 @@ limitations under the License. @@
     package podres
+    //go:generate mockery --srcpkg=k8s.io/kubelet/pkg/apis/podresources/v1 --name PodResourcesListerClient
     import (
     	"fmt"
     	"log"
@@ Expand Down @@