Przeglądaj źródła

Fix tests

Signed-off-by: Sean Holcomb <seanholcomb@gmail.com>
Sean Holcomb 4 tygodni temu
rodzic
commit
94fd50c766

+ 1 - 3
core/pkg/opencost/exporter/exporter_test.go

@@ -1,7 +1,6 @@
 package exporter
 
 import (
-	"fmt"
 	"testing"
 	"time"
 
@@ -270,8 +269,7 @@ func TestExporters(t *testing.T) {
 			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)
+		validateFileCreation[kubemodel.KubeModelSet](t, memStore, p, exporter.BingenExt, start, end)
 	})
 
 	t.Run("unknown exporter", func(t *testing.T) {

+ 1 - 2
core/pkg/opencost/exporter/exporters.go

@@ -7,7 +7,6 @@ import (
 	export "github.com/opencost/opencost/core/pkg/exporter"
 	"github.com/opencost/opencost/core/pkg/exporter/pathing"
 	"github.com/opencost/opencost/core/pkg/exporter/validator"
-	"github.com/opencost/opencost/core/pkg/model/kubemodel"
 	"github.com/opencost/opencost/core/pkg/pipelines"
 	"github.com/opencost/opencost/core/pkg/storage"
 	"github.com/opencost/opencost/core/pkg/util/typeutil"
@@ -32,7 +31,7 @@ func NewComputePipelineExporter[T any, U export.BinaryMarshalerPtr[T], S validat
 
 	var encoder export.Encoder[T]
 	if pipelineName == pipelines.KubeModelPipelineName {
-		encoder = export.NewVersionBingenEncoder[T, U](kubemodel.DefaultCodecVersion)
+		encoder = export.NewBingenFileEncoder[T, U]()
 	} else {
 		encoder = export.NewBingenEncoder[T, U]()
 	}

+ 1 - 1
pkg/pricingmodel/storage.go

@@ -28,7 +28,7 @@ func newStorageWriter(store storage.Storage, appName string) (*storageWriter, er
 	}
 	return &storageWriter{
 		store:   store,
-		encoder: exporter.NewVersionBingenEncoder[pricingmodel.PricingModelSet](pricingmodel.DefaultCodecVersion),
+		encoder: exporter.NewBingenFileEncoder[pricingmodel.PricingModelSet](),
 		pathing: p,
 	}, nil
 }