fix: metronome nil check before using (#1221)

* fix: metronome nil check before using * fix: nil check on accounts
tigrisdata-archive · May 19, 2023 · 8dccdf3 · 8dccdf3
1 parent 23b62ce
commit 8dccdf3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/server/services/v1/billing.go b/server/services/v1/billing.go
@@ -106,6 +106,9 @@ func (b *billingService) getMetronomeId(ctx context.Context, namespaceId string)
 		log.Warn().Msgf("Could not find namespace, this must not happen with right authn/authz configured")
 		return uuid.Nil, errors.NotFound("Namespace %s not found", namespaceId)
 	}
+	if nsMeta.Accounts == nil {
+		nsMeta.Accounts = &metadata.AccountIntegrations{}
+	}
 
 	mIdStr, enabled := nsMeta.Accounts.GetMetronomeId()
 	if !enabled || len(mIdStr) == 0 {

diff --git a/server/services/v1/billing/reporter.go b/server/services/v1/billing/reporter.go
@@ -188,6 +188,10 @@ func (r *UsageReporter) pushStorage() error {
 	events := make([]*StorageEvent, 0, len(tenants))
 	for _, t := range tenants {
 		nsMeta := t.GetNamespace().Metadata()
+		if nsMeta.Accounts == nil {
+			nsMeta.Accounts = &metadata.AccountIntegrations{}
+		}
+
 		if id, enabled := nsMeta.Accounts.GetMetronomeId(); len(id) == 0 || !enabled {
 			// user doesn't have metronome integration; skip
 			continue