Commit9a05b46

authored

chore: fix TestManagedAgentLimit flake (#19026)

1 parent5319d47 commit9a05b46Copy full SHA for 9a05b46

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -830,7 +830,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {`
`830`	`830`	`}`
`831`	`831`	`api.derpMesh.SetAddresses(addresses,false)`
`832`	`832`	`}`
`833`		`-_=api.updateEntitlements(ctx)`
	`833`	`+_=api.updateEntitlements(api.ctx)`
`834`	`834`	`})`
`835`	`835`	`}else {`
`836`	`836`	`coordinator=agpltailnet.NewCoordinator(api.Logger)`
`@@ -840,7 +840,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {`
`840`	`840`	`api.replicaManager.SetCallback(func() {`
`841`	`841`	`// If the amount of replicas change, so should our entitlements.`
`842`	`842`	`// This is to display a warning in the UI if the user is unlicensed.`
`843`		`-_=api.updateEntitlements(ctx)`
	`843`	`+_=api.updateEntitlements(api.ctx)`
`844`	`844`	`})`
`845`	`845`	`}`
`846`	`846`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -432,10 +432,15 @@ func LicensesEntitlements(`
`432`	`432`	`iffeatureArguments.ManagedAgentCountFn!=nil {`
`433`	`433`	`managedAgentCount,err=featureArguments.ManagedAgentCountFn(ctx,agentLimit.UsagePeriod.Start,agentLimit.UsagePeriod.End)`
`434`	`434`	`}`
`435`		`-iferr!=nil {`
	`435`	`+switch {`
	`436`	`+casexerrors.Is(err,context.Canceled)\|\|xerrors.Is(err,context.DeadlineExceeded):`
	`437`	`+// If the context is canceled, we want to bail the entire`
	`438`	`+// LicensesEntitlements call.`
	`439`	`+returnentitlements,xerrors.Errorf("get managed agent count: %w",err)`
	`440`	`+caseerr!=nil:`
`436`	`441`	`entitlements.Errors=append(entitlements.Errors,`
`437`	`442`	`fmt.Sprintf("Error getting managed agent count: %s",err.Error()))`
`438`		`-}else {`
	`443`	`+default:`
`439`	`444`	`agentLimit.Actual=&managedAgentCount`
`440`	`445`	`entitlements.AddFeature(codersdk.FeatureManagedAgentLimit,agentLimit)`
`441`	`446`

Comments

(0)