Fix tests

Signed-off-by: Sean Holcomb <seanholcomb@gmail.com>

core/pkg/opencost/exporter/exporter_test.go

@@ -63,7 +63,7 @@ func NewMockNetworkInsightSource() exporter.ComputeSource[opencost.NetworkInsigh
 func NewMockKubeModelSource() exporter.ComputeSource[kubemodel.KubeModelSet] {
 	return &MockSource[kubemodel.KubeModelSet]{
 		generate: func(start, end time.Time) *kubemodel.KubeModelSet {
-			return opencost.GenerateMockKubeModelSet(start, end)
+			return kubemodel.NewMockKubeModelSet(start, end)
 		},
 	}
 }
@@ -269,7 +269,7 @@ func TestExporters(t *testing.T) {
 		if err != nil {
 			t.Fatalf("failed to export KubeModel data: %v", err)
 		}
-		
+
 		ext := fmt.Sprintf(exporter.BingenVersionExtFMT, kubemodel.DefaultCodecVersion)
 		validateFileCreation[kubemodel.KubeModelSet](t, memStore, p, ext, start, end)
 	})

core/pkg/opencost/mock.go

@@ -3,8 +3,6 @@ package opencost
 import (
 	"fmt"
 	"time"
-
-	"github.com/opencost/opencost/core/pkg/model/kubemodel"
 )
 
 const gb = 1024 * 1024 * 1024
@@ -1015,45 +1013,3 @@ func GenerateMockCloudCostSet(start, end time.Time, provider, integration string
 
 	return ccs
 }
-
-// GenerateMockKubeModelSet creates generic KubeModel set
-func GenerateMockKubeModelSet(start, end time.Time) *kubemodel.KubeModelSet {
-	kms := kubemodel.NewKubeModelSet(start, end)
-
-	kms.Cluster = &kubemodel.Cluster{
-		UID:  "clusterUID",
-		Name: "cluster",
-	}
-
-	kms.RegisterNamespace(&kubemodel.Namespace{
-		UID:  "namespace-1",
-		Name: "namespace-1",
-	})
-	kms.RegisterNamespace(&kubemodel.Namespace{
-		UID:  "namespace-2",
-		Name: "namespace-2",
-	})
-
-	kms.RegisterResourceQuota(&kubemodel.ResourceQuota{
-		UID:          "resourcequota-1",
-		NamespaceUID: "resourcequota-1",
-		Name:         "namespace-1",
-	})
-	kms.RegisterResourceQuota(&kubemodel.ResourceQuota{
-		UID:          "resourcequota-2",
-		NamespaceUID: "resourcequota-2",
-		Name:         "namespace-1",
-	})
-	kms.RegisterResourceQuota(&kubemodel.ResourceQuota{
-		UID:          "resourcequota-3",
-		NamespaceUID: "resourcequota-3",
-		Name:         "namespace-2",
-	})
-	kms.RegisterResourceQuota(&kubemodel.ResourceQuota{
-		UID:          "resourcequota-4",
-		NamespaceUID: "resourcequota-4",
-		Name:         "namespace-2",
-	})
-
-	return kms
-}