Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into dependabot/go_modules/src/k8s.io/api-0.30.0

This commit is contained in:
Shengwen YU 2024-05-06 10:11:21 +08:00 committed by GitHub
parent 01eeec11c7 8431c9c30a
commit 7d5a209629
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pkg/accessory/model/accessory.go
View File

@ -77,8 +77,8 @@ const (
// TypeSubject ...
TypeSubject = "subject.accessory"
// TypeHarborSBOM identifies harbor.sbom
TypeHarborSBOM = "harbor.sbom"
// TypeHarborSBOM identifies sbom.harbor
TypeHarborSBOM = "sbom.harbor"
)
// AccessoryData ...

30
src/pkg/reg/adapter/volcenginecr/adapter_test.go
View File

@ -8,15 +8,16 @@ import (
"net/http/httptest"
"testing"
"github.com/goharbor/harbor/src/common/utils/test"
adp "github.com/goharbor/harbor/src/pkg/reg/adapter"
"github.com/goharbor/harbor/src/pkg/reg/adapter/native"
"github.com/goharbor/harbor/src/pkg/reg/model"
"github.com/stretchr/testify/assert"
volcCR "github.com/volcengine/volcengine-go-sdk/service/cr"
"github.com/volcengine/volcengine-go-sdk/volcengine"
"github.com/volcengine/volcengine-go-sdk/volcengine/credentials"
volcSession "github.com/volcengine/volcengine-go-sdk/volcengine/session"
"github.com/goharbor/harbor/src/common/utils/test"
adp "github.com/goharbor/harbor/src/pkg/reg/adapter"
"github.com/goharbor/harbor/src/pkg/reg/adapter/native"
"github.com/goharbor/harbor/src/pkg/reg/model"
)
func getMockAdapter_withoutCred(t *testing.T, hasCred, health bool) (*adapter, *httptest.Server) {
@ -94,16 +95,17 @@ func TestAdapter_NewAdapter_InvalidURL(t *testing.T) {
assert.Nil(t, adapter)
}
func TestAdapter_NewAdapter_PingFailed(t *testing.T) {
factory, _ := adp.GetFactory(model.RegistryTypeVolcCR)
adapter, err := factory.Create(&model.Registry{
Type: model.RegistryTypeVolcCR,
Credential: &model.Credential{},
URL: "https://cr-test-cn-beijing.cr.volces.com",
})
assert.Error(t, err)
assert.Nil(t, adapter)
}
// remove it because failed
// func TestAdapter_NewAdapter_PingFailed(t *testing.T) {
// factory, _ := adp.GetFactory(model.RegistryTypeVolcCR)
// adapter, err := factory.Create(&model.Registry{
// Type: model.RegistryTypeVolcCR,
// Credential: &model.Credential{},
// URL: "https://cr-test-cn-beijing.cr.volces.com",
// })
// assert.Error(t, err)
// assert.Nil(t, adapter)
// }
func TestAdapter_Info(t *testing.T) {
a, s := getMockAdapter_withoutCred(t, true, true)