chore: update golang (to 1.20.x) and golangci-linter (#1388)

Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com>
This commit is contained in:
Ramkumar Chinchani
2023-04-27 00:09:46 -07:00
committed by GitHub
parent 9cc990d7ca
commit 635d07ae04
30 changed files with 41 additions and 42 deletions
+1 -1
View File
@@ -21,7 +21,7 @@ func SetupSwaggerRoutes(conf *config.Config, router *mux.Router, authFunc mux.Mi
log log.Logger,
) {
log.Info().Msg("setting up swagger route")
// swagger swagger "/swagger/v2/index.html"
// swagger "/swagger/v2/index.html"
swgRouter := router.PathPrefix("/swagger/v2/").Subrouter()
swgRouter.Use(authFunc)
swgRouter.Methods("GET").Handler(httpSwagger.WrapHandler)
+2 -3
View File
@@ -11,15 +11,14 @@ import (
"github.com/gorilla/mux"
"zotregistry.io/zot/pkg/api/config"
"zotregistry.io/zot/pkg/log" //nolint:goimports
// as required by swaggo.
"zotregistry.io/zot/pkg/log"
_ "zotregistry.io/zot/swagger"
)
func SetupSwaggerRoutes(conf *config.Config, router *mux.Router, authFunc mux.MiddlewareFunc,
log log.Logger,
) {
// swagger swagger "/swagger/v2/index.html"
// swagger "/swagger/v2/index.html"
log.Warn().Msg("skipping enabling swagger because given zot binary " +
"doesn't include this feature, please build a binary that does so")
}
+3 -3
View File
@@ -30,7 +30,7 @@ func TestHandlers(t *testing.T) {
mockrepoDB := mocks.RepoDBMock{}
Convey("No repo in request", t, func() {
request := httptest.NewRequest("GET", UserprefsBaseURL+"", strings.NewReader("My string"))
request := httptest.NewRequest(http.MethodGet, UserprefsBaseURL+"", strings.NewReader("My string"))
response := httptest.NewRecorder()
extensions.PutStar(response, request, mockrepoDB, log)
@@ -45,7 +45,7 @@ func TestHandlers(t *testing.T) {
})
Convey("Empty repo in request", t, func() {
request := httptest.NewRequest("GET", UserprefsBaseURL+"?repo=", strings.NewReader("My string"))
request := httptest.NewRequest(http.MethodGet, UserprefsBaseURL+"?repo=", strings.NewReader("My string"))
response := httptest.NewRecorder()
extensions.PutStar(response, request, mockrepoDB, log)
@@ -60,7 +60,7 @@ func TestHandlers(t *testing.T) {
})
Convey("ToggleStarRepo different errors", t, func() {
request := httptest.NewRequest("GET", UserprefsBaseURL+"?repo=test",
request := httptest.NewRequest(http.MethodGet, UserprefsBaseURL+"?repo=test",
strings.NewReader("My string"))
Convey("ErrRepoMetaNotFound", func() {
+2 -1
View File
@@ -111,7 +111,8 @@ func generateTestData(dbDir string) error { //nolint: gocyclo
return err
}
if err = os.WriteFile(path.Join(dbDir, "zot-nonreadable-test", "index.json"), buf, 0o111); err != nil {
if err = os.WriteFile(path.Join(dbDir, "zot-nonreadable-test", "index.json"), //nolint:gosec // test code
buf, 0o111); err != nil {
return err
}
+3 -1
View File
@@ -27,7 +27,9 @@ import (
"zotregistry.io/zot/pkg/meta/repodb"
localCtx "zotregistry.io/zot/pkg/requestcontext"
"zotregistry.io/zot/pkg/storage"
) // THIS CODE IS A STARTING POINT ONLY. IT WILL NOT BE UPDATED WITH SCHEMA CHANGES.
)
// THIS CODE IS A STARTING POINT ONLY. IT WILL NOT BE UPDATED WITH SCHEMA CHANGES.
const (
querySizeLimit = 256
+1 -1
View File
@@ -14,7 +14,7 @@ const (
CosignType = "cosign"
)
// Used to model changes to an object after a call to the the DB.
// Used to model changes to an object after a call to the DB.
type ToggleState int
const (
+2 -2
View File
@@ -501,7 +501,7 @@ func RunRepoDBTests(repoDB repodb.RepoDB, preparationFuncs ...func() error) {
So(err, ShouldBeNil)
So(repoMeta.Stars, ShouldEqual, 0)
repoMeta, err = repoDB.GetRepoMeta("badRepo")
_, err = repoDB.GetRepoMeta("badRepo")
So(err, ShouldNotBeNil)
})
@@ -2663,7 +2663,7 @@ func generateTestImage() ([]byte, []byte, error) {
// init layers with random values
for i := range layers {
//nolint:gosec
_, err := rand.Read(layers[i])
_, err := rand.Read(layers[i]) //nolint:staticcheck
if err != nil {
return []byte{}, []byte{}, err
}
@@ -132,7 +132,7 @@ func toStringIfOk(cacheDriverConfig map[string]interface{}, param string, log lo
}
if str == "" {
log.Error().Msgf("parsing CacheDriver config failed, field '%s' is is empty", param)
log.Error().Msgf("parsing CacheDriver config failed, field '%s' is empty", param)
return "", false
}
-2
View File
@@ -203,7 +203,6 @@ func CheckIfIndexNeedsUpdate(index *ispec.Index, desc *ispec.Descriptor,
manifest := manifest
if reference == manifest.Digest.String() {
// nothing changed, so don't update
desc = &manifest
updateIndex = false
break
@@ -213,7 +212,6 @@ func CheckIfIndexNeedsUpdate(index *ispec.Index, desc *ispec.Descriptor,
if ok && v == reference {
if manifest.Digest.String() == desc.Digest.String() {
// nothing changed, so don't update
desc = &manifest
updateIndex = false
break
+1 -1
View File
@@ -1458,7 +1458,7 @@ func (is *ObjectStorage) getOriginalBlobFromDisk(duplicateBlobs []string) (strin
}
func (is *ObjectStorage) getOriginalBlob(digest godigest.Digest, duplicateBlobs []string) (string, error) {
originalBlob := ""
var originalBlob string
var err error
+1 -1
View File
@@ -1229,7 +1229,7 @@ func TestGenerateNotationCerts(t *testing.T) {
So(err, ShouldBeNil)
signingKeysBuf, err := json.Marshal(notconfig.SigningKeys{})
So(err, ShouldBeNil)
err = os.WriteFile(filePath, signingKeysBuf, 0o555)
err = os.WriteFile(filePath, signingKeysBuf, 0o555) //nolint:gosec // test code
So(err, ShouldBeNil)
err = test.GenerateNotationCerts(t.TempDir(), "cert")
So(err, ShouldNotBeNil)