From 318c5a69aefd1fa5ee290f5b7c9c7fd00c633aa2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 06:10:51 +0000 Subject: [PATCH 1/2] ci: bump the github-actions group with 4 updates 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](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/0d9e0c2c1bd7f770f6eb90f87780848ca02fc12c...d01f29c66d1bf1a08730750f61d86c210b0d039d) Updates `google-github-actions/auth` from 2.1.6 to 2.1.7 - [Release notes](https://github.com/google-github-actions/auth/releases) - [Changelog](https://github.com/google-github-actions/auth/blob/main/CHANGELOG.md) - [Commits](https://github.com/google-github-actions/auth/compare/8254fb75a33b976a221574d287e93919e6a36f70...6fc4af4b145ae7821d527454aa9bd537d1f2dc5f) Updates `google-github-actions/setup-gcloud` from 2.1.1 to 2.1.2 - [Release notes](https://github.com/google-github-actions/setup-gcloud/releases) - [Changelog](https://github.com/google-github-actions/setup-gcloud/blob/main/CHANGELOG.md) - [Commits](https://github.com/google-github-actions/setup-gcloud/compare/f0990588f1e5b5af6827153b93673613abdc6ec7...6189d56e4096ee891640bb02ac264be376592d6a) Updates `google-github-actions/get-gke-credentials` from 2.2.1 to 2.2.2 - [Release notes](https://github.com/google-github-actions/get-gke-credentials/releases) - [Changelog](https://github.com/google-github-actions/get-gke-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/google-github-actions/get-gke-credentials/compare/6051de21ad50fbb1767bc93c11357a49082ad116...206d64b64b0eba0a6e2f25113d044c31776ca8d6) --- updated-dependencies: - dependency-name: crate-ci/typos dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: google-github-actions/auth dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: google-github-actions/setup-gcloud dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: google-github-actions/get-gke-credentials dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 8 ++++---- .github/workflows/dogfood.yaml | 2 +- .github/workflows/release.yaml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7773ac759e0d9..55e14f0e6e1f7 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 f968d29ce13f1..b440e299885db 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 74b5b7b35a1e7..cf4fb87cd0673 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 }} From a10d68958520ebef158e68c9837de03f12ef6e52 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Tue, 5 Nov 2024 07:03:55 +0000 Subject: [PATCH 2/2] Fix typos and refactor function naming Correct typos across multiple files and standardize function names for consistency. These changes improve maintainability and readability of the codebase. --- .github/workflows/typos.toml | 1 + coderd/database/dbmem/dbmem.go | 12 ++++++------ coderd/httpmw/workspaceproxy.go | 2 +- coderd/unhanger/detector.go | 14 +++++++------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/typos.toml b/.github/workflows/typos.toml index b384068e831f2..e388502a0c0d9 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 be17abe8dd63b..2141eddf111eb 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 8ee53187850d0..1f2de1ed46160 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 9a3440f705ed7..14383b1839363 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"), } }