Skip to content

Commit d004f95

Browse files
mtojekmtojek
committed
Merge branch 'main' into 4-pause-1
2 parents dde9ed7 + bdd2caf commit d004f95

File tree

10 files changed

+36
-10
lines changed

10 files changed

+36
-10
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,11 +1479,14 @@ func (q *querier) GetNotificationMessagesByStatus(ctx context.Context, arg datab
14791479
return q.db.GetNotificationMessagesByStatus(ctx, arg)
14801480
}
14811481

1482+
<<<<<<< HEAD
14821483
func (q *querier) GetNotificationsSettings(ctx context.Context) (string, error) {
14831484
// No authz checks
14841485
return q.db.GetNotificationsSettings(ctx)
14851486
}
14861487

1488+
=======
1489+
>>>>>>> main
14871490
func (q *querier) GetOAuth2ProviderAppByID(ctx context.Context, id uuid.UUID) (database.OAuth2ProviderApp, error) {
14881491
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceOauth2App); err != nil {
14891492
return database.OAuth2ProviderApp{}, err

‎coderd/database/dbmetrics/dbmetrics.go

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

‎coderd/database/dbmock/dbmock.go

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

‎coderd/database/dbpurge/dbpurge_test.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"time"
1212

1313
"github.com/google/uuid"
14+
"github.com/stretchr/testify/assert"
1415
"github.com/stretchr/testify/require"
1516
"go.uber.org/goleak"
1617
"golang.org/x/exp/slices"
@@ -183,20 +184,29 @@ func TestDeleteOldWorkspaceAgentLogs(t *testing.T) {
183184
// given
184185
agent := mustCreateAgentWithLogs(ctx, t, db, user, org, tmpl, tv, now.Add(-8*24*time.Hour), t.Name())
185186

187+
// Make sure that agent logs have been collected.
188+
agentLogs, err := db.GetWorkspaceAgentLogsAfter(ctx, database.GetWorkspaceAgentLogsAfterParams{
189+
AgentID: agent,
190+
})
191+
require.NoError(t, err)
192+
require.NotZero(t, agentLogs, "agent logs must be present")
193+
186194
// when
187195
closer := dbpurge.New(ctx, logger, db)
188196
defer closer.Close()
189197

190198
// then
191-
require.Eventually(t, func() bool {
192-
agentLogs, err := db.GetWorkspaceAgentLogsAfter(ctx, database.GetWorkspaceAgentLogsAfterParams{
199+
assert.Eventually(t, func() bool {
200+
agentLogs, err = db.GetWorkspaceAgentLogsAfter(ctx, database.GetWorkspaceAgentLogsAfterParams{
193201
AgentID: agent,
194202
})
195203
if err != nil {
196204
return false
197205
}
198206
return !containsAgentLog(agentLogs, t.Name())
199207
}, testutil.WaitShort, testutil.IntervalFast)
208+
require.NoError(t, err)
209+
require.NotContains(t, agentLogs, t.Name())
200210
})
201211

202212
t.Run("AgentConnectedSixDaysAgo_LogsValid", func(t *testing.T) {

‎coderd/database/querier.go

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

‎coderd/notifications/manager_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ import (
77
"testing"
88
"time"
99

10+
"github.com/coder/serpent"
1011
"github.com/google/uuid"
1112
"github.com/stretchr/testify/assert"
1213
"github.com/stretchr/testify/require"
1314
"golang.org/x/xerrors"
1415

15-
"github.com/coder/serpent"
16-
1716
"cdr.dev/slog"
1817
"cdr.dev/slog/sloggers/slogtest"
1918

‎docs/install/kubernetes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ locally in order to log in and manage templates.
145145
helm install coder coder-v2/coder \
146146
--namespace coder \
147147
--values values.yaml \
148-
--version 2.11.4
148+
--version 2.12.3
149149
```
150150

151151
You can watch Coder start up by running `kubectl get pods -n coder`. Once

‎docs/install/releases.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ their infrastructure on a staging environment before upgrading a production
88
deployment.
99

1010
We support two release channels:
11-
[mainline](https://github.com/coder/coder/releases/tag/v2.10.1) for the bleeding
11+
[mainline](https://github.com/coder/coder/releases/tag/v2.13.0) for the bleeding
1212
edge version of Coder and
1313
[stable](https://github.com/coder/coder/releases/latest) for those with lower
1414
tolerance for fault. We field our mainline releases publicly for one month
@@ -52,7 +52,8 @@ pages.
5252
| 2.7.x | January 01, 2024 | Not Supported |
5353
| 2.8.x | February 06, 2024 | Not Supported |
5454
| 2.9.x | March 07, 2024 | Not Supported |
55-
| 2.10.x | April 03, 2024 | Security Support |
56-
| 2.11.x | May 07, 2024 | Stable |
57-
| 2.12.x | June 04, 2024 | Mainline |
58-
| 2.13.x | July 02, 2024 | Not Released |
55+
| 2.10.x | April 03, 2024 | Not Supported |
56+
| 2.11.x | May 07, 2024 | Security Support |
57+
| 2.12.x | June 04, 2024 | Stable |
58+
| 2.13.x | July 02, 2024 | Mainline |
59+
| 2.14.x | Aigust 06, 2024 | Not Released |

‎dogfood/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ SHELL ["/bin/bash", "-c"]
9191
RUN apt-get update && apt-get install --yes ca-certificates
9292

9393
COPY files /
94+
RUN chown -R 0:0 /etc/sudoers.d # workaround for coder/envbuilder#70
9495

9596
# Install packages from apt repositories
9697
ARG DEBIAN_FRONTEND="noninteractive"

‎site/src/api/typesGenerated.ts

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

0 commit comments

Comments
 (0)