Skip to content

Commit 89da4fb

Browse files
chore(deps): Bump sigs.k8s.io/release-utils from 0.8.4 to 0.8.5 (#1622)
* chore(deps): Bump sigs.k8s.io/release-utils from 0.8.4 to 0.8.5 Bumps [sigs.k8s.io/release-utils](https://github.com/kubernetes-sigs/release-utils) from 0.8.4 to 0.8.5. - [Release notes](https://github.com/kubernetes-sigs/release-utils/releases) - [Commits](kubernetes-sigs/release-utils@v0.8.4...v0.8.5) --- updated-dependencies: - dependency-name: sigs.k8s.io/release-utils dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * move to go 1.23 Signed-off-by: Bob Callaway <[email protected]> * move to golangci-lint 1.61 Signed-off-by: Bob Callaway <[email protected]> * fix lint errors Signed-off-by: Bob Callaway <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Bob Callaway <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bob Callaway <[email protected]>
1 parent 5c281b2 commit 89da4fb

File tree

7 files changed

+18
-10
lines changed

7 files changed

+18
-10
lines changed

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,5 @@ jobs:
9292
- name: golangci-lint
9393
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
9494
with:
95-
version: v1.59
95+
version: v1.61
9696
args: --timeout=15m

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ local-dev:
105105
golangci-lint:
106106
rm -f $(GOLANGCI_LINT_BIN) || :
107107
set -e ;\
108-
GOBIN=$(GOLANGCI_LINT_DIR) go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1 ;\
108+
GOBIN=$(GOLANGCI_LINT_DIR) go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0 ;\
109109

110110
lint: golangci-lint ## Run golangci-lint linter
111111
$(GOLANGCI_LINT_BIN) run -n

cmd/api-docs/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func astFrom(filePath string) *doc.Package {
165165
}
166166

167167
m[filePath] = f
168-
apkg, _ := ast.NewPackage(fset, m, nil, nil) //nolint:errcheck
168+
apkg, _ := ast.NewPackage(fset, m, nil, nil) //nolint:staticcheck
169169

170170
return doc.New(apkg, "", 0)
171171
}

go.mod

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/sigstore/policy-controller
22

3-
go 1.22.6
3+
go 1.23
4+
5+
toolchain go1.23.1
46

57
require (
68
github.com/aws/aws-sdk-go v1.55.5
@@ -47,7 +49,7 @@ require (
4749
k8s.io/code-generator v0.31.0
4850
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
4951
knative.dev/hack v0.0.0-20240111013919-e89096d74d85
50-
sigs.k8s.io/release-utils v0.8.4
52+
sigs.k8s.io/release-utils v0.8.5
5153
sigs.k8s.io/yaml v1.4.0
5254
)
5355

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,8 +1333,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
13331333
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
13341334
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
13351335
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
1336-
sigs.k8s.io/release-utils v0.8.4 h1:4QVr3UgbyY/d9p74LBhg0njSVQofUsAZqYOzVZBhdBw=
1337-
sigs.k8s.io/release-utils v0.8.4/go.mod h1:m1bHfscTemQp+z+pLCZnkXih9n0+WukIUU70n6nFnU0=
1336+
sigs.k8s.io/release-utils v0.8.5 h1:FUtFqEAN621gSXv0L7kHyWruBeS7TUU9aWf76olX7uQ=
1337+
sigs.k8s.io/release-utils v0.8.5/go.mod h1:qsm5bdxdgoHkD8HsXpgme2/c3mdsNaiV53Sz2HmKeJA=
13381338
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
13391339
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
13401340
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

pkg/tuf/repo.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,10 @@ func Uncompress(src io.Reader, dst string) error {
129129
}
130130
// Write out files
131131
case tar.TypeReg:
132-
fileToWrite, err := os.OpenFile(target, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
132+
if header.Mode < 0 && int64(uint32(header.Mode)) != header.Mode { //nolint:gosec // disable G115
133+
return errors.New("invalid mode value in tar header")
134+
}
135+
fileToWrite, err := os.OpenFile(target, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode)) //nolint:gosec // disable G115
133136
if err != nil {
134137
return err
135138
}
@@ -213,9 +216,12 @@ func UncompressMemFS(src io.Reader, stripPrefix string) (fs.FS, error) {
213216
if err != nil && err != io.EOF {
214217
return nil, fmt.Errorf("reading file %s : %w", header.Name, err)
215218
}
219+
if header.Mode < 0 && int64(uint32(header.Mode)) != header.Mode { //nolint:gosec // disable G115
220+
return nil, errors.New("invalid mode value in tar header")
221+
}
216222
testFS[target] = &fstest.MapFile{
217223
Data: data,
218-
Mode: os.FileMode(header.Mode),
224+
Mode: os.FileMode(header.Mode), //nolint:gosec // disable G115
219225
ModTime: header.ModTime,
220226
}
221227
}

pkg/webhook/validator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ func ValidatePolicy(ctx context.Context, namespace string, ref name.Reference, c
517517
switch {
518518
case authority.Static != nil:
519519
if authority.Static.Action == "fail" {
520-
result.err = cosign.NewVerificationError("disallowed by static policy: " + authority.Static.Message)
520+
result.err = cosign.NewVerificationError("disallowed by static policy: %s", authority.Static.Message)
521521
results <- result
522522
return
523523
}

0 commit comments

Comments
 (0)