Merge pull request #332 from kubernetes-sigs/dependabot/go_modules/si…

…gs.k8s.io/release-utils-0.8.0 build(deps): bump sigs.k8s.io/release-utils from 0.7.7 to 0.8.0
kubernetes-sigs · Apr 3, 2024 · 61c9758 · 61c9758
2 parents 99435ce + 364da98
commit 61c9758
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 46 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,7 +1,7 @@
 ---
 run:
   concurrency: 6
-  deadline: 5m
+  timeout: 10m
   build-tags:
     - integration
 issues:
@@ -122,38 +122,21 @@ linters-settings:
   gocritic:
     enabled-checks:
       # Diagnostic
-      - appendAssign
-      - argOrder
-      - badCall
-      - badCond
       - badLock
       - badRegexp
       - badSorting
       - builtinShadowDecl
-      - caseOrder
-      - codegenComment
       - commentedOutCode
       - deferInLoop
-      - deprecatedComment
-      - dupArg
-      - dupBranchBody
-      - dupCase
-      - dupSubExpr
       - dynamicFmtString
       - emptyDecl
       - evalOrder
-      - exitAfterDefer
       - externalErrorReassign
       - filepathJoin
-      - flagDeref
-      - flagName
-      - mapKey
       - nilValReturn
-      - offBy1
       - regexpPattern
       - returnAfterHttpError
       - sloppyReassign
-      - sloppyTypeAssert
       - sortSlice
       - sprintfQuotedString
       - sqlQuery
@@ -177,47 +160,29 @@ linters-settings:
       - stringXbytes
 
       # Style
-      - assignOp
       - boolExprSimplify
-      - captLocal
-      - commentFormatting
       - commentedOutImport
-      - defaultCaseOrder
       - deferUnlambda
       - docStub
       - dupImport
-      - elseif
       - emptyFallthrough
       - emptyStringTest
       - exposedSyncMutex
       - hexLiteral
       - httpNoBody
-      - ifElseChain
       - methodExprCall
-      - newDeref
       - octalLiteral
       - preferFilepathJoin
       - redundantSprint
-      - regexpMust
       - regexpSimplify
       - ruleguard
-      - singleCaseSwitch
-      - sloppyLen
       - stringConcatSimplify
       - stringsCompare
-      - switchTrue
-      - timeCmpSimplify
       - timeExprSimplify
       - tooManyResultsChecker
       - typeAssertChain
       - typeDefFirst
-      - typeSwitchVar
-      - underef
       - unlabelStmt
-      - unlambda
-      - unslice
-      - valSwap
-      - wrapperFunc
       - yodaStyleExpr
       # - whyNoLint
 

diff --git a/git/git.go b/git/git.go
@@ -1512,7 +1512,7 @@ func (r *Repo) FetchRemote(remoteName string) (bool, error) {
 	// git fetch outputs on stderr
 	output := strings.TrimSpace(res.Error())
 	logrus.Debugf("Fetch result: %s", output)
-	return len(output) > 0, nil
+	return output != "", nil
 }
 
 // Rebase calls rebase on the current repo to the specified branch

diff --git a/github/github.go b/github/github.go
@@ -1082,7 +1082,6 @@ func (g *GitHub) UpdateReleasePageWithOptions(owner, repo string,
 	release, err = g.Client().UpdateReleasePage(
 		context.Background(), owner, repo, releaseID, releaseData,
 	)
-
 	if err != nil {
 		return nil, fmt.Errorf("updating the release page: %w", err)
 	}

diff --git a/go.mod b/go.mod
@@ -20,7 +20,7 @@ require (
 	golang.org/x/oauth2 v0.18.0
 	k8s.io/apimachinery v0.29.3
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
-	sigs.k8s.io/release-utils v0.7.7
+	sigs.k8s.io/release-utils v0.8.0
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -994,8 +994,8 @@ k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSn
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/release-utils v0.7.7 h1:JKDOvhCk6zW8ipEOkpTGDH/mW3TI+XqtPp16aaQ79FU=
-sigs.k8s.io/release-utils v0.7.7/go.mod h1:iU7DGVNi3umZJ8q6aHyUFzsDUIaYwNnNKGHo3YE5E3s=
+sigs.k8s.io/release-utils v0.8.0 h1:iiyzoALmcPhcrA4Xkb73GHBwoyDfqkS6DItSixaeSJs=
+sigs.k8s.io/release-utils v0.8.0/go.mod h1:GWU37J2Srptpc4TvU3yllZORPf0xoH3zk4YPjbWoMtg=
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=

diff --git a/sign/sign_test.go b/sign/sign_test.go
@@ -45,7 +45,7 @@ func TestUploadBlob(t *testing.T) {
 		assert  func(error)
 	}{
 		{ // Success
-			prepare: func(mock *signfakes.FakeImpl) {
+			prepare: func(_ *signfakes.FakeImpl) {
 			},
 			assert: func(err error) {
 				require.Nil(t, err)
@@ -313,7 +313,7 @@ func TestVerifyImage(t *testing.T) {
 				mock.DigestReturns("sha256:honk69059c8e84bed02f4c4385d432808e2c8055eb5087f7fea74e286b736a", nil)
 				mock.NewWithContextReturns(&testRoundTripper{}, nil)
 			},
-			assert: func(obj *sign.SignedObject, err error) {
+			assert: func(_ *sign.SignedObject, err error) {
 				require.Nil(t, err)
 			},
 		},
@@ -528,7 +528,7 @@ func TestIsImageSigned(t *testing.T) {
 			prepare: func(mock *signfakes.FakeImpl) {
 				mock.ImagesSignedReturns(nil, errTest)
 			},
-			assert: func(signed bool, err error) {
+			assert: func(_ bool, err error) {
 				require.Error(t, err)
 			},
 		},
@@ -537,7 +537,7 @@ func TestIsImageSigned(t *testing.T) {
 				m := &sync.Map{}
 				mock.ImagesSignedReturns(m, nil)
 			},
-			assert: func(signed bool, err error) {
+			assert: func(_ bool, err error) {
 				require.Error(t, err)
 			},
 		},
@@ -547,7 +547,7 @@ func TestIsImageSigned(t *testing.T) {
 				m.Store("", 1)
 				mock.ImagesSignedReturns(m, nil)
 			},
-			assert: func(signed bool, err error) {
+			assert: func(_ bool, err error) {
 				require.Error(t, err)
 			},
 		},