diff --git a/pkg/exoscale/dbaas.go b/pkg/exoscale/dbaas.go index 38533d8..7eab5aa 100644 --- a/pkg/exoscale/dbaas.go +++ b/pkg/exoscale/dbaas.go @@ -222,7 +222,7 @@ func (ds *DBaaS) AggregateDBaaS(ctx context.Context, exoscaleDBaaS []*egoscale.D } o := odoo.OdooMeteredBillingRecord{ - ProductID: productIdPrefix + fmt.Sprintf("-%s-%s", *dbaasUsage.Type, *dbaasUsage.Plan), + ProductID: productIdPrefix + fmt.Sprintf("v2-%s-%s", *dbaasUsage.Type, *dbaasUsage.Plan), InstanceID: instanceId, ItemDescription: dbaasDetail.DBName, ItemGroupDescription: itemGroup, diff --git a/pkg/exoscale/dbaas_test.go b/pkg/exoscale/dbaas_test.go index fd41495..f2ea3c4 100644 --- a/pkg/exoscale/dbaas_test.go +++ b/pkg/exoscale/dbaas_test.go @@ -19,7 +19,7 @@ func TestDBaaS_aggregatedDBaaS(t *testing.T) { now := time.Now().In(location) record1 := odoo.OdooMeteredBillingRecord{ - ProductID: "appcat-exoscale-pg-hobbyist-2", + ProductID: "appcat-exoscale-v2-pg-hobbyist-2", InstanceID: "ch-gva-2/postgres-abc", ItemDescription: "postgres-abc", ItemGroupDescription: "APPUiO Managed - Cluster: c-test1 / Namespace: vshn-xyz", @@ -32,7 +32,7 @@ func TestDBaaS_aggregatedDBaaS(t *testing.T) { }, } record2 := odoo.OdooMeteredBillingRecord{ - ProductID: "appcat-exoscale-pg-business-128", + ProductID: "appcat-exoscale-v2-pg-business-128", InstanceID: "ch-gva-2/postgres-def", ItemDescription: "postgres-def", ItemGroupDescription: "APPUiO Managed - Cluster: c-test1 / Namespace: vshn-uvw",