Removing superfluous fields in billing structs

vshn · Apr 4, 2024 · 545c46e · 545c46e
1 parent 68bd538
commit 545c46e
Showing 1 changed file with 22 additions and 30 deletions.
diff --git a/pkg/cmd/spks.go b/pkg/cmd/spks.go
@@ -48,11 +48,11 @@ func SpksCMD() *cli.Command {
 			&cli.StringFlag{Name: "odoo-oauth-client-secret", Usage: "Client secret of the oauth client to interact with Odoo metered billing API",
 				EnvVars: []string{"ODOO_OAUTH_CLIENT_SECRET"}, Destination: &odooClientSecret, Required: true, DefaultText: defaultTextForRequiredFlags},
 			&cli.StringFlag{Name: "sales-order", Usage: "Sales order for APPUiO Managed clusters",
-				EnvVars: []string{"SALES_ORDER"}, Destination: &salesOrder, Required: false, DefaultText: defaultTextForOptionalFlags, Value: "S10121"},
+				EnvVars: []string{"SALES_ORDER"}, Destination: &salesOrder, DefaultText: defaultTextForOptionalFlags, Value: "S10121"},
 			&cli.StringFlag{Name: "prometheus-url", Usage: "URL of the Prometheus API",
 				EnvVars: []string{"PROMETHEUS_URL"}, Destination: &prometheusURL, Required: true, DefaultText: defaultTextForRequiredFlags, Value: "http://prometheus-monitoring-application.monitoring-application.svc.cluster.local:9090"},
 			&cli.StringFlag{Name: "unit-id", Usage: "Unit ID for the consumed units",
-				EnvVars: []string{"UNIT_ID"}, Destination: &UnitID, Required: true, DefaultText: defaultTextForRequiredFlags, Value: "uom_uom_68_b1811ca1"},
+				EnvVars: []string{"UNIT_ID"}, Destination: &UnitID, DefaultText: defaultTextForRequiredFlags, Value: "uom_uom_68_b1811ca1"},
 		},
 		Action: func(c *cli.Context) error {
 			logger := log.Logger(c.Context)
@@ -105,52 +105,44 @@ func SpksCMD() *cli.Command {
 
 			billingRecords := []odoo.OdooMeteredBillingRecord{
 				{
-					ProductID:            "appcat-spks-mariadb-standard",
-					InstanceID:           "mariadb-standard",
-					ItemDescription:      "appcat-spks-mariadb-standard",
-					ItemGroupDescription: "SPKS",
-					SalesOrder:           salesOrder,
-					UnitID:               UnitID,
-					ConsumedUnits:        float64(mariadbStandard),
+					ProductID:     "appcat-spks-mariadb-standard",
+					InstanceID:    "mariadb-standard",
+					SalesOrder:    salesOrder,
+					UnitID:        UnitID,
+					ConsumedUnits: float64(mariadbStandard),
 					TimeRange: odoo.TimeRange{
 						From: from,
 						To:   to,
 					},
 				},
 				{
-					ProductID:            "appcat-spks-mariadb-premium",
-					InstanceID:           "mariadb-premium",
-					ItemDescription:      "appcat-spks-mariadb-premium",
-					ItemGroupDescription: "SPKS",
-					SalesOrder:           salesOrder,
-					UnitID:               UnitID,
-					ConsumedUnits:        float64(mariadbPremium),
+					ProductID:     "appcat-spks-mariadb-premium",
+					InstanceID:    "mariadb-premium",
+					SalesOrder:    salesOrder,
+					UnitID:        UnitID,
+					ConsumedUnits: float64(mariadbPremium),
 					TimeRange: odoo.TimeRange{
 						From: from,
 						To:   to,
 					},
 				},
 				{
-					ProductID:            "appcat-spks-redis-standard",
-					InstanceID:           "redis-standard",
-					ItemDescription:      "appcat-spks-redis-standard",
-					ItemGroupDescription: "SPKS",
-					SalesOrder:           salesOrder,
-					UnitID:               UnitID,
-					ConsumedUnits:        float64(redisStandard),
+					ProductID:     "appcat-spks-redis-standard",
+					InstanceID:    "redis-standard",
+					SalesOrder:    salesOrder,
+					UnitID:        UnitID,
+					ConsumedUnits: float64(redisStandard),
 					TimeRange: odoo.TimeRange{
 						From: from,
 						To:   to,
 					},
 				},
 				{
-					ProductID:            "appcat-spks-redis-premium",
-					InstanceID:           "redis-premium",
-					ItemDescription:      "appcat-spks-redis-premium",
-					ItemGroupDescription: "SPKS",
-					SalesOrder:           salesOrder,
-					UnitID:               UnitID,
-					ConsumedUnits:        float64(redisPremium),
+					ProductID:     "appcat-spks-redis-premium",
+					InstanceID:    "redis-premium",
+					SalesOrder:    salesOrder,
+					UnitID:        UnitID,
+					ConsumedUnits: float64(redisPremium),
 					TimeRange: odoo.TimeRange{
 						From: from,
 						To:   to,