Skip to content

Commit 9320c4f

Browse files
cpanatocpanato
authored
Updates (#307)
* bump golangci-lint to v1.53.x Signed-off-by: cpanato <[email protected]> * bump alpine base image to 3.18 Signed-off-by: cpanato <[email protected]> * update deprecated goreleaser flags Signed-off-by: cpanato <[email protected]> * remove action for cache, the setup-go already do that Signed-off-by: cpanato <[email protected]> * fix lints Signed-off-by: cpanato <[email protected]> --------- Signed-off-by: cpanato <[email protected]>
1 parent f906f6f commit 9320c4f

File tree

8 files changed

+12
-41
lines changed

8 files changed

+12
-41
lines changed

Diff for: ‎.github/workflows/ci.yaml

+1-26
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@ jobs:
1919
go-version-file: './go.mod'
2020
check-latest: true
2121

22-
- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
23-
with:
24-
path: |
25-
~/.cache/go-build
26-
~/go/pkg/mod
27-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
28-
restore-keys: |
29-
${{ runner.os }}-go-
30-
3122
- name: Set up QEMU
3223
uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0
3324

@@ -45,14 +36,6 @@ jobs:
4536
- name: Install syft
4637
uses: anchore/sbom-action/download-syft@78fc58e266e87a38d4194b2137a3d4e9bcaf7ca1 # v0.14.3
4738

48-
- name: Cache
49-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
50-
with:
51-
path: ~/go/pkg/mod
52-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
53-
restore-keys: |
54-
${{ runner.os }}-go-
55-
5639
- uses: chainguard-dev/actions/goimports@main
5740

5841
- name: Run Mage
@@ -90,15 +73,7 @@ jobs:
9073
with:
9174
go-version-file: './go.mod'
9275
check-latest: true
93-
- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
94-
with:
95-
path: |
96-
~/.cache/go-build
97-
~/go/pkg/mod
98-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
99-
restore-keys: |
100-
${{ runner.os }}-go-
10176
- name: golangci-lint
10277
uses: golangci/golangci-lint-action@639cd343e1d3b897ff35927a75193d57cfcba299 # v3.6.0
10378
with:
104-
version: v1.51.0
79+
version: v1.53

Diff for: ‎.golangci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
linters:
22
enable:
33
- asciicheck
4-
- depguard
54
- errcheck
65
- errorlint
76
- gofmt

Diff for: ‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.17
1+
FROM alpine:3.18
22

33
RUN apk --no-cache add ca-certificates git
44

Diff for: ‎cr/cmd/docGen.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var generateDocsCmd = &cobra.Command{
3232
RunE: generateDocs,
3333
}
3434

35-
func generateDocs(cmd *cobra.Command, args []string) error {
35+
func generateDocs(_ *cobra.Command, _ []string) error {
3636
fmt.Println("Generating docs...")
3737

3838
err := doc.GenMarkdownTree(rootCmd.Root(), "doc")

Diff for: ‎magefile.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func Test() error {
110110
}
111111

112112
func Build() error {
113-
return sh.RunV("goreleaser", "release", "--rm-dist", "--snapshot", "--skip-sign")
113+
return sh.RunV("goreleaser", "release", "--clean", "--snapshot", "--skip-sign")
114114
}
115115

116116
func CI() error {
@@ -137,5 +137,5 @@ func Release() error {
137137
return err
138138
}
139139

140-
return sh.RunV("goreleaser", "release", "--rm-dist")
140+
return sh.RunV("goreleaser", "release", "--clean")
141141
}

Diff for: ‎pkg/github/github.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func NewClient(owner, repo, token, baseURL, uploadURL string) *Client {
8585
}
8686

8787
// GetRelease queries the GitHub API for a specified release object
88-
func (c *Client) GetRelease(ctx context.Context, tag string) (*Release, error) {
88+
func (c *Client) GetRelease(_ context.Context, tag string) (*Release, error) {
8989
// Check Release whether already exists or not
9090
release, _, err := c.Repositories.GetReleaseByTag(context.TODO(), c.owner, c.repo, tag)
9191
if err != nil {
@@ -103,7 +103,7 @@ func (c *Client) GetRelease(ctx context.Context, tag string) (*Release, error) {
103103
}
104104

105105
// CreateRelease creates a new release object in the GitHub API
106-
func (c *Client) CreateRelease(ctx context.Context, input *Release) error {
106+
func (c *Client) CreateRelease(_ context.Context, input *Release) error {
107107
req := &github.RepositoryRelease{
108108
Name: &input.Name,
109109
Body: &input.Description,
@@ -150,7 +150,7 @@ func (c *Client) CreatePullRequest(owner string, repo string, message string, he
150150
}
151151

152152
// UploadAsset uploads specified assets to a given release object
153-
func (c *Client) uploadReleaseAsset(ctx context.Context, releaseID int64, filename string) error {
153+
func (c *Client) uploadReleaseAsset(_ context.Context, releaseID int64, filename string) error {
154154
filename, err := filepath.Abs(filename)
155155
if err != nil {
156156
return errors.Wrap(err, "failed to get abs path")
@@ -161,7 +161,7 @@ func (c *Client) uploadReleaseAsset(ctx context.Context, releaseID int64, filena
161161
Name: filepath.Base(filename),
162162
}
163163

164-
if err := retry.Retry(3, 3*time.Second, func() error {
164+
if err := retry.Retry(3, 3*time.Second, func() error { //nolint: revive
165165
f, err := os.Open(filename)
166166
if err != nil {
167167
return errors.Wrap(err, "failed to open file")

Diff for: ‎pkg/releaser/releaser.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,7 @@ func (r *Releaser) addToIndexFile(indexFile *repo.IndexFile, url string) error {
296296
}
297297

298298
// Add to index
299-
if err := indexFile.MustAdd(c.Metadata, filepath.Base(arch), strings.Join(s, "/"), hash); err != nil {
300-
return err
301-
}
302-
return nil
299+
return indexFile.MustAdd(c.Metadata, filepath.Base(arch), strings.Join(s, "/"), hash)
303300
}
304301

305302
// CreateReleases finds and uploads Helm chart packages to GitHub

Diff for: ‎pkg/releaser/releaser_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type FakeGit struct {
4040
mock.Mock
4141
}
4242

43-
func (f *FakeGit) AddWorktree(workingDir string, committish string) (string, error) {
43+
func (f *FakeGit) AddWorktree(workingDir string, committish string) (string, error) { //nolint: revive
4444
dir, err := os.MkdirTemp("", "chart-releaser-")
4545
if err != nil {
4646
return "", err
@@ -92,7 +92,7 @@ func (f *FakeGitHub) CreateRelease(ctx context.Context, input *github.Release) e
9292
return nil
9393
}
9494

95-
func (f *FakeGitHub) GetRelease(ctx context.Context, tag string) (*github.Release, error) {
95+
func (f *FakeGitHub) GetRelease(ctx context.Context, tag string) (*github.Release, error) { //nolint: revive
9696
release := &github.Release{
9797
Name: "testdata/release-packages/test-chart-0.1.0",
9898
Description: "A Helm chart for Kubernetes",

0 commit comments

Comments
 (0)