Merge pull request #74 from vshn/fix/instance_id_unique

Adjust instanceID for objectStorage to ensure uniqueness
vshn · Dec 28, 2023 · d8c03d2 · d8c03d2
2 parents e0800f7 + 65e2a44
commit d8c03d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/cloudscale/objectstorage.go b/pkg/cloudscale/objectstorage.go
@@ -137,7 +137,7 @@ func (o *ObjectStorage) createOdooRecord(bucketMetricsData cloudscale.BucketMetr
 	return []odoo.OdooMeteredBillingRecord{
 		{
 			ProductID:            productIdStorage,
-			InstanceID:           instanceId,
+			InstanceID:           instanceId + "/storage",
 			ItemDescription:      bucketMetricsData.Subject.BucketName,
 			ItemGroupDescription: itemGroup,
 			SalesOrder:           salesOrder,
@@ -150,7 +150,7 @@ func (o *ObjectStorage) createOdooRecord(bucketMetricsData cloudscale.BucketMetr
 		},
 		{
 			ProductID:            productIdTrafficOut,
-			InstanceID:           instanceId,
+			InstanceID:           instanceId + "/trafficout",
 			ItemDescription:      bucketMetricsData.Subject.BucketName,
 			ItemGroupDescription: itemGroup,
 			SalesOrder:           salesOrder,
@@ -163,7 +163,7 @@ func (o *ObjectStorage) createOdooRecord(bucketMetricsData cloudscale.BucketMetr
 		},
 		{
 			ProductID:            productIdQueryRequests,
-			InstanceID:           instanceId,
+			InstanceID:           instanceId + "/requests",
 			ItemDescription:      bucketMetricsData.Subject.BucketName,
 			ItemGroupDescription: itemGroup,
 			SalesOrder:           salesOrder,

diff --git a/pkg/exoscale/objectstorage.go b/pkg/exoscale/objectstorage.go
@@ -126,7 +126,7 @@ func (o *ObjectStorage) getOdooMeteredBillingRecords(ctx context.Context, sosBuc
 
 			o := odoo.OdooMeteredBillingRecord{
 				ProductID:            productIdStorage,
-				InstanceID:           instanceId,
+				InstanceID:           instanceId + "/storage",
 				ItemDescription:      bucketDetail.BucketName,
 				ItemGroupDescription: itemGroup,
 				SalesOrder:           salesOrder,