Skip to content

Commit

Permalink
Merge pull request #516 from carvel-dev/bump-go1.20.3-36.x
Browse files Browse the repository at this point in the history
Bumping go to 1.20.3 and making golint happy
  • Loading branch information
sethiyash committed May 8, 2023
2 parents 36ce46a + 5f3800d commit 09ef1fc
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gh-test-external-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v1
with:
go-version: "1.20.1"
go-version: "1.20.3"
- name: Check out code into the Go module directory
uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v1
with:
go-version: "1.20.1"
go-version: "1.20.3"
- name: Check out code into the Go module directory
uses: actions/checkout@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gh-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v1
with:
go-version: "1.20.1"
go-version: "1.20.3"
- name: Check out code into the Go module directory
uses: actions/checkout@v2
with:
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v1
with:
go-version: "1.20.1"
go-version: "1.20.3"
- name: Check out code into the Go module directory
uses: actions/checkout@v2
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v1
with:
go-version: "1.20.1"
go-version: "1.20.3"
- uses: actions/checkout@v2
with:
fetch-depth: '0'
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v3.4.0
with:
version: v1.51.2
version: v1.52.2
args: -v
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.20.1
go-version: 1.20.3

- name: Retrieve version
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
with:
repo: carvel-dev/imgpkg
tool: imgpkg
goVersion: 1.20.1
goVersion: 1.20.3
secrets:
githubToken: ${{ secrets.GITHUB_TOKEN }}
slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }}
2 changes: 1 addition & 1 deletion pkg/imgpkg/registry/transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func (n NoopRoundTripperStorage) RoundTripper(regname.Repository, string) http.R
}

// CreateRoundTripper does nothing
func (n NoopRoundTripperStorage) CreateRoundTripper(reg regname.Registry, auth authn.Authenticator, scope string) (http.RoundTripper, error) {
func (n NoopRoundTripperStorage) CreateRoundTripper(_ regname.Registry, _ authn.Authenticator, _ string) (http.RoundTripper, error) {
return nil, nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/imgpkg/signature/fetch_signatures.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,6 @@ func (n Noop) Fetch(*imageset.UnprocessedImageRefs) (*imageset.UnprocessedImageR
}

// FetchForImageRefs Retrieve the available signatures associated with the images provided
func (n Noop) FetchForImageRefs(images []lockconfig.ImageRef) ([]lockconfig.ImageRef, error) {
func (n Noop) FetchForImageRefs(_ []lockconfig.ImageRef) ([]lockconfig.ImageRef, error) {
return nil, nil
}
4 changes: 0 additions & 4 deletions test/e2e/pull_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,6 @@ images:
})
}

func TestPullImage(t *testing.T) {

}

func TestPullImageFromSlowServerShouldTimeout(t *testing.T) {
logger := &helpers.Logger{}

Expand Down
2 changes: 1 addition & 1 deletion test/helpers/registry/blobs_access_controll.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func (m *diskHandler) Put(_ context.Context, repo string, h v1.Hash, rc io.ReadC
m.access[m.accessKey(repo, h)] = h.String()
return nil
}
func (m *diskHandler) Mount(_ context.Context, repo, from string, h v1.Hash) error {
func (m *diskHandler) Mount(_ context.Context, repo, _ string, h v1.Hash) error {
m.lock.Lock()
defer m.lock.Unlock()

Expand Down

0 comments on commit 09ef1fc

Please sign in to comment.