Skip to content

Commit 8dccdf3

Browse files
authored
fix: metronome nil check before using (#1221)
* fix: metronome nil check before using * fix: nil check on accounts
1 parent 23b62ce commit 8dccdf3

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

server/services/v1/billing.go

+3
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ func (b *billingService) getMetronomeId(ctx context.Context, namespaceId string)
106106
log.Warn().Msgf("Could not find namespace, this must not happen with right authn/authz configured")
107107
return uuid.Nil, errors.NotFound("Namespace %s not found", namespaceId)
108108
}
109+
if nsMeta.Accounts == nil {
110+
nsMeta.Accounts = &metadata.AccountIntegrations{}
111+
}
109112

110113
mIdStr, enabled := nsMeta.Accounts.GetMetronomeId()
111114
if !enabled || len(mIdStr) == 0 {

server/services/v1/billing/reporter.go

+4
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@ func (r *UsageReporter) pushStorage() error {
188188
events := make([]*StorageEvent, 0, len(tenants))
189189
for _, t := range tenants {
190190
nsMeta := t.GetNamespace().Metadata()
191+
if nsMeta.Accounts == nil {
192+
nsMeta.Accounts = &metadata.AccountIntegrations{}
193+
}
194+
191195
if id, enabled := nsMeta.Accounts.GetMetronomeId(); len(id) == 0 || !enabled {
192196
// user doesn't have metronome integration; skip
193197
continue

0 commit comments

Comments
 (0)