Skip to content

Commit 44dfb51

Browse files
Merge branch 'master' into dependabot/github_actions/actions-c303e18619
2 parents bbea949 + 2a515fc commit 44dfb51

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

plans/plans.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,7 @@ plans:
886886
alerts: true
887887
custom_domains: true
888888
sla: true
889+
dedicated: true # Team gets dedicated infra like Growth (bug bash #12)
889890
# team_yearly mirrors team exactly. $1990/yr = $199 x 10 ("2 months free" vs $199 x 12).
890891
team_yearly:
891892
display_name: "Team (yearly)"
@@ -920,6 +921,7 @@ plans:
920921
alerts: true
921922
custom_domains: true
922923
sla: true
924+
dedicated: true # mirrors team (bug bash #12)
923925
growth:
924926
display_name: "Growth"
925927
price_monthly_cents: 9900

plans/plans_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,8 @@ func TestRegistry_TierHelpers(t *testing.T) {
412412
assert.Equal(t, "Pro", r.DisplayName("pro"))
413413
assert.False(t, r.IsDedicatedTier("pro"))
414414
assert.True(t, r.IsDedicatedTier("growth"))
415+
// bug bash #12: Team ($199, above Growth) also gets dedicated infra.
416+
assert.True(t, r.IsDedicatedTier("team"))
415417
// W11: hobby_plus is the mid-tier — $19/mo, custom domains, 2 apps.
416418
assert.Equal(t, 1900, r.PriceMonthly("hobby_plus"),
417419
"hobby_plus monthly price must be $19/mo (1900 cents)")

queueprovider/nats/nats.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,12 @@ func (p *Provider) RevokeTenantCredentials(ctx context.Context, keyID string) er
389389
accClaims.Name = val.accountJWT // placeholder — re-encoding deletes effectively
390390
// Set the account "Deleted" flag by zeroing limits and pushing.
391391
accClaims.Limits.JetStreamLimits = jwt.JetStreamLimits{}
392+
// Conn: 0 means "zero connections allowed" — i.e. fully revoked. A NEGATIVE
393+
// value (-1) means UNLIMITED in NATS account limits, which would do the
394+
// exact opposite of revocation and let a deleted/revoked tenant keep
395+
// connecting. Must be 0 to disable the account.
392396
accClaims.Limits.AccountLimits = jwt.AccountLimits{
393-
Conn: -1,
397+
Conn: 0,
394398
}
395399
accClaims.Exports = jwt.Exports{}
396400
accClaims.Imports = jwt.Imports{}

0 commit comments

Comments
 (0)