From 765314ce181fe78c6164abb45426754ec8ebe85f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Nov 2024 19:43:41 +1100
Subject: [PATCH] ci: bump the github-actions group with 4 updates (#15359)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps the github-actions group with 4 updates:
[crate-ci/typos](https://github.com/crate-ci/typos),
[google-github-actions/auth](https://github.com/google-github-actions/auth),
[google-github-actions/setup-gcloud](https://github.com/google-github-actions/setup-gcloud)
and
[google-github-actions/get-gke-credentials](https://github.com/google-github-actions/get-gke-credentials).
Updates `crate-ci/typos` from 1.26.8 to 1.27.0
Release notes
Sourced from crate-ci/typos's
releases.
v1.27.0
[1.27.0] - 2024-11-01
Features
Changelog
Sourced from crate-ci/typos's
changelog.
Change Log
All notable changes to this project will be documented in this
file.
The format is based on Keep a
Changelog
and this project adheres to Semantic
Versioning.
[Unreleased] - ReleaseDate
[1.27.0] - 2024-11-01
Features
[1.26.8] - 2024-10-24
[1.26.7] - 2024-10-24
[1.26.6] - 2024-10-24
[1.26.5] - 2024-10-24
[1.26.4] - 2024-10-24
[1.26.3] - 2024-10-24
Fixes
[1.26.2] - 2024-10-24
Fixes
- Accept
tesselate variants
[1.26.1] - 2024-10-23
Fixes
- Respect
--force-exclude for binary files
[1.26.0] - 2024-10-07
Compatibility
- (pre-commit) Requires 3.2+
Fixes
... (truncated)
Commits
Updates `google-github-actions/auth` from 2.1.6 to 2.1.7
Release notes
Sourced from google-github-actions/auth's
releases.
v2.1.7
What's Changed
Full Changelog: https://github.com/google-github-actions/auth/compare/v2.1.6...v2.1.7
Commits
Updates `google-github-actions/setup-gcloud` from 2.1.1 to 2.1.2
Release notes
Sourced from google-github-actions/setup-gcloud's
releases.
v2.1.2
What's Changed
Full Changelog: https://github.com/google-github-actions/setup-gcloud/compare/v2.1.1...v2.1.2
Commits
Updates `google-github-actions/get-gke-credentials` from 2.2.1 to 2.2.2
Release notes
Sourced from google-github-actions/get-gke-credentials's
releases.
v2.2.2
What's Changed
Full Changelog: https://github.com/google-github-actions/get-gke-credentials/compare/v2.2.1...v2.2.2
Commits
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore ` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore ` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore ` will
remove the ignore condition of the specified dependency and ignore
conditions
---------
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Muhammad Atif Ali
---
.github/workflows/ci.yaml | 8 ++++----
.github/workflows/dogfood.yaml | 2 +-
.github/workflows/release.yaml | 8 ++++----
.github/workflows/typos.toml | 1 +
coderd/database/dbmem/dbmem.go | 12 ++++++------
coderd/httpmw/workspaceproxy.go | 2 +-
coderd/unhanger/detector.go | 14 +++++++-------
7 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7773ac759e..55e14f0e6e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -188,7 +188,7 @@ jobs:
# Check for any typos
- name: Check for typos
- uses: crate-ci/typos@0d9e0c2c1bd7f770f6eb90f87780848ca02fc12c # v1.26.8
+ uses: crate-ci/typos@d01f29c66d1bf1a08730750f61d86c210b0d039d # v1.27.0
with:
config: .github/workflows/typos.toml
@@ -954,13 +954,13 @@ jobs:
fetch-depth: 0
- name: Authenticate to Google Cloud
- uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
+ uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
with:
workload_identity_provider: projects/573722524737/locations/global/workloadIdentityPools/github/providers/github
service_account: coder-ci@coder-dogfood.iam.gserviceaccount.com
- name: Set up Google Cloud SDK
- uses: google-github-actions/setup-gcloud@f0990588f1e5b5af6827153b93673613abdc6ec7 # v2.1.1
+ uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # v2.1.2
- name: Set up Flux CLI
uses: fluxcd/flux2/action@5350425cdcd5fa015337e09fa502153c0275bd4b # v2.4.0
@@ -969,7 +969,7 @@ jobs:
version: "2.2.1"
- name: Get Cluster Credentials
- uses: google-github-actions/get-gke-credentials@6051de21ad50fbb1767bc93c11357a49082ad116 # v2.2.1
+ uses: google-github-actions/get-gke-credentials@206d64b64b0eba0a6e2f25113d044c31776ca8d6 # v2.2.2
with:
cluster_name: dogfood-v2
location: us-central1-a
diff --git a/.github/workflows/dogfood.yaml b/.github/workflows/dogfood.yaml
index f968d29ce1..b440e29988 100644
--- a/.github/workflows/dogfood.yaml
+++ b/.github/workflows/dogfood.yaml
@@ -100,7 +100,7 @@ jobs:
uses: ./.github/actions/setup-tf
- name: Authenticate to Google Cloud
- uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
+ uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
with:
workload_identity_provider: projects/573722524737/locations/global/workloadIdentityPools/github/providers/github
service_account: coder-ci@coder-dogfood.iam.gserviceaccount.com
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 74b5b7b35a..cf4fb87cd0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -192,14 +192,14 @@ jobs:
# Setup GCloud for signing Windows binaries.
- name: Authenticate to Google Cloud
id: gcloud_auth
- uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
+ uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
with:
workload_identity_provider: ${{ secrets.GCP_CODE_SIGNING_WORKLOAD_ID_PROVIDER }}
service_account: ${{ secrets.GCP_CODE_SIGNING_SERVICE_ACCOUNT }}
token_format: "access_token"
- name: Setup GCloud SDK
- uses: google-github-actions/setup-gcloud@f0990588f1e5b5af6827153b93673613abdc6ec7 # v2.1.1
+ uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # v2.1.2
- name: Build binaries
run: |
@@ -365,13 +365,13 @@ jobs:
CODER_GPG_RELEASE_KEY_BASE64: ${{ secrets.GPG_RELEASE_KEY_BASE64 }}
- name: Authenticate to Google Cloud
- uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
+ uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
with:
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_ID_PROVIDER }}
service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
- name: Setup GCloud SDK
- uses: google-github-actions/setup-gcloud@f0990588f1e5b5af6827153b93673613abdc6ec7 # 2.1.1
+ uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # 2.1.2
- name: Publish Helm Chart
if: ${{ !inputs.dry_run }}
diff --git a/.github/workflows/typos.toml b/.github/workflows/typos.toml
index b384068e83..e388502a0c 100644
--- a/.github/workflows/typos.toml
+++ b/.github/workflows/typos.toml
@@ -23,6 +23,7 @@ EDE = "EDE"
# HELO is an SMTP command
HELO = "HELO"
LKE = "LKE"
+byt = "byt"
[files]
extend-exclude = [
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
index be17abe8dd..2141eddf11 100644
--- a/coderd/database/dbmem/dbmem.go
+++ b/coderd/database/dbmem/dbmem.go
@@ -941,7 +941,7 @@ func minTime(t, u time.Time) time.Time {
return u
}
-func provisonerJobStatus(j database.ProvisionerJob) database.ProvisionerJobStatus {
+func provisionerJobStatus(j database.ProvisionerJob) database.ProvisionerJobStatus {
if isNotNull(j.CompletedAt) {
if j.Error.String != "" {
return database.ProvisionerJobStatusFailed
@@ -1202,7 +1202,7 @@ func (q *FakeQuerier) AcquireProvisionerJob(_ context.Context, arg database.Acqu
provisionerJob.StartedAt = arg.StartedAt
provisionerJob.UpdatedAt = arg.StartedAt.Time
provisionerJob.WorkerID = arg.WorkerID
- provisionerJob.JobStatus = provisonerJobStatus(provisionerJob)
+ provisionerJob.JobStatus = provisionerJobStatus(provisionerJob)
q.provisionerJobs[index] = provisionerJob
// clone the Tags before returning, since maps are reference types and
// we don't want the caller to be able to mutate the map we have inside
@@ -7456,7 +7456,7 @@ func (q *FakeQuerier) InsertProvisionerJob(_ context.Context, arg database.Inser
Tags: maps.Clone(arg.Tags),
TraceMetadata: arg.TraceMetadata,
}
- job.JobStatus = provisonerJobStatus(job)
+ job.JobStatus = provisionerJobStatus(job)
q.provisionerJobs = append(q.provisionerJobs, job)
return job, nil
}
@@ -8842,7 +8842,7 @@ func (q *FakeQuerier) UpdateProvisionerJobByID(_ context.Context, arg database.U
continue
}
job.UpdatedAt = arg.UpdatedAt
- job.JobStatus = provisonerJobStatus(job)
+ job.JobStatus = provisionerJobStatus(job)
q.provisionerJobs[index] = job
return nil
}
@@ -8863,7 +8863,7 @@ func (q *FakeQuerier) UpdateProvisionerJobWithCancelByID(_ context.Context, arg
}
job.CanceledAt = arg.CanceledAt
job.CompletedAt = arg.CompletedAt
- job.JobStatus = provisonerJobStatus(job)
+ job.JobStatus = provisionerJobStatus(job)
q.provisionerJobs[index] = job
return nil
}
@@ -8886,7 +8886,7 @@ func (q *FakeQuerier) UpdateProvisionerJobWithCompleteByID(_ context.Context, ar
job.CompletedAt = arg.CompletedAt
job.Error = arg.Error
job.ErrorCode = arg.ErrorCode
- job.JobStatus = provisonerJobStatus(job)
+ job.JobStatus = provisionerJobStatus(job)
q.provisionerJobs[index] = job
return nil
}
diff --git a/coderd/httpmw/workspaceproxy.go b/coderd/httpmw/workspaceproxy.go
index 8ee5318785..1f2de1ed46 100644
--- a/coderd/httpmw/workspaceproxy.go
+++ b/coderd/httpmw/workspaceproxy.go
@@ -148,7 +148,7 @@ func ExtractWorkspaceProxy(opts ExtractWorkspaceProxyConfig) func(http.Handler)
type workspaceProxyParamContextKey struct{}
-// WorkspaceProxyParam returns the worksace proxy from the ExtractWorkspaceProxyParam handler.
+// WorkspaceProxyParam returns the workspace proxy from the ExtractWorkspaceProxyParam handler.
func WorkspaceProxyParam(r *http.Request) database.WorkspaceProxy {
user, ok := r.Context().Value(workspaceProxyParamContextKey{}).(database.WorkspaceProxy)
if !ok {
diff --git a/coderd/unhanger/detector.go b/coderd/unhanger/detector.go
index 9a3440f705..14383b1839 100644
--- a/coderd/unhanger/detector.go
+++ b/coderd/unhanger/detector.go
@@ -57,14 +57,14 @@ func (acquireLockError) Error() string {
return "lock is held by another client"
}
-// jobInelligibleError is returned when a job is not eligible to be terminated
+// jobIneligibleError is returned when a job is not eligible to be terminated
// anymore.
-type jobInelligibleError struct {
+type jobIneligibleError struct {
Err error
}
// Error implements error.
-func (e jobInelligibleError) Error() string {
+func (e jobIneligibleError) Error() string {
return fmt.Sprintf("job is no longer eligible to be terminated: %s", e.Err)
}
@@ -198,7 +198,7 @@ func (d *Detector) run(t time.Time) Stats {
err := unhangJob(ctx, log, d.db, d.pubsub, job.ID)
if err != nil {
- if !(xerrors.As(err, &acquireLockError{}) || xerrors.As(err, &jobInelligibleError{})) {
+ if !(xerrors.As(err, &acquireLockError{}) || xerrors.As(err, &jobIneligibleError{})) {
log.Error(ctx, "error forcefully terminating hung provisioner job", slog.Error(err))
}
continue
@@ -233,17 +233,17 @@ func unhangJob(ctx context.Context, log slog.Logger, db database.Store, pub pubs
if !job.StartedAt.Valid {
// This shouldn't be possible to hit because the query only selects
// started and not completed jobs, and a job can't be "un-started".
- return jobInelligibleError{
+ return jobIneligibleError{
Err: xerrors.New("job is not started"),
}
}
if job.CompletedAt.Valid {
- return jobInelligibleError{
+ return jobIneligibleError{
Err: xerrors.Errorf("job is completed (status %s)", job.JobStatus),
}
}
if job.UpdatedAt.After(time.Now().Add(-HungJobDuration)) {
- return jobInelligibleError{
+ return jobIneligibleError{
Err: xerrors.New("job has been updated recently"),
}
}