Skip to content

Commit 961ffaf

Browse files
EmyrkEmyrk
committed
Merge remote-tracking branch 'origin/main' into stevenmasley/rbac_views
2 parents e252c04 + 8850ce0 commit 961ffaf

23 files changed

+361
-276
lines changed

‎agent/agent.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -767,12 +767,12 @@ func (a *agent) init(ctx context.Context) {
767767

768768
func convertAgentStats(counts map[netlogtype.Connection]netlogtype.Counts) *agentsdk.Stats {
769769
stats := &agentsdk.Stats{
770-
ConnsByProto: map[string]int64{},
771-
NumConns: int64(len(counts)),
770+
ConnectionsByProto: map[string]int64{},
771+
ConnectionCount: int64(len(counts)),
772772
}
773773

774774
for conn, count := range counts {
775-
stats.ConnsByProto[conn.Proto.String()]++
775+
stats.ConnectionsByProto[conn.Proto.String()]++
776776
stats.RxPackets += int64(count.RxPackets)
777777
stats.RxBytes += int64(count.RxBytes)
778778
stats.TxPackets += int64(count.TxPackets)

‎agent/agent_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestAgent_Stats_SSH(t *testing.T) {
7373
require.Eventuallyf(t, func() bool {
7474
var ok bool
7575
s, ok = <-stats
76-
return ok && s.NumConns > 0 && s.RxBytes > 0 && s.TxBytes > 0
76+
return ok && s.ConnectionCount > 0 && s.RxBytes > 0 && s.TxBytes > 0
7777
}, testutil.WaitLong, testutil.IntervalFast,
7878
"never saw stats: %+v", s,
7979
)
@@ -102,7 +102,7 @@ func TestAgent_Stats_ReconnectingPTY(t *testing.T) {
102102
require.Eventuallyf(t, func() bool {
103103
var ok bool
104104
s, ok = <-stats
105-
return ok && s.NumConns > 0 && s.RxBytes > 0 && s.TxBytes > 0
105+
return ok && s.ConnectionCount > 0 && s.RxBytes > 0 && s.TxBytes > 0
106106
}, testutil.WaitLong, testutil.IntervalFast,
107107
"never saw stats: %+v", s,
108108
)

‎coderd/apidoc/docs.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbauthz/querier.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,18 +1381,18 @@ func (q *querier) UpdateWorkspaceAgentConnectionByID(ctx context.Context, arg da
13811381
return update(q.log, q.auth, fetch, q.db.UpdateWorkspaceAgentConnectionByID)(ctx, arg)
13821382
}
13831383

1384-
func (q *querier) InsertAgentStat(ctx context.Context, arg database.InsertAgentStatParams) (database.AgentStat, error) {
1384+
func (q *querier) InsertWorkspaceAgentStat(ctx context.Context, arg database.InsertWorkspaceAgentStatParams) (database.WorkspaceAgentStat, error) {
13851385
// TODO: This is a workspace agent operation. Should users be able to query this?
13861386
// Not really sure what this is for.
13871387
workspace, err := q.db.GetWorkspaceByID(ctx, arg.WorkspaceID)
13881388
if err != nil {
1389-
return database.AgentStat{}, err
1389+
return database.WorkspaceAgentStat{}, err
13901390
}
13911391
err = q.authorizeContext(ctx, rbac.ActionUpdate, workspace)
13921392
if err != nil {
1393-
return database.AgentStat{}, err
1393+
return database.WorkspaceAgentStat{}, err
13941394
}
1395-
return q.db.InsertAgentStat(ctx, arg)
1395+
return q.db.InsertWorkspaceAgentStat(ctx, arg)
13961396
}
13971397

13981398
func (q *querier) UpdateWorkspaceAppHealthByID(ctx context.Context, arg database.UpdateWorkspaceAppHealthByIDParams) error {

‎coderd/database/dbauthz/querier_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,9 +1170,9 @@ func (s *MethodTestSuite) TestWorkspace() {
11701170
ID: agt.ID,
11711171
}).Asserts(ws, rbac.ActionUpdate).Returns()
11721172
}))
1173-
s.Run("InsertAgentStat", s.Subtest(func(db database.Store, check *expects) {
1173+
s.Run("InsertWorkspaceAgentStat", s.Subtest(func(db database.Store, check *expects) {
11741174
ws := dbgen.Workspace(s.T(), db, database.Workspace{})
1175-
check.Args(database.InsertAgentStatParams{
1175+
check.Args(database.InsertWorkspaceAgentStatParams{
11761176
WorkspaceID: ws.ID,
11771177
}).Asserts(ws, rbac.ActionUpdate)
11781178
}))

‎coderd/database/dbauthz/system.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ func (q *querier) GetWorkspaceResourceMetadataCreatedAfter(ctx context.Context,
197197
return q.db.GetWorkspaceResourceMetadataCreatedAfter(ctx, createdAt)
198198
}
199199

200-
func (q *querier) DeleteOldAgentStats(ctx context.Context) error {
201-
return q.db.DeleteOldAgentStats(ctx)
200+
func (q *querier) DeleteOldWorkspaceAgentStats(ctx context.Context) error {
201+
return q.db.DeleteOldWorkspaceAgentStats(ctx)
202202
}
203203

204204
func (q *querier) GetParameterSchemasCreatedAfter(ctx context.Context, createdAt time.Time) ([]database.ParameterSchema, error) {

‎coderd/database/dbauthz/system_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
128128
_ = dbgen.WorkspaceResourceMetadatums(s.T(), db, database.WorkspaceResourceMetadatum{})
129129
check.Args(time.Now()).Asserts()
130130
}))
131-
s.Run("DeleteOldAgentStats", s.Subtest(func(db database.Store, check *expects) {
131+
s.Run("DeleteOldWorkspaceAgentStats", s.Subtest(func(db database.Store, check *expects) {
132132
check.Args().Asserts()
133133
}))
134134
s.Run("GetParameterSchemasCreatedAfter", s.Subtest(func(db database.Store, check *expects) {

0 commit comments

Comments
 (0)