Skip to content

Commit

Permalink
Merge pull request #498 from hypnoglow/go
Browse files Browse the repository at this point in the history
🆙 go 1.23.6, golangci-lint 1.63.4
  • Loading branch information
hypnoglow authored Feb 4, 2025
2 parents 8224f68 + 856bde0 commit ffa98ce
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Run linters
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
with:
version: v1.59.1
version: v1.63.4
args: --verbose

- name: Run ShellCheck
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ linters:
enable:
- asciicheck
- bodyclose
- copyloopvar
- dogsled
- errcheck
- exhaustive
- exportloopref
- gci
- gochecknoinits
# - gocognit
Expand Down
6 changes: 3 additions & 3 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
golang 1.22.11
helm 3.15.2
golangci-lint 1.59.1
golang 1.23.6
golangci-lint 1.63.4
goreleaser 2.0.1
helm 3.15.2
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Changed

- Go updated to `1.23.6`.

## [0.16.3] - 2025-02-02

### Changed

- Go updated to 1.22.11.
- Go updated to `1.22.11`.

### Fixed

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ARG GO_VERSION=1.22.11
ARG HELM_VERSION
ARG GO_VERSION=1.23.6
ARG HELM_VERSION=3.15.2

FROM golang:${GO_VERSION}-alpine as build
FROM golang:${GO_VERSION}-alpine AS build

ARG PLUGIN_VERSION
ARG PLUGIN_VERSION=master

RUN apk add --no-cache git

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hypnoglow/helm-s3

go 1.22.11
go 1.23.6

require (
github.com/Masterminds/semver v1.5.0
Expand Down
10 changes: 4 additions & 6 deletions internal/awsutil/session_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,13 @@ func TestDynamicBucketRegion(t *testing.T) {
},
}

for _, testCase := range testCases {
testCase := testCase

t.Run(testCase.caseDescription, func(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.caseDescription, func(t *testing.T) {
t.Parallel()

actualSession, err := Session(DynamicBucketRegion(testCase.inputS3URL))
actualSession, err := Session(DynamicBucketRegion(tc.inputS3URL))
assert.NoError(t, err)
assert.Equal(t, testCase.expectedBucketRegion, aws.StringValue(actualSession.Config.Region))
assert.Equal(t, tc.expectedBucketRegion, aws.StringValue(actualSession.Config.Region))
})
}
}
Expand Down
1 change: 0 additions & 1 deletion internal/helmutil/repo_entry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ func TestLookupRepoEntry(t *testing.T) {
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
teardown := tc.setup()
defer teardown()
Expand Down
4 changes: 0 additions & 4 deletions internal/helmutil/repo_entry_v2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ func TestRepoEntryV2_URL(t *testing.T) {
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
assert.Equal(t, tc.url, tc.entry.URL())
})
Expand Down Expand Up @@ -67,7 +66,6 @@ func TestRepoEntryV2_IndexURL(t *testing.T) {
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
assert.Equal(t, tc.url, tc.entry.IndexURL())
})
Expand Down Expand Up @@ -125,7 +123,6 @@ func TestRepoEntryV2_CacheFile(t *testing.T) {
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
assert.Equal(t, tc.cacheFile, tc.entry.CacheFile())
})
Expand Down Expand Up @@ -202,7 +199,6 @@ func TestLookupV2(t *testing.T) {
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
teardown := tc.setup()
defer teardown()
Expand Down
4 changes: 0 additions & 4 deletions internal/helmutil/repo_entry_v3_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ func TestRepoEntryV3_URL(t *testing.T) {
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
assert.Equal(t, tc.url, tc.entry.URL())
})
Expand Down Expand Up @@ -68,7 +67,6 @@ func TestRepoEntryV3_IndexURL(t *testing.T) {
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
assert.Equal(t, tc.url, tc.entry.IndexURL())
})
Expand Down Expand Up @@ -123,7 +121,6 @@ func TestRepoEntryV3_CacheFile(t *testing.T) {
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
assert.Equal(t, tc.cacheFile, tc.entry.CacheFile())
})
Expand Down Expand Up @@ -203,7 +200,6 @@ func TestLookupV3(t *testing.T) {
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
teardown := tc.setup()
defer teardown()
Expand Down
1 change: 0 additions & 1 deletion internal/helmutil/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ func TestIsHelm3(t *testing.T) {
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
teardown := tc.setup()
defer teardown()
Expand Down

0 comments on commit ffa98ce

Please sign in to comment.