Commit5ab8c27

committed

more PR comments

1 parent3afa02e commit5ab8c27Copy full SHA for 5ab8c27

File tree

+14

-4

lines changed

+14

-4

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ const (`
`32`	`32`	`// ServiceAgentMetricAggregator merges agent metrics and exports them in a`
`33`	`33`	`// prometheus collector format.`
`34`	`34`	`ServiceAgentMetricAggregator="agent-metrics-aggregator"`
	`35`	`+// ServiceTallymanPublisher publishes usage events to coder/tallyman.`
	`36`	`+ServiceTallymanPublisher="tallyman-publisher"`
`35`	`37`
`36`	`38`	`RequestTypeTag="coder_request_type"`
`37`	`39`	`)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ func ReloadBuiltinRoles(opts *RoleOptions) {`
`271`	`271`	`// Workspace dormancy and workspace are omitted.`
`272`	`272`	`// Workspace is specifically handled based on the opts.NoOwnerWorkspaceExec.`
`273`	`273`	`// Owners cannot access other users' secrets.`
`274`		`-allPermsExcept(ResourceWorkspaceDormant,ResourcePrebuiltWorkspace,ResourceWorkspace,ResourceUserSecret),`
	`274`	`+allPermsExcept(ResourceWorkspaceDormant,ResourcePrebuiltWorkspace,ResourceWorkspace,ResourceUserSecret,ResourceUsageEvent),`
`275`	`275`	`// This adds back in the Workspace permissions.`
`276`	`276`	`Permissions(map[string][]policy.Action{`
`277`	`277`	`ResourceWorkspace.Type:ownerWorkspaceActions,`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -877,8 +877,9 @@ func TestRolePermissions(t *testing.T) {`
`877`	`877`	`Actions: []policy.Action{policy.ActionCreate,policy.ActionRead,policy.ActionUpdate},`
`878`	`878`	`Resource:rbac.ResourceUsageEvent,`
`879`	`879`	`AuthorizeMap:map[bool][]hasAuthSubjects{`
`880`		`-true: {owner},`
	`880`	`+true: {},`
`881`	`881`	`false: {`
	`882`	`+owner,`
`882`	`883`	`memberMe,orgMemberMe,otherOrgMember,`
`883`	`884`	`orgAdmin,otherOrgAdmin,`
`884`	`885`	`orgAuditor,otherOrgAuditor,`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import (`
`16`	`16`	`"cdr.dev/slog"`
`17`	`17`	`"github.com/coder/coder/v2/coderd/database"`
`18`	`18`	`"github.com/coder/coder/v2/coderd/database/dbtime"`
	`19`	`+"github.com/coder/coder/v2/coderd/pproflabel"`
`19`	`20`	`agplusage"github.com/coder/coder/v2/coderd/usage"`
`20`	`21`	`"github.com/coder/coder/v2/cryptorand"`
`21`	`22`	`"github.com/coder/coder/v2/enterprise/coderd"`
`@@ -127,7 +128,8 @@ func PublisherWithInitialDelay(initialDelay time.Duration) TallymanPublisherOpti`
`127`	`128`
`128`	`129`	`// Start implements Publisher.`
`129`	`130`	`func (p*tallymanPublisher)Start()error {`
`130`		`-deploymentID,err:=p.db.GetDeploymentID(p.ctx)`
	`131`	`+ctx:=p.ctx`
	`132`	`+deploymentID,err:=p.db.GetDeploymentID(ctx)`
`131`	`133`	`iferr!=nil {`
`132`	`134`	`returnxerrors.Errorf("get deployment ID: %w",err)`
`133`	`135`	`}`
`@@ -147,7 +149,9 @@ func (p *tallymanPublisher) Start() error {`
`147`	`149`	`p.initialDelay=tallymanPublishInitialMinimumDelay+time.Duration(plusDelay)`
`148`	`150`	`}`
`149`	`151`
`150`		`-gop.publishLoop(p.ctx,deploymentUUID)`
	`152`	`+pproflabel.Go(ctx,pproflabel.Service(pproflabel.ServiceTallymanPublisher),func(ctx context.Context) {`
	`153`	`+p.publishLoop(ctx,deploymentUUID)`
	`154`	`+})`
`151`	`155`	`returnnil`
`152`	`156`	`}`
`153`	`157`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -630,6 +630,9 @@ func TestPublisherTallymanError(t *testing.T) {`
`630`	`630`
`631`	`631`	`funcjsoninate(t*testing.T,vany)string {`
`632`	`632`	`t.Helper()`
	`633`	`+ife,ok:=v.(agplusage.Event);ok {`
	`634`	`+v=e.Fields()`
	`635`	`+}`
`633`	`636`	`buf,err:=json.Marshal(v)`
`634`	`637`	`require.NoError(t,err)`
`635`	`638`	`returnstring(buf)`

Comments

(0)