f

Signed-off-by: Nicolas Bigler <[email protected]>
vshn · Dec 18, 2023 · 402630e · 402630e
1 parent d3cd8e9
commit 402630e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/pkg/cloudscale/objectstorage.go b/pkg/cloudscale/objectstorage.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/vshn/billing-collector-cloudservices/pkg/control"
+	"github.com/vshn/billing-collector-cloudservices/pkg/controlAPI"
 	"github.com/vshn/billing-collector-cloudservices/pkg/kubernetes"
 	"github.com/vshn/billing-collector-cloudservices/pkg/log"
 	"github.com/vshn/billing-collector-cloudservices/pkg/odoo"
@@ -86,7 +86,7 @@ func (o *ObjectStorage) GetMetrics(ctx context.Context, billingDate time.Time) (
 		appuioManaged := true
 		if o.salesOrder == "" {
 			appuioManaged = false
-			o.salesOrder, err = control.GetSalesOrder(ctx, o.controlApiClient, nsTenants[bd.Namespace])
+			o.salesOrder, err = controlAPI.GetSalesOrder(ctx, o.controlApiClient, nsTenants[bd.Namespace])
 			if err != nil {
 				logger.Error(err, "unable to sync bucket", "namespace", bd.Namespace)
 				continue

diff --git a/pkg/control/control.go → pkg/controlAPI/controlapi.go b/pkg/control/control.go → pkg/controlAPI/controlapi.go
@@ -1,4 +1,4 @@
-package control
+package controlAPI
 
 import (
 	"context"

diff --git a/pkg/exoscale/dbaas.go b/pkg/exoscale/dbaas.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	egoscale "github.com/exoscale/egoscale/v2"
-	"github.com/vshn/billing-collector-cloudservices/pkg/control"
+	"github.com/vshn/billing-collector-cloudservices/pkg/controlAPI"
 	"github.com/vshn/billing-collector-cloudservices/pkg/kubernetes"
 	"github.com/vshn/billing-collector-cloudservices/pkg/log"
 	"github.com/vshn/billing-collector-cloudservices/pkg/odoo"
@@ -199,7 +199,7 @@ func (ds *DBaaS) AggregateDBaaS(ctx context.Context, exoscaleDBaaS []*egoscale.D
 			logger.V(1).Info("Found exoscale dbaas usage", "instance", dbaasUsage.Name, "instance created", dbaasUsage.CreatedAt)
 
 			if ds.salesOrder == "" {
-				ds.salesOrder, err = control.GetSalesOrder(ctx, ds.controlApiClient, dbaasDetail.Organization)
+				ds.salesOrder, err = controlAPI.GetSalesOrder(ctx, ds.controlApiClient, dbaasDetail.Organization)
 				if err != nil {
 					logger.Error(err, "Unable to sync DBaaS, cannot get salesOrder", "namespace", dbaasDetail.Namespace)
 					continue

diff --git a/pkg/exoscale/objectstorage.go b/pkg/exoscale/objectstorage.go
@@ -7,7 +7,7 @@ import (
 
 	egoscale "github.com/exoscale/egoscale/v2"
 	"github.com/exoscale/egoscale/v2/oapi"
-	"github.com/vshn/billing-collector-cloudservices/pkg/control"
+	"github.com/vshn/billing-collector-cloudservices/pkg/controlAPI"
 	"github.com/vshn/billing-collector-cloudservices/pkg/exofixtures"
 	"github.com/vshn/billing-collector-cloudservices/pkg/kubernetes"
 	"github.com/vshn/billing-collector-cloudservices/pkg/log"
@@ -114,7 +114,7 @@ func (o *ObjectStorage) getOdooMeteredBillingRecords(ctx context.Context, sosBuc
 			instanceId := fmt.Sprintf("%s/%s", bucketDetail.Zone, bucketDetail.BucketName)
 			if o.salesOrder == "" {
 				itemGroup = fmt.Sprintf("APPUiO Cloud - Zone: %s / Namespace: %s", o.clusterId, bucketDetail.Namespace)
-				o.salesOrder, err = control.GetSalesOrder(ctx, o.controlApiClient, bucketDetail.Organization)
+				o.salesOrder, err = controlAPI.GetSalesOrder(ctx, o.controlApiClient, bucketDetail.Organization)
 				if err != nil {
 					logger.Error(err, "unable to sync bucket", "namespace", bucketDetail.Namespace)
 					continue