Skip to content

Commit 3fba446

Browse files
renovate[bot]TimHuynh
andauthored
fix(deps): update all non-major dependencies (#176)
* fix(deps): update all non-major dependencies * update gcloud and cov * fix typo * update to server type * update ci rules * format versino * update version.go * typo * lint fix --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: TimHuynh <tim.huynh@target.com>
1 parent c91c082 commit 3fba446

File tree

14 files changed

+132
-126
lines changed

14 files changed

+132
-126
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- name: clone
16-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717

1818
- name: install go
19-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
19+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2020
with:
2121
# use version from go.mod file
2222
go-version-file: 'go.mod'

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535

3636
steps:
3737
- name: Checkout repository
38-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
38+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3939

4040
# Initializes the CodeQL tools for scanning.
4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
42+
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
4343
with:
4444
languages: ${{ matrix.language }}
4545
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
5050
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5151
# If this step fails, then you should remove it and run the build manually (see below)
5252
- name: Autobuild
53-
uses: github/codeql-action/autobuild@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
53+
uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
5454

5555
# ℹ️ Command-line programs to run using the OS shell.
5656
# 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
6464
# make release
6565

6666
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
67+
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10

.github/workflows/prerelease.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414

1515
steps:
1616
- name: clone
17-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
17+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1818
with:
1919
# ensures we fetch tag history for the repository
2020
fetch-depth: 0
2121

2222
- name: install go
23-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
23+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2424
with:
2525
# use version from go.mod file
2626
go-version-file: 'go.mod'

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313

1414
steps:
1515
- name: clone
16-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717
with:
1818
# ensures we fetch tag history for the repository
1919
fetch-depth: 0
2020

2121
- name: install go
22-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
22+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2323
with:
2424
# use version from go.mod file
2525
go-version-file: 'go.mod'

.github/workflows/reviewdog.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ jobs:
1212

1313
steps:
1414
- name: clone
15-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
15+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

1717
- name: install go
18-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
18+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
1919
with:
2020
# use version from go.mod file
2121
go-version-file: 'go.mod'
2222
cache: true
2323
check-latest: true
2424

2525
- name: golangci-lint
26-
uses: reviewdog/action-golangci-lint@7708105983c614f7a2725e2172908b7709d1c3e4 # v2.6.2
26+
uses: reviewdog/action-golangci-lint@dd3fda91790ca90e75049e5c767509dc0ec7d99b # v2.7.0
2727
with:
2828
github_token: ${{ secrets.github_token }}
2929
golangci_lint_flags: "--config=.golangci.yml"
@@ -36,18 +36,18 @@ jobs:
3636

3737
steps:
3838
- name: clone
39-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
39+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4040

4141
- name: install go
42-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
42+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
4343
with:
4444
# use version from go.mod file
4545
go-version-file: 'go.mod'
4646
cache: true
4747
check-latest: true
4848

4949
- name: golangci-lint
50-
uses: reviewdog/action-golangci-lint@7708105983c614f7a2725e2172908b7709d1c3e4 # v2.6.2
50+
uses: reviewdog/action-golangci-lint@dd3fda91790ca90e75049e5c767509dc0ec7d99b # v2.7.0
5151
with:
5252
github_token: ${{ secrets.github_token }}
5353
golangci_lint_flags: "--config=.golangci.yml"

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- name: clone
16-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717

1818
- name: install go
19-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
19+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2020
with:
2121
# use version from go.mod file
2222
go-version-file: 'go.mod'
@@ -28,7 +28,7 @@ jobs:
2828
go test -race -covermode=atomic -coverprofile=coverage.out ./...
2929
3030
- name: coverage
31-
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
31+
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
3232
with:
3333
token: ${{ secrets.CODECOV_TOKEN }}
3434
file: coverage.out

.github/workflows/validate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- name: clone
16-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717

1818
- name: install go
19-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
19+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2020
with:
2121
# use version from go.mod file
2222
go-version-file: 'go.mod'

.golangci.yml

Lines changed: 66 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,22 @@
88
# outputs it results from the linters it executes.
99
output:
1010
# colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
11-
format: colored-line-number
11+
formats:
12+
- format: colored-line-number
1213

1314
# print lines of code with issue, default is true
1415
print-issued-lines: true
1516

1617
# print linter name in the end of issue text, default is true
1718
print-linter-name: true
1819

19-
# make issues output unique by line, default is true
20-
uniq-by-line: true
21-
2220
# This section provides the configuration for each linter
2321
# we've instructed golangci to execute.
2422
linters-settings:
23+
# https://github.com/karamaru-alpha/copyloopvar
24+
copyloopvar:
25+
check-alias: true
26+
2527
# https://github.com/mibk/dupl
2628
dupl:
2729
threshold: 100
@@ -32,6 +34,18 @@ linters-settings:
3234
lines: 160
3335
statements: 70
3436

37+
# https://github.com/daixiang0/gci
38+
# ensure import order is consistent
39+
# gci write --custom-order -s standard -s default -s blank -s dot -s "prefix(github.com/go-vela)" .
40+
gci:
41+
custom-order: true
42+
sections:
43+
- standard
44+
- default
45+
- blank
46+
- dot
47+
- prefix(github.com/go-vela)
48+
3549
# https://github.com/denis-tingaikin/go-header
3650
goheader:
3751
template: |-
@@ -42,10 +56,10 @@ linters-settings:
4256
locale: US
4357

4458
# https://github.com/golangci/golangci-lint/blob/master/pkg/golinters/nolintlint
45-
nolintlint:
46-
allow-unused: false # allow nolint directives that don't address a linting issue
47-
require-explanation: true # require an explanation for nolint directives
48-
require-specific: true # require nolint directives to be specific about which linter is being skipped
59+
nolintlint:
60+
allow-unused: false # allow nolint directives that don't address a linting issue
61+
require-explanation: true # require an explanation for nolint directives
62+
require-specific: true # require nolint directives to be specific about which linter is being skipped
4963

5064
# This section provides the configuration for which linters
5165
# golangci will execute. Several of them were disabled by
@@ -56,46 +70,43 @@ linters:
5670

5771
# enable a specific set of linters to run
5872
enable:
59-
- bidichk # checks for dangerous unicode character sequences
60-
- bodyclose # checks whether HTTP response body is closed successfully
61-
- contextcheck # check the function whether use a non-inherited context
62-
- deadcode # finds unused code
63-
- dupl # code clone detection
64-
- errcheck # checks for unchecked errors
65-
- errorlint # find misuses of errors
66-
- exportloopref # check for exported loop vars
67-
- funlen # detects long functions
68-
- goconst # finds repeated strings that could be replaced by a constant
69-
- gocyclo # computes and checks the cyclomatic complexity of functions
70-
- godot # checks if comments end in a period
71-
- gofmt # checks whether code was gofmt-ed
72-
- goheader # checks is file header matches to pattern
73-
- goimports # fixes imports and formats code in same style as gofmt
74-
- gomoddirectives # manage the use of 'replace', 'retract', and 'excludes' directives in go.mod
75-
- goprintffuncname # checks that printf-like functions are named with f at the end
76-
- gosec # inspects code for security problems
77-
- gosimple # linter that specializes in simplifying a code
78-
- govet # reports suspicious constructs, ex. Printf calls whose arguments don't align with the format string
79-
- ineffassign # detects when assignments to existing variables aren't used
80-
- makezero # finds slice declarations with non-zero initial length
81-
- misspell # finds commonly misspelled English words in comments
82-
- nakedret # finds naked returns in functions greater than a specified function length
83-
- nilerr # finds the code that returns nil even if it checks that the error is not nil
84-
- noctx # noctx finds sending http request without context.Context
85-
- nolintlint # reports ill-formed or insufficient nolint directives
86-
- revive # linter for go
87-
- staticcheck # applies static analysis checks, go vet on steroids
88-
- structcheck # finds unused struct fields
89-
- stylecheck # replacement for golint
90-
- tenv # analyzer that detects using os.Setenv instead of t.Setenv since Go1.17
91-
- typecheck # parses and type-checks go code, like the front-end of a go compiler
92-
- unconvert # remove unnecessary type conversions
93-
- unparam # reports unused function parameters
94-
- unused # checks for unused constants, variables, functions and types
95-
- varcheck # finds unused global variables and constants
96-
- whitespace # detects leading and trailing whitespace
97-
- wsl # forces code to use empty lines
98-
73+
- bidichk # checks for dangerous unicode character sequences
74+
- bodyclose # checks whether HTTP response body is closed successfully
75+
- contextcheck # check the function whether use a non-inherited context
76+
- copyloopvar # detects places where loop variables are copied
77+
- dupl # code clone detection
78+
- errcheck # checks for unchecked errors
79+
- errorlint # find misuses of errors
80+
- funlen # detects long functions
81+
- gci # consistent import ordering
82+
- goconst # finds repeated strings that could be replaced by a constant
83+
- gocyclo # computes and checks the cyclomatic complexity of functions
84+
- godot # checks if comments end in a period
85+
- gofmt # checks whether code was gofmt-ed
86+
- goheader # checks is file header matches to pattern
87+
- gomoddirectives # manage the use of 'replace', 'retract', and 'excludes' directives in go.mod
88+
- goprintffuncname # checks that printf-like functions are named with f at the end
89+
- gosec # inspects code for security problems
90+
- gosimple # linter that specializes in simplifying a code
91+
- govet # reports suspicious constructs, ex. Printf calls whose arguments don't align with the format string
92+
- ineffassign # detects when assignments to existing variables aren't used
93+
- makezero # finds slice declarations with non-zero initial length
94+
- misspell # finds commonly misspelled English words in comments
95+
- nakedret # finds naked returns in functions greater than a specified function length
96+
- nilerr # finds the code that returns nil even if it checks that the error is not nil
97+
- noctx # noctx finds sending http request without context.Context
98+
- nolintlint # reports ill-formed or insufficient nolint directives
99+
- revive # linter for go
100+
- staticcheck # applies static analysis checks, go vet on steroids
101+
- stylecheck # replacement for golint
102+
- typecheck # parses and type-checks go code, like the front-end of a go compiler
103+
- unconvert # remove unnecessary type conversions
104+
- unparam # reports unused function parameters
105+
- unused # checks for unused constants, variables, functions and types
106+
- usetesting # checks to make sure to use testing specific helpers
107+
- whitespace # detects leading and trailing whitespace
108+
- wsl # forces code to use empty lines
109+
99110
# static list of linters we know golangci can run but we've
100111
# chosen to leave disabled for now
101112
# - asciicheck - non-critical
@@ -108,21 +119,21 @@ linters:
108119
# - exhaustivestruct - style preference
109120
# - forbidigo - unused
110121
# - forcetypeassert - unused
111-
# - gci - use goimports
112122
# - gochecknoinits - unused
113123
# - gochecknoglobals - global variables allowed
114-
# - gocognit - unused complexity metric
124+
# - gocognit - unused complexity metric
115125
# - gocritic - style preference
116126
# - godox - to be used in the future
117127
# - goerr113 - to be used in the future
128+
# - goimports - use gci
118129
# - golint - archived, replaced with revive
119130
# - gofumpt - use gofmt
120131
# - gomnd - get too many false-positives
121132
# - gomodguard - unused
122133
# - ifshort - use both styles
123134
# - ireturn - allow interfaces to be returned
124135
# - importas - want flexibility with naming
125-
# - lll - not too concerned about line length
136+
# - lll - not too concerned about line length
126137
# - interfacer - archived
127138
# - nestif - non-critical
128139
# - nilnil - style preference
@@ -131,7 +142,7 @@ linters:
131142
# - paralleltest - false-positives
132143
# - prealloc - don't use
133144
# - predeclared - unused
134-
# - promlinter - style preference
145+
# - promlinter - style preference
135146
# - rowserrcheck - unused
136147
# - scopelint - deprecated - replaced with exportloopref
137148
# - sqlclosecheck - unused
@@ -145,6 +156,8 @@ linters:
145156
# This section provides the configuration for how golangci
146157
# will report the issues it finds.
147158
issues:
159+
# make issues output unique by line, default is true
160+
uniq-by-line: true
148161
# Excluding configuration per-path, per-linter, per-text and per-source
149162
exclude-rules:
150163
# prevent linters from running on *_test.go files
@@ -154,3 +167,4 @@ issues:
154167
- funlen
155168
- goconst
156169
- gocyclo
170+
- wsl

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ARG KUBECTL_VERSION=v1.24.12
99
## docker build --no-cache --target binary -t vela-kubernetes:binary . ##
1010
###############################################################################
1111

12-
FROM alpine:3.20.2@sha256:0a4eaa0eecf5f8c050e5bba433f58c052be7587ee8af3e8b3910ef9ab5fbe9f5 as binary
12+
FROM alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c as binary
1313

1414
ARG KUBECTL_VERSION
1515

@@ -21,15 +21,15 @@ RUN chmod 0700 /bin/kubectl
2121
## docker build --no-cache --target certs -t vela-kubernetes:certs . ##
2222
#############################################################################
2323

24-
FROM alpine:3.20.2@sha256:0a4eaa0eecf5f8c050e5bba433f58c052be7587ee8af3e8b3910ef9ab5fbe9f5 as certs
24+
FROM alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c as certs
2525

2626
RUN apk add --update --no-cache ca-certificates
2727

2828
#############################################################################
2929
## docker build --no-cache --target gcloud -t vela-kubernetes:gcloud . ##
3030
#############################################################################
3131

32-
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:490.0.0-alpine@sha256:88460661f93d6a6734dae217a5b251c60e0e533b7399f48d51d038f57a0cfbc0 as gcloud
32+
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:511.0.0-alpine@sha256:3748754a3baf63176b16b2d789caf3f485ded6f1587647f9655b2c04c899edf9 as gcloud
3333

3434
RUN gcloud components install gke-gcloud-auth-plugin
3535

cmd/vela-kubernetes/config.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ import (
77
"os/user"
88
"path/filepath"
99

10-
"github.com/spf13/afero"
11-
1210
"github.com/sirupsen/logrus"
11+
"github.com/spf13/afero"
1312
)
1413

1514
var appFS = afero.NewOsFs()

0 commit comments

Comments
 (0)