feat: bump up golang-runtime from 1.20.7 to 1.21.7 (#20046)

* feat: bump up golang-runtime from 1.20.7 to 1.21.7 Signed-off-by: Shengwen Yu <yshengwen@vmware.com> * fix: update code to comply golangci-lint Signed-off-by: Shengwen Yu <yshengwen@vmware.com> * fix: update the mocks per the change of source code Signed-off-by: Shengwen Yu <yshengwen@vmware.com> --------- Signed-off-by: Shengwen Yu <yshengwen@vmware.com>
goharbor · Feb 29, 2024 · 7103af0 · 7103af0
1 parent 93bdcf5
commit 7103af0
Show file tree

Hide file tree

Showing 166 changed files with 374 additions and 360 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -33,10 +33,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.20
+      - name: Set up Go 1.21
         uses: actions/setup-go@v1
         with:
-           go-version: 1.20.7
+           go-version: 1.21.7
         id: go
       - uses: actions/checkout@v3
         with:
@@ -94,10 +94,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.20
+      - name: Set up Go 1.21
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.21.7
         id: go
       - uses: actions/checkout@v3
         with:
@@ -149,10 +149,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.20
+      - name: Set up Go 1.21
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.21.7
         id: go
       - uses: actions/checkout@v3
         with:
@@ -204,10 +204,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.20
+      - name: Set up Go 1.21
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.21.7
         id: go
       - uses: actions/checkout@v3
         with:
@@ -257,10 +257,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.20
+      - name: Set up Go 1.21
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.21.7
         id: go
       - uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
@@ -23,10 +23,10 @@ jobs:
         with:
           version: '430.0.0'
       - run: gcloud info
-      - name: Set up Go 1.20
+      - name: Set up Go 1.21
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.21.7
         id: go
       - name: Setup Docker
         uses: docker-practice/actions-setup-docker@master

diff --git a/.github/workflows/conformance_test.yml b/.github/workflows/conformance_test.yml
@@ -25,10 +25,10 @@ jobs:
           credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
       - uses: google-github-actions/setup-gcloud@v0
       - run: gcloud info
-      - name: Set up Go 1.20
+      - name: Set up Go 1.21
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.21.7
         id: go
       - uses: actions/checkout@v3
         with:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -145,27 +145,27 @@ The folder graph below shows the structure of the source code folder `harbor/src
 #### Go
 Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbor backend service development environment, please [set one up](https://golang.org/doc/install).
 
-|  Harbor  |  Requires Go  |
-|----------|---------------|
-|   1.1    |    1.7.3      |
-|   1.2    |    1.7.3      |
-|   1.3    |    1.9.2      |
-|   1.4    |    1.9.2      |
-|   1.5    |    1.9.2      |
-|   1.6    |    1.9.2      |
-|   1.7    |    1.9.2      |
-|   1.8    |    1.11.2     |
-|   1.9    |    1.12.12    |
-|   1.10   |    1.12.12    |
-|   2.0    |    1.13.15    |
-|   2.1    |    1.14.13    |
-|   2.2    |    1.15.6     |
-|   2.3    |    1.15.12    |
-|   2.4    |    1.17.7     |
-|   2.5    |    1.17.7     |
-|   2.6    |    1.18.6     |
-|   2.7    |    1.19.4     |
-|   2.8    |    1.20.7     |
+|  Harbor  | Requires Go |
+|----------|-------------|
+|   1.1    | 1.7.3       |
+|   1.2    | 1.7.3       |
+|   1.3    | 1.9.2       |
+|   1.4    | 1.9.2       |
+|   1.5    | 1.9.2       |
+|   1.6    | 1.9.2       |
+|   1.7    | 1.9.2       |
+|   1.8    | 1.11.2      |
+|   1.9    | 1.12.12     |
+|   1.10   | 1.12.12     |
+|   2.0    | 1.13.15     |
+|   2.1    | 1.14.13     |
+|   2.2    | 1.15.6      |
+|   2.3    | 1.15.12     |
+|   2.4    | 1.17.7      |
+|   2.5    | 1.17.7      |
+|   2.6    | 1.18.6      |
+|   2.7    | 1.19.4      |
+|   2.8    | 1.21.7      |
 
 Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.
 

diff --git a/Makefile b/Makefile
@@ -145,7 +145,7 @@ GOINSTALL=$(GOCMD) install
 GOTEST=$(GOCMD) test
 GODEP=$(GOTEST) -i
 GOFMT=gofmt -w
-GOVERSION=1.20.7
+GOVERSION=1.21.7
 GOBUILDIMAGE=goharbor/golang:$(GOVERSION)
 PUSHGOIMAGE=false
 GOBUILDPATHINCONTAINER=/harbor
@@ -510,7 +510,7 @@ misspell:
 	@find . -type d \( -path ./src/vendor -o -path ./tests \) -prune -o -name '*.go' -print | xargs misspell -error
 
 # golangci-lint binary installation or refer to https://golangci-lint.run/usage/install/#local-installation 
-# curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.51.2
+# curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.56.2
 GOLANGCI_LINT := $(shell go env GOPATH)/bin/golangci-lint
 lint:
 	@echo checking lint

diff --git a/make/photon/golang/Dockerfile b/make/photon/golang/Dockerfile
@@ -12,7 +12,7 @@ ENV GOLANG_VERSION ${GOVERSION}
 
 RUN set eux; \
     url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \
-    sha256="f0a87f1bcae91c4b69f8dc2bc6d7e6bfcd7524fceec130af525058c0c17b1b44"; \
+    sha256="13b76a9b2a26823e53062fa841b07087d48ae2ef2936445dc34c4ae03293702c"; \
     wget -O go.tgz.asc "$url.asc"; \
     wget -O go.tgz "$url"; \
     echo "$sha256 *go.tgz" | sha256sum -c -; \

diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary
@@ -1,4 +1,4 @@
-FROM goharbor/golang:1.20.7
+FROM goharbor/golang:1.21.7
 
 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
 ENV BUILDTAGS include_oss include_gcs

diff --git a/make/photon/trivy-adapter/Dockerfile.binary b/make/photon/trivy-adapter/Dockerfile.binary
@@ -1,4 +1,4 @@
-FROM goharbor/golang:1.20.7
+FROM goharbor/golang:1.21.7
 
 ADD .   /go/src/github.com/aquasecurity/harbor-scanner-trivy/
 WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/

diff --git a/make/photon/trivy-adapter/builder.sh b/make/photon/trivy-adapter/builder.sh
@@ -19,7 +19,7 @@ TEMP=$(mktemp -d ${TMPDIR-/tmp}/trivy-adapter.XXXXXX)
 git clone https://github.com/aquasecurity/harbor-scanner-trivy.git $TEMP
 cd $TEMP; git checkout $VERSION; cd -
 
-echo "Building Trivy adapter binary based on goharbor/golang:1.20.7..."
+echo "Building Trivy adapter binary based on goharbor/golang:1.21.7..."
 cp Dockerfile.binary $TEMP
 docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP
 

diff --git a/src/common/rbac/project/evaluator.go b/src/common/rbac/project/evaluator.go
@@ -58,7 +58,7 @@ func NewBuilderForUser(user *models.User, ctl project.Controller) RBACUserBuilde
 // NewBuilderForPolicies create a builder for the policies
 func NewBuilderForPolicies(username string, policies []*types.Policy,
 	filters ...func(*proModels.Project, []*types.Policy) []*types.Policy) RBACUserBuilder {
-	return func(ctx context.Context, p *proModels.Project) types.RBACUser {
+	return func(_ context.Context, p *proModels.Project) types.RBACUser {
 		for _, filter := range filters {
 			policies = filter(p, policies)
 		}

diff --git a/src/common/rbac/system/evaluator.go b/src/common/rbac/system/evaluator.go
@@ -11,7 +11,7 @@ import (
 
 // NewEvaluator create evaluator for the system
 func NewEvaluator(username string, policies []*types.Policy) evaluator.Evaluator {
-	return namespace.New(NamespaceKind, func(ctx context.Context, ns types.Namespace) evaluator.Evaluator {
+	return namespace.New(NamespaceKind, func(_ context.Context, _ types.Namespace) evaluator.Evaluator {
 		return rbac.New(&rbacUser{
 			username: username,
 			policies: policies,

diff --git a/src/common/security/secret/context.go b/src/common/security/secret/context.go
@@ -77,7 +77,7 @@ func (s *SecurityContext) IsSolutionUser() bool {
 // Can returns whether the user can do action on resource
 // returns true if the corresponding user of the secret
 // is jobservice or core service, otherwise returns false
-func (s *SecurityContext) Can(ctx context.Context, action types.Action, resource types.Resource) bool {
+func (s *SecurityContext) Can(_ context.Context, _ types.Action, _ types.Resource) bool {
 	if s.store == nil {
 		return false
 	}

diff --git a/src/common/security/v2token/context.go b/src/common/security/v2token/context.go
@@ -49,7 +49,7 @@ func (t *tokenSecurityCtx) GetMyProjects() ([]*models.Project, error) {
 	return []*models.Project{}, nil
 }
 
-func (t *tokenSecurityCtx) GetProjectRoles(projectIDOrName interface{}) []int {
+func (t *tokenSecurityCtx) GetProjectRoles(_ interface{}) []int {
 	return []int{}
 }
 

diff --git a/src/common/utils/test/registryctl.go b/src/common/utils/test/registryctl.go
@@ -30,7 +30,7 @@ type GCResult struct {
 }
 
 // NewRegistryCtl returns a mock registry server
-func NewRegistryCtl(config map[string]interface{}) (*httptest.Server, error) {
+func NewRegistryCtl(_ map[string]interface{}) (*httptest.Server, error) {
 	m := []*RequestHandlerMapping{}
 
 	gcr := GCResult{true, "hello-world", time.Now(), time.Now()}

diff --git a/src/common/utils/uaa/fake_client.go b/src/common/utils/uaa/fake_client.go
@@ -49,7 +49,7 @@ func (fc *FakeClient) GetUserInfo(token string) (*UserInfo, error) {
 }
 
 // UpdateConfig ...
-func (fc *FakeClient) UpdateConfig(cfg *ClientConfig) error {
+func (fc *FakeClient) UpdateConfig(_ *ClientConfig) error {
 	return nil
 }
 

diff --git a/src/controller/artifact/annotation/v1alpha1.go b/src/controller/artifact/annotation/v1alpha1.go
@@ -25,7 +25,7 @@ type v1alpha1Parser struct {
 	regCli reg.Client
 }
 
-func (p *v1alpha1Parser) Parse(ctx context.Context, artifact *artifact.Artifact, manifest []byte) error {
+func (p *v1alpha1Parser) Parse(_ context.Context, artifact *artifact.Artifact, manifest []byte) error {
 	if artifact.ManifestMediaType != v1.MediaTypeImageManifest && artifact.ManifestMediaType != schema2.MediaTypeManifest {
 		return nil
 	}

diff --git a/src/controller/artifact/processor/base/index.go b/src/controller/artifact/processor/base/index.go
@@ -37,22 +37,22 @@ type IndexProcessor struct {
 }
 
 // AbstractMetadata abstracts metadata of artifact
-func (m *IndexProcessor) AbstractMetadata(ctx context.Context, artifact *artifact.Artifact, content []byte) error {
+func (m *IndexProcessor) AbstractMetadata(_ context.Context, _ *artifact.Artifact, _ []byte) error {
 	return nil
 }
 
 // AbstractAddition abstracts the addition of artifact
-func (m *IndexProcessor) AbstractAddition(ctx context.Context, artifact *artifact.Artifact, addition string) (*processor.Addition, error) {
+func (m *IndexProcessor) AbstractAddition(_ context.Context, _ *artifact.Artifact, addition string) (*processor.Addition, error) {
 	return nil, errors.New(nil).WithCode(errors.BadRequestCode).
 		WithMessage("addition %s isn't supported", addition)
 }
 
 // GetArtifactType returns the artifact type
-func (m *IndexProcessor) GetArtifactType(ctx context.Context, artifact *artifact.Artifact) string {
+func (m *IndexProcessor) GetArtifactType(_ context.Context, _ *artifact.Artifact) string {
 	return ""
 }
 
 // ListAdditionTypes returns the supported addition types
-func (m *IndexProcessor) ListAdditionTypes(ctx context.Context, artifact *artifact.Artifact) []string {
+func (m *IndexProcessor) ListAdditionTypes(_ context.Context, _ *artifact.Artifact) []string {
 	return nil
 }
diff --git a/src/controller/artifact/processor/base/manifest.go b/src/controller/artifact/processor/base/manifest.go
@@ -64,23 +64,23 @@ func (m *ManifestProcessor) AbstractMetadata(ctx context.Context, artifact *arti
 }
 
 // AbstractAddition abstracts the addition of artifact
-func (m *ManifestProcessor) AbstractAddition(ctx context.Context, artifact *artifact.Artifact, addition string) (*processor.Addition, error) {
+func (m *ManifestProcessor) AbstractAddition(_ context.Context, _ *artifact.Artifact, addition string) (*processor.Addition, error) {
 	return nil, errors.New(nil).WithCode(errors.BadRequestCode).
 		WithMessage("addition %s isn't supported", addition)
 }
 
 // GetArtifactType returns the artifact type
-func (m *ManifestProcessor) GetArtifactType(ctx context.Context, artifact *artifact.Artifact) string {
+func (m *ManifestProcessor) GetArtifactType(_ context.Context, _ *artifact.Artifact) string {
 	return ""
 }
 
 // ListAdditionTypes returns the supported addition types
-func (m *ManifestProcessor) ListAdditionTypes(ctx context.Context, artifact *artifact.Artifact) []string {
+func (m *ManifestProcessor) ListAdditionTypes(_ context.Context, _ *artifact.Artifact) []string {
 	return nil
 }
 
 // UnmarshalConfig unmarshal the config blob of the artifact into the specified object "v"
-func (m *ManifestProcessor) UnmarshalConfig(ctx context.Context, repository string, manifest []byte, v interface{}) error {
+func (m *ManifestProcessor) UnmarshalConfig(_ context.Context, repository string, manifest []byte, v interface{}) error {
 	// unmarshal manifest
 	mani := &v1.Manifest{}
 	if err := json.Unmarshal(manifest, mani); err != nil {

diff --git a/src/controller/artifact/processor/chart/chart.go b/src/controller/artifact/processor/chart/chart.go
@@ -58,7 +58,7 @@ type processor struct {
 	chartOperator chart.Operator
 }
 
-func (p *processor) AbstractAddition(ctx context.Context, artifact *artifact.Artifact, addition string) (*ps.Addition, error) {
+func (p *processor) AbstractAddition(_ context.Context, artifact *artifact.Artifact, addition string) (*ps.Addition, error) {
 	if addition != AdditionTypeValues && addition != AdditionTypeReadme && addition != AdditionTypeDependencies {
 		return nil, errors.New(nil).WithCode(errors.BadRequestCode).
 			WithMessage("addition %s isn't supported for %s", addition, ArtifactTypeChart)
@@ -122,10 +122,10 @@ func (p *processor) AbstractAddition(ctx context.Context, artifact *artifact.Art
 	return nil, nil
 }
 
-func (p *processor) GetArtifactType(ctx context.Context, artifact *artifact.Artifact) string {
+func (p *processor) GetArtifactType(_ context.Context, _ *artifact.Artifact) string {
 	return ArtifactTypeChart
 }
 
-func (p *processor) ListAdditionTypes(ctx context.Context, artifact *artifact.Artifact) []string {
+func (p *processor) ListAdditionTypes(_ context.Context, _ *artifact.Artifact) []string {
 	return []string{AdditionTypeValues, AdditionTypeReadme, AdditionTypeDependencies}
 }
diff --git a/src/controller/artifact/processor/cnab/cnab.go b/src/controller/artifact/processor/cnab/cnab.go
@@ -45,7 +45,7 @@ type processor struct {
 	manifestProcessor *base.ManifestProcessor
 }
 
-func (p *processor) AbstractMetadata(ctx context.Context, art *artifact.Artifact, manifest []byte) error {
+func (p *processor) AbstractMetadata(ctx context.Context, art *artifact.Artifact, _ []byte) error {
 	cfgManiDgt := ""
 	// try to get the digest of the manifest that the config layer is referenced by
 	for _, reference := range art.References {
@@ -72,6 +72,6 @@ func (p *processor) AbstractMetadata(ctx context.Context, art *artifact.Artifact
 	return p.manifestProcessor.AbstractMetadata(ctx, art, payload)
 }
 
-func (p *processor) GetArtifactType(ctx context.Context, artifact *artifact.Artifact) string {
+func (p *processor) GetArtifactType(_ context.Context, _ *artifact.Artifact) string {
 	return ArtifactTypeCNAB
 }
diff --git a/src/controller/artifact/processor/default.go b/src/controller/artifact/processor/default.go
@@ -48,7 +48,7 @@ type defaultProcessor struct {
 	regCli registry.Client
 }
 
-func (d *defaultProcessor) GetArtifactType(ctx context.Context, artifact *artifact.Artifact) string {
+func (d *defaultProcessor) GetArtifactType(_ context.Context, artifact *artifact.Artifact) string {
 	// try to parse the type from the media type
 	strs := artifactTypeRegExp.FindStringSubmatch(artifact.MediaType)
 	if len(strs) == 2 {
@@ -57,7 +57,7 @@ func (d *defaultProcessor) GetArtifactType(ctx context.Context, artifact *artifa
 	// can not get the artifact type from the media type, return unknown
 	return ArtifactTypeUnknown
 }
-func (d *defaultProcessor) ListAdditionTypes(ctx context.Context, artifact *artifact.Artifact) []string {
+func (d *defaultProcessor) ListAdditionTypes(_ context.Context, _ *artifact.Artifact) []string {
 	return nil
 }
 
@@ -126,7 +126,7 @@ func (d *defaultProcessor) AbstractMetadata(ctx context.Context, artifact *artif
 	return nil
 }
 
-func (d *defaultProcessor) AbstractAddition(ctx context.Context, artifact *artifact.Artifact, addition string) (*Addition, error) {
+func (d *defaultProcessor) AbstractAddition(_ context.Context, artifact *artifact.Artifact, _ string) (*Addition, error) {
 	// Addition not support for user-defined artifact yet.
 	// It will be support in the future.
 	// return error directly

diff --git a/src/controller/artifact/processor/image/index.go b/src/controller/artifact/processor/image/index.go
@@ -44,6 +44,6 @@ type indexProcessor struct {
 	*base.IndexProcessor
 }
 
-func (i *indexProcessor) GetArtifactType(ctx context.Context, artifact *artifact.Artifact) string {
+func (i *indexProcessor) GetArtifactType(_ context.Context, _ *artifact.Artifact) string {
 	return ArtifactTypeImage
 }