From 8f66b3de2b98625dbae3e03bf7f1c07cbcc57fe9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:36:29 +0000 Subject: [PATCH 1/2] ci: bump crate-ci/typos in the github-actions group Bumps the github-actions group with 1 update: [crate-ci/typos](https://github.com/crate-ci/typos). Updates `crate-ci/typos` from 1.19.0 to 1.20.9 - [Release notes](https://github.com/crate-ci/typos/releases) - [Changelog](https://github.com/crate-ci/typos/blob/master/CHANGELOG.md) - [Commits](https://github.com/crate-ci/typos/compare/v1.19.0...v1.20.9) --- updated-dependencies: - dependency-name: crate-ci/typos dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b922608aaf616..2d26c1a348381 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -142,7 +142,7 @@ jobs: # Check for any typos - name: Check for typos - uses: crate-ci/typos@v1.19.0 + uses: crate-ci/typos@v1.20.9 with: config: .github/workflows/typos.toml From 373cd47d6c56d6432bb31330be3f4c05e4bcd6ad Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Mon, 22 Apr 2024 09:34:26 -0400 Subject: [PATCH 2/2] Add `pn` exclusion --- .github/workflows/typos.toml | 1 + coderd/authorize.go | 4 ++-- docs/changelogs/v2.9.0.md | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/typos.toml b/.github/workflows/typos.toml index 57d1b596ede18..559260e0f7f32 100644 --- a/.github/workflows/typos.toml +++ b/.github/workflows/typos.toml @@ -15,6 +15,7 @@ Hashi = "Hashi" trialer = "trialer" encrypter = "encrypter" hel = "hel" # as in helsinki +pn = "pn" # this is used as proto node [files] extend-exclude = [ diff --git a/coderd/authorize.go b/coderd/authorize.go index 19a633bf46f81..764f573ecfdc7 100644 --- a/coderd/authorize.go +++ b/coderd/authorize.go @@ -190,9 +190,9 @@ func (api *API) checkAuthorization(rw http.ResponseWriter, r *http.Request) { // Only support referencing some resources by ID. switch v.Object.ResourceType.String() { case rbac.ResourceWorkspaceExecution.Type: - wrkSpace, err := api.Database.GetWorkspaceByID(ctx, id) + workSpace, err := api.Database.GetWorkspaceByID(ctx, id) if err == nil { - dbObj = wrkSpace.ExecutionRBAC() + dbObj = workSpace.ExecutionRBAC() } dbErr = err case rbac.ResourceWorkspace.Type: diff --git a/docs/changelogs/v2.9.0.md b/docs/changelogs/v2.9.0.md index 1e28a04d60105..0d68325fa4ec3 100644 --- a/docs/changelogs/v2.9.0.md +++ b/docs/changelogs/v2.9.0.md @@ -109,7 +109,7 @@ The following features are hidden or disabled by default as we don't guarantee s - Dashboard: Improve clipboard support on HTTP connections and older browsers (#12178) (@Parkreiner) - Server: Add postgres triggers to remove deleted users from user_links (#12117) (@Emyrk) - Dashboard: Add tests and improve accessibility for useClickable (#12218) (@Parkreiner) -- Server: Ignore surronding whitespace for cli config (#12250) (@Emyrk) +- Server: Ignore surrounding whitespace for cli config (#12250) (@Emyrk) - Tailnet: Stop waiting for Agent in a goroutine in ssh test (#12268) (@spikecurtis) - d4d8424ce fix: fix GetOrganizationsByUserID error when multiple organizations exist (#12257) (@Emyrk) - Server: Refresh entitlements after creating first user (#12285) (@mtojek)