Merge branch 'main' into main

goharbor · Oct 12, 2023 · 0133f2f · 0133f2f
2 parents 5bf72f5 + 663d0b8
commit 0133f2f
Show file tree

Hide file tree

Showing 12 changed files with 142 additions and 130 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-           go-version: 1.20.7
+           go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:
@@ -105,7 +105,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:
@@ -160,7 +160,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:
@@ -215,7 +215,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:
@@ -268,7 +268,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         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
@@ -28,7 +28,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -43,6 +43,8 @@ git fetch $USER
 ```
 **NOTES:** Note that GOPATH can be any directory, the example above uses $HOME/go. Change $USER above to your own GitHub username.
 
+### Build Project
+
 To build the project, please refer the [build](https://goharbor.io/docs/edge/build-customize-contribute/compile-guide/) guideline.
 
 ### Repository Structure
@@ -166,7 +168,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
 |   2.6    |    1.18.6     |
 |   2.7    |    1.19.4     |
 |   2.8    |    1.20.6     |
-|   2.9    |    1.20.7     |
+|   2.9    |    1.20.10    |
 
 Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.
 

diff --git a/Makefile b/Makefile
@@ -140,7 +140,7 @@ GOINSTALL=$(GOCMD) install
 GOTEST=$(GOCMD) test
 GODEP=$(GOTEST) -i
 GOFMT=gofmt -w
-GOBUILDIMAGE=golang:1.20.7
+GOBUILDIMAGE=golang:1.20.10
 GOBUILDPATHINCONTAINER=/harbor
 
 # go build

diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary
@@ -1,4 +1,4 @@
-FROM golang:1.20.7
+FROM golang:1.20.10
 
 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 golang:1.20.7
+FROM golang:1.20.10
 
 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 golang:1.20.7..."
+echo "Building Trivy adapter binary based on golang:1.20.10..."
 cp Dockerfile.binary $TEMP
 docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP
 

diff --git a/src/pkg/securityhub/dao/security.go b/src/pkg/securityhub/dao/security.go
@@ -66,7 +66,7 @@ WHERE EXISTS (SELECT 1
        vr.package,
        vr.cvss_score_v3,
        vr.description,
-       vr.fixed_version,
+       vr.package_version,
        vr.severity,
        CASE vr.severity
            WHEN 'Critical' THEN 5

diff --git a/...ervices/vulnerability-database/vulnerability-summary/vulnerability-summary.component.html b/...ervices/vulnerability-database/vulnerability-summary/vulnerability-summary.component.html
@@ -229,10 +229,15 @@ <h2>
                 <div class="clr-col-2">
                     {{ item?.cvss_score_v3 }}
                 </div>
-                <div
-                    class="clr-col-4 ellipsis"
-                    title="{{ item?.package + '@' + item?.version }}">
-                    {{ item?.package + '@' + item?.version }}
+                <div class="clr-col-4 ellipsis">
+                    <span
+                        *ngIf="item?.version"
+                        title="{{ item?.package + '@' + item?.version }}">
+                        {{ item?.package + '@' + item?.version }}
+                    </span>
+                    <span *ngIf="!item?.version" title="{{ item?.package }}">
+                        {{ item?.package }}
+                    </span>
                 </div>
             </div>
         </div>