Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 9b503fa

Browse files
deansheatherdeansheather
committed
fixes
1 parent 8544882 commit 9b503fa

File tree

6 files changed

+45
-40
lines changed

6 files changed

+45
-40
lines changed

‎coderd/database/dbfake/dbfake.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2130,6 +2130,19 @@ func (q *fakeQuerier) GetQuotaConsumedForUser(_ context.Context, userID uuid.UUI
21302130
return sum, nil
21312131
}
21322132

2133+
func (q *fakeQuerier) GetReplicaByID(_ context.Context, id uuid.UUID) (database.Replica, error) {
2134+
q.mutex.RLock()
2135+
defer q.mutex.RUnlock()
2136+
2137+
for _, replica := range q.replicas {
2138+
if replica.ID == id {
2139+
return replica, nil
2140+
}
2141+
}
2142+
2143+
return database.Replica{}, sql.ErrNoRows
2144+
}
2145+
21332146
func (q *fakeQuerier) GetReplicasUpdatedAfter(_ context.Context, updatedAt time.Time) ([]database.Replica, error) {
21342147
q.mutex.RLock()
21352148
defer q.mutex.RUnlock()
@@ -3708,19 +3721,6 @@ func (q *fakeQuerier) InsertProvisionerJobLogs(_ context.Context, arg database.I
37083721
return logs, nil
37093722
}
37103723

3711-
func (q *fakeQuerier) GetReplicaByID(_ context.Context, id uuid.UUID) (database.Replica, error) {
3712-
q.mutex.RLock()
3713-
defer q.mutex.RUnlock()
3714-
3715-
for _, replica := range q.replicas {
3716-
if replica.ID == id {
3717-
return replica, nil
3718-
}
3719-
}
3720-
3721-
return database.Replica{}, sql.ErrNoRows
3722-
}
3723-
37243724
func (q *fakeQuerier) InsertReplica(_ context.Context, arg database.InsertReplicaParams) (database.Replica, error) {
37253725
if err := validateDatabaseType(arg); err != nil {
37263726
return database.Replica{}, err

‎coderd/database/dbmetrics/dbmetrics.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,3 +1532,10 @@ func (m metricsStore) GetDefaultProxyConfig(ctx context.Context) (database.GetDe
15321532
m.queryLatencies.WithLabelValues("GetDefaultProxyConfig").Observe(time.Since(start).Seconds())
15331533
return resp, err
15341534
}
1535+
1536+
func (m metricsStore) GetReplicaByID(ctx context.Context, id uuid.UUID) (database.Replica, error) {
1537+
start := time.Now()
1538+
replica, err := m.s.GetReplicaByID(ctx, id)
1539+
m.queryLatencies.WithLabelValues("GetReplicaByID").Observe(time.Since(start).Seconds())
1540+
return replica, err
1541+
}

‎coderd/database/migrations/000125_workspace_proxy_region_id.down.sql renamed to ‎coderd/database/migrations/000127_workspace_proxy_region_id.down.sql

File renamed without changes.

‎coderd/database/migrations/000125_workspace_proxy_region_id.up.sql renamed to ‎coderd/database/migrations/000127_workspace_proxy_region_id.up.sql

File renamed without changes.

‎coderd/database/queries.sql.go

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

‎enterprise/coderd/workspaceproxy_test.go

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -334,20 +334,17 @@ func TestProxyRegisterDeregister(t *testing.T) {
334334
require.EqualValues(t, 10001, registerRes1.DERPRegionID)
335335
require.Empty(t, registerRes1.SiblingReplicas)
336336

337-
// Get the proxy to ensure fields have updated.
338-
// TODO: we don't have a way to get the proxy by ID yet.
339-
proxies, err := client.WorkspaceProxies(ctx)
340-
require.NoError(t, err)
341-
require.Len(t, proxies, 1)
342-
require.Equal(t, createRes.Proxy.ID, proxies[0].ID)
343-
require.Equal(t, proxyName, proxies[0].Name)
344-
require.Equal(t, proxyDisplayName, proxies[0].DisplayName)
345-
require.Equal(t, proxyIcon, proxies[0].Icon)
346-
require.Equal(t, req.AccessURL, proxies[0].URL)
347-
require.Equal(t, req.AccessURL, proxies[0].URL)
348-
require.Equal(t, req.WildcardHostname, proxies[0].WildcardHostname)
349-
require.Equal(t, req.DerpEnabled, proxies[0].DerpEnabled)
350-
require.False(t, proxies[0].Deleted)
337+
proxy, err := client.WorkspaceProxyByID(ctx, createRes.Proxy.ID)
338+
require.NoError(t, err)
339+
require.Equal(t, createRes.Proxy.ID, proxy.ID)
340+
require.Equal(t, proxyName, proxy.Name)
341+
require.Equal(t, proxyDisplayName, proxy.DisplayName)
342+
require.Equal(t, proxyIcon, proxy.Icon)
343+
require.Equal(t, req.AccessURL, proxy.URL)
344+
require.Equal(t, req.AccessURL, proxy.URL)
345+
require.Equal(t, req.WildcardHostname, proxy.WildcardHostname)
346+
require.Equal(t, req.DerpEnabled, proxy.DerpEnabled)
347+
require.False(t, proxy.Deleted)
351348

352349
// Get the replica from the DB.
353350
replica, err := db.GetReplicaByID(ctx, req.ReplicaID)
@@ -379,18 +376,17 @@ func TestProxyRegisterDeregister(t *testing.T) {
379376

380377
// Get the proxy to ensure nothing has changed except updated_at.
381378
// TODO: we don't have a way to get the proxy by ID yet.
382-
proxiesNew, err := client.WorkspaceProxies(ctx)
383-
require.NoError(t, err)
384-
require.Len(t, proxiesNew, 1)
385-
require.Equal(t, createRes.Proxy.ID, proxiesNew[0].ID)
386-
require.Equal(t, proxyName, proxiesNew[0].Name)
387-
require.Equal(t, proxyDisplayName, proxiesNew[0].DisplayName)
388-
require.Equal(t, proxyIcon, proxiesNew[0].Icon)
389-
require.Equal(t, req.AccessURL, proxiesNew[0].URL)
390-
require.Equal(t, req.AccessURL, proxiesNew[0].URL)
391-
require.Equal(t, req.WildcardHostname, proxiesNew[0].WildcardHostname)
392-
require.Equal(t, req.DerpEnabled, proxiesNew[0].DerpEnabled)
393-
require.False(t, proxiesNew[0].Deleted)
379+
proxyNew, err := client.WorkspaceProxyByID(ctx, createRes.Proxy.ID)
380+
require.NoError(t, err)
381+
require.Equal(t, createRes.Proxy.ID, proxyNew.ID)
382+
require.Equal(t, proxyName, proxyNew.Name)
383+
require.Equal(t, proxyDisplayName, proxyNew.DisplayName)
384+
require.Equal(t, proxyIcon, proxyNew.Icon)
385+
require.Equal(t, req.AccessURL, proxyNew.URL)
386+
require.Equal(t, req.AccessURL, proxyNew.URL)
387+
require.Equal(t, req.WildcardHostname, proxyNew.WildcardHostname)
388+
require.Equal(t, req.DerpEnabled, proxyNew.DerpEnabled)
389+
require.False(t, proxyNew.Deleted)
394390

395391
// Get the replica from the DB and ensure the fields have been updated,
396392
// especially the updated_at.

0 commit comments

Comments
 (0)