replace pkg errors with lib errors (#11605)

Fixes #9704

As we do want to unify error handling, so just decreprates pkg errors, use lib/errors instead for Harbor internal used errors model.

1, The lib/errors can cover all of funcs of pkg/errors, and also it has code attribute to define the http return value.
2, lib/errors can give a OCI standard error format, like {"errors":[{"code":"UNAUTHORIZED","message":"unauthorized"}]}

If you'd like to use pkg/errors, use lib/errors instead. If it cannot meet your request, enhance it.

Signed-off-by: wang yan <wangyan@vmware.com>
This commit is contained in:
Wang Yan 2020-04-15 22:41:45 +08:00 committed by GitHub
parent 205e3a969f
commit 8a0e8627ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
81 changed files with 88 additions and 84 deletions

View File

@ -11,7 +11,7 @@ import (
"time"
commonhttp "github.com/goharbor/harbor/src/common/http"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
)
const (

View File

@ -10,11 +10,11 @@ import (
"github.com/ghodss/yaml"
commonhttp "github.com/goharbor/harbor/src/common/http"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/replication"
rep_event "github.com/goharbor/harbor/src/replication/event"
"github.com/goharbor/harbor/src/replication/model"
"github.com/pkg/errors"
helm_repo "k8s.io/helm/pkg/repo"
)

View File

@ -6,7 +6,7 @@ import (
"strings"
"sync"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
"k8s.io/helm/cmd/helm/search"
"github.com/goharbor/harbor/src/core/config"

View File

@ -22,8 +22,8 @@ import (
"github.com/goharbor/harbor/src/common"
"github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/pkg/errors"
)
// ErrGroupNameDup ...

View File

@ -6,8 +6,8 @@ import (
"github.com/astaxie/beego/orm"
"github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/pkg/errors"
)
// UpdateNotificationJob update notification job

View File

@ -4,7 +4,7 @@ import (
"github.com/astaxie/beego/orm"
"github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/common/models"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
)
// GetNotificationPolicy return notification policy by id

View File

@ -21,8 +21,8 @@ import (
"github.com/astaxie/beego/orm"
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/pkg/errors"
)
var (

View File

@ -10,8 +10,8 @@ import (
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/common/utils"
"github.com/goharbor/harbor/src/core/config"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/pkg/errors"
"sync"
)

View File

@ -20,10 +20,10 @@ import (
"github.com/goharbor/harbor/src/controller/artifact"
"github.com/goharbor/harbor/src/controller/event"
"github.com/goharbor/harbor/src/controller/scan"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/lib/q"
"github.com/pkg/errors"
)
// DelArtHandler is a handler to listen to the internal delete image event.

View File

@ -26,11 +26,11 @@ import (
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/controller/scan"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/pkg/notification"
"github.com/goharbor/harbor/src/pkg/project"
v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
"github.com/pkg/errors"
)
// Handler preprocess scan artifact event

View File

@ -5,8 +5,8 @@ import (
"github.com/goharbor/harbor/src/common/models"
event2 "github.com/goharbor/harbor/src/controller/event"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/notifier/event"
"github.com/pkg/errors"
)
// QuotaMetaData defines quota related event data

View File

@ -3,9 +3,9 @@ package metadata
import (
"github.com/goharbor/harbor/src/common/models"
event2 "github.com/goharbor/harbor/src/controller/event"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/notifier/event"
v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
"github.com/pkg/errors"
"time"
)

View File

@ -20,9 +20,9 @@ import (
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/controller/artifact"
"github.com/goharbor/harbor/src/controller/repository"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/lib/q"
"github.com/pkg/errors"
)
// HandleCheckIn handles the check in data of the scan all job

View File

@ -17,13 +17,12 @@ package scanner
import (
"github.com/goharbor/harbor/src/core/promgr/metamgr"
"github.com/goharbor/harbor/src/jobservice/logger"
lerrors "github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/lib/q"
"github.com/goharbor/harbor/src/pkg/scan/dao/scanner"
v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
rscanner "github.com/goharbor/harbor/src/pkg/scan/scanner"
"github.com/pkg/errors"
)
const (
@ -67,7 +66,7 @@ func (bc *basicController) ListRegistrations(query *q.Query) ([]*scanner.Registr
// CreateRegistration ...
func (bc *basicController) CreateRegistration(registration *scanner.Registration) (string, error) {
if isReservedName(registration.Name) {
return "", lerrors.BadRequestError(nil).WithMessage(`name "%s" is reserved, please try a different name`, registration.Name)
return "", errors.BadRequestError(nil).WithMessage(`name "%s" is reserved, please try a different name`, registration.Name)
}
// Check if the registration is available
@ -121,7 +120,7 @@ func (bc *basicController) UpdateRegistration(registration *scanner.Registration
}
if isReservedName(registration.Name) {
return lerrors.BadRequestError(nil).WithMessage(`name "%s" is reserved, please try a different name`, registration.Name)
return errors.BadRequestError(nil).WithMessage(`name "%s" is reserved, please try a different name`, registration.Name)
}
return bc.manager.Update(registration)

View File

@ -28,8 +28,8 @@ import (
"github.com/goharbor/harbor/src/controller/scan"
"github.com/goharbor/harbor/src/core/api/models"
utils_core "github.com/goharbor/harbor/src/core/utils"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/pkg/errors"
)
// AJAPI manages the CRUD of admin job and its schedule, any API wants to handle manual and cron job like ScanAll and GC cloud reuse it.

View File

@ -5,7 +5,7 @@ import (
"net/http"
"testing"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/pkg/notification"

View File

@ -17,8 +17,8 @@ package api
import (
"github.com/goharbor/harbor/src/common/rbac"
"github.com/goharbor/harbor/src/controller/scanner"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/q"
"github.com/pkg/errors"
)
// ProjectScannerAPI provides rest API for managing the project level scanner(s).

View File

@ -34,11 +34,11 @@ import (
"github.com/goharbor/harbor/src/controller/event/metadata"
"github.com/goharbor/harbor/src/controller/quota"
"github.com/goharbor/harbor/src/core/config"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
evt "github.com/goharbor/harbor/src/pkg/notifier/event"
"github.com/goharbor/harbor/src/pkg/scan/vuln"
"github.com/goharbor/harbor/src/pkg/types"
"github.com/pkg/errors"
)
type deletableResp struct {

View File

@ -18,10 +18,10 @@ import (
"fmt"
"github.com/goharbor/harbor/src/controller/quota"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/q"
"github.com/goharbor/harbor/src/pkg/quota/models"
"github.com/goharbor/harbor/src/pkg/types"
"github.com/pkg/errors"
)
// QuotaUpdateRequest struct for the body of put quota API

View File

@ -22,10 +22,10 @@ import (
"github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/common/rbac"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/q"
"github.com/goharbor/harbor/src/pkg/robot"
"github.com/goharbor/harbor/src/pkg/robot/model"
"github.com/pkg/errors"
)
// RobotAPI ...

View File

@ -12,9 +12,9 @@ import (
"github.com/goharbor/harbor/src/controller/scanner"
"github.com/goharbor/harbor/src/core/api/models"
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/q"
"github.com/goharbor/harbor/src/pkg/scan/all"
"github.com/pkg/errors"
)
// ScanAllAPI handles request of scan all images...

View File

@ -28,8 +28,8 @@ import (
"github.com/goharbor/harbor/src/common/utils/oidc"
"github.com/goharbor/harbor/src/core/api"
"github.com/goharbor/harbor/src/core/config"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/pkg/errors"
)
const tokenKey = "oidc_token"

View File

@ -25,6 +25,7 @@ import (
"github.com/goharbor/harbor/src/controller/event/metadata"
"github.com/goharbor/harbor/src/controller/scan"
jjob "github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/pkg/notification"
"github.com/goharbor/harbor/src/pkg/notifier/event"
@ -33,7 +34,6 @@ import (
"github.com/goharbor/harbor/src/replication"
"github.com/goharbor/harbor/src/replication/operation/hook"
"github.com/goharbor/harbor/src/replication/policy/scheduler"
"github.com/pkg/errors"
)
var statusMap = map[string]string{

View File

@ -60,7 +60,6 @@ require (
github.com/opencontainers/go-digest v1.0.0-rc1
github.com/opencontainers/image-spec v1.0.1
github.com/opentracing/opentracing-go v1.1.0 // indirect
github.com/pkg/errors v0.9.1
github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
github.com/robfig/cron v1.0.0
github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect

View File

@ -30,7 +30,7 @@ import (
"github.com/goharbor/harbor/src/jobservice/errs"
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
"strconv"
)

View File

@ -16,7 +16,7 @@ package api
import (
"fmt"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
"net/http"
"github.com/goharbor/harbor/src/jobservice/errs"

View File

@ -5,8 +5,8 @@ import (
"time"
"github.com/goharbor/harbor/src/jobservice/common/utils"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/gomodule/redigo/redis"
"github.com/pkg/errors"
)
// ErrNoElements is a pre defined error to describe the case that no elements got

View File

@ -20,7 +20,7 @@ import (
"encoding/json"
"fmt"
"github.com/gocraft/work"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
"io"
"net"
"net/url"

View File

@ -17,7 +17,7 @@ package core
import (
"fmt"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/robfig/cron"
"github.com/goharbor/harbor/src/jobservice/common/query"

View File

@ -25,8 +25,8 @@ import (
"github.com/goharbor/harbor/src/jobservice/env"
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/gomodule/redigo/redis"
"github.com/pkg/errors"
)
const (

View File

@ -23,7 +23,7 @@ import (
"github.com/goharbor/harbor/src/jobservice/common/utils"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/jobservice/common/rds"
"github.com/goharbor/harbor/src/jobservice/job"

View File

@ -16,7 +16,7 @@ package job
import (
"github.com/goharbor/harbor/src/jobservice/common/utils"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
)
// Parameters for job execution.

View File

@ -27,8 +27,8 @@ import (
"github.com/goharbor/harbor/src/jobservice/common/utils"
"github.com/goharbor/harbor/src/jobservice/errs"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/gomodule/redigo/redis"
"github.com/pkg/errors"
)
const (

View File

@ -29,8 +29,8 @@ import (
"github.com/goharbor/harbor/src/jobservice/env"
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/gomodule/redigo/redis"
"github.com/pkg/errors"
)
const (

View File

@ -28,8 +28,8 @@ import (
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/goharbor/harbor/src/jobservice/period"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/gomodule/redigo/redis"
"github.com/pkg/errors"
)
// Manager defies the related operations to handle the management of job stats.

View File

@ -21,7 +21,7 @@ import (
"github.com/gomodule/redigo/redis"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
)
// Manager for managing the related migrators

View File

@ -25,8 +25,8 @@ import (
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/goharbor/harbor/src/jobservice/period"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/gomodule/redigo/redis"
"github.com/pkg/errors"
)
// PolicyMigrator migrate the cron job policy to new schema

View File

@ -24,8 +24,8 @@ import (
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/jobservice/lcm"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/gomodule/redigo/redis"
"github.com/pkg/errors"
)
// basicScheduler manages the periodic scheduling policies.

View File

@ -20,7 +20,7 @@ import (
"testing"
"time"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/stretchr/testify/require"
"github.com/goharbor/harbor/src/jobservice/common/rds"

View File

@ -25,7 +25,7 @@ import (
"github.com/goharbor/harbor/src/jobservice/lcm"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/goharbor/harbor/src/jobservice/period"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
)
// RedisJob is a job wrapper to wrap the job.Interface to the style which can be recognized by the redis worker.

View File

@ -41,12 +41,12 @@ import (
"github.com/goharbor/harbor/src/jobservice/migration"
"github.com/goharbor/harbor/src/jobservice/worker"
"github.com/goharbor/harbor/src/jobservice/worker/cworker"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/retention"
sc "github.com/goharbor/harbor/src/pkg/scan"
"github.com/goharbor/harbor/src/pkg/scan/all"
"github.com/goharbor/harbor/src/pkg/scheduler"
"github.com/gomodule/redigo/redis"
"github.com/pkg/errors"
)
const (

View File

@ -29,8 +29,8 @@ import (
"github.com/goharbor/harbor/src/jobservice/period"
"github.com/goharbor/harbor/src/jobservice/runner"
"github.com/goharbor/harbor/src/jobservice/worker"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/gomodule/redigo/redis"
"github.com/pkg/errors"
)
var (

View File

@ -25,8 +25,8 @@ import (
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/jobservice/lcm"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/gomodule/redigo/redis"
"github.com/pkg/errors"
)
const (

View File

@ -16,6 +16,7 @@ package errors
import (
"errors"
"fmt"
"testing"
"github.com/stretchr/testify/suite"
@ -128,6 +129,11 @@ func (suite *ErrorTestSuite) TestWithCauseMessage() {
suite.Equal("With Message: stdErr", err.Error())
}
func (suite *ErrorTestSuite) TestFormat() {
err := New("empty job ID")
suite.Equal("empty job ID", fmt.Sprintf("%s", err))
}
func (suite *ErrorTestSuite) TestWrap() {
cause := New("root")
cause = Wrap(cause, "err1")

View File

@ -20,7 +20,7 @@ import (
"fmt"
"github.com/goharbor/harbor/src/lib/log"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
)
const (

View File

@ -18,8 +18,8 @@ import (
"github.com/goharbor/harbor/src/lib/selector"
"sync"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/selector/selectors/doublestar"
"github.com/pkg/errors"
)
func init() {

View File

@ -2,10 +2,10 @@ package event
import (
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/pkg/notifier"
"github.com/goharbor/harbor/src/pkg/notifier/model"
"github.com/pkg/errors"
)
// Event to publish

View File

@ -25,11 +25,11 @@ import (
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/retention/dep"
"github.com/goharbor/harbor/src/pkg/retention/policy"
"github.com/goharbor/harbor/src/pkg/retention/policy/lwp"
"github.com/olekukonko/tablewriter"
"github.com/pkg/errors"
)
const (

View File

@ -29,6 +29,7 @@ import (
cmodels "github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/common/utils"
"github.com/goharbor/harbor/src/core/config"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
pq "github.com/goharbor/harbor/src/lib/q"
"github.com/goharbor/harbor/src/pkg/project"
@ -36,7 +37,6 @@ import (
"github.com/goharbor/harbor/src/pkg/retention/policy"
"github.com/goharbor/harbor/src/pkg/retention/policy/lwp"
"github.com/goharbor/harbor/src/pkg/retention/q"
"github.com/pkg/errors"
)
const (

View File

@ -17,8 +17,8 @@ package index
import (
"sync"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/retention/policy/action"
"github.com/pkg/errors"
)
// index for keeping the mapping action and its performer

View File

@ -21,9 +21,9 @@ import (
"testing"
"time"
"github.com/goharbor/harbor/src/lib/errors"
immumodel "github.com/goharbor/harbor/src/pkg/immutabletag/model"
"github.com/goharbor/harbor/src/pkg/retention/dep"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"

View File

@ -17,9 +17,9 @@ package index
import (
"sync"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/retention/policy/alg"
"github.com/goharbor/harbor/src/pkg/retention/policy/alg/or"
"github.com/pkg/errors"
)
const (

View File

@ -18,11 +18,11 @@ import (
"github.com/goharbor/harbor/src/lib/selector"
"sync"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/pkg/retention/policy/action"
"github.com/goharbor/harbor/src/pkg/retention/policy/alg"
"github.com/goharbor/harbor/src/pkg/retention/policy/rule"
"github.com/pkg/errors"
)
// processor to handle the rules with OR mapping ways

View File

@ -26,9 +26,9 @@ import (
"github.com/goharbor/harbor/src/pkg/retention/policy/rule/index"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/retention/policy/alg"
"github.com/goharbor/harbor/src/pkg/retention/policy/lwp"
"github.com/pkg/errors"
)
// Builder builds the runnable processor from the raw policy

View File

@ -28,7 +28,7 @@ import (
"github.com/goharbor/harbor/src/pkg/retention/dep"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/retention/policy/alg/or"

View File

@ -18,8 +18,8 @@ package lwp
import (
"encoding/json"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/retention/policy/rule"
"github.com/pkg/errors"
)
// Metadata contains partial metadata of policy

View File

@ -17,6 +17,7 @@ package index
import (
"sync"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/retention/policy/action"
"github.com/goharbor/harbor/src/pkg/retention/policy/rule"
"github.com/goharbor/harbor/src/pkg/retention/policy/rule/always"
@ -26,7 +27,6 @@ import (
"github.com/goharbor/harbor/src/pkg/retention/policy/rule/latestk"
"github.com/goharbor/harbor/src/pkg/retention/policy/rule/latestpl"
"github.com/goharbor/harbor/src/pkg/retention/policy/rule/latestps"
"github.com/pkg/errors"
)
// index for keeping the mapping between template ID and evaluator

View File

@ -5,12 +5,12 @@ import (
"github.com/dgrijalva/jwt-go"
"github.com/goharbor/harbor/src/common"
"github.com/goharbor/harbor/src/core/config"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/lib/q"
"github.com/goharbor/harbor/src/pkg/robot/model"
"github.com/goharbor/harbor/src/pkg/token"
robot_claim "github.com/goharbor/harbor/src/pkg/token/claims/robot"
"github.com/pkg/errors"
"time"
)

View File

@ -16,7 +16,7 @@ package all
import (
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
)
const (

View File

@ -21,9 +21,9 @@ import (
"github.com/astaxie/beego/orm"
"github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/lib/q"
"github.com/pkg/errors"
)
func init() {

View File

@ -19,9 +19,9 @@ import (
"github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/q"
v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"

View File

@ -20,9 +20,9 @@ import (
"strings"
"time"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/scan/rest/auth"
v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
"github.com/pkg/errors"
)
const (

View File

@ -20,9 +20,9 @@ import (
"github.com/astaxie/beego/orm"
"github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/q"
"github.com/goharbor/harbor/src/pkg/types"
"github.com/pkg/errors"
)
func init() {

View File

@ -15,11 +15,11 @@
package scan
import (
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/lib/q"
"github.com/goharbor/harbor/src/pkg/scan/dao/scanner"
sc "github.com/goharbor/harbor/src/pkg/scan/scanner"
"github.com/pkg/errors"
)
var (

View File

@ -17,10 +17,10 @@ package scan
import (
"testing"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/q"
"github.com/goharbor/harbor/src/pkg/scan/dao/scanner"
"github.com/goharbor/harbor/src/pkg/scan/scanner/mocks"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
)

View File

@ -32,11 +32,11 @@ import (
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/robot/model"
"github.com/goharbor/harbor/src/pkg/scan/dao/scanner"
"github.com/goharbor/harbor/src/pkg/scan/report"
v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
"github.com/pkg/errors"
)
const (

View File

@ -15,9 +15,9 @@
package report
import (
"github.com/goharbor/harbor/src/lib/errors"
v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
"github.com/goharbor/harbor/src/pkg/scan/vuln"
"github.com/pkg/errors"
)
// Merger is a helper function to merge report together

View File

@ -18,10 +18,10 @@ import (
"reflect"
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/scan/dao/scan"
v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
"github.com/goharbor/harbor/src/pkg/scan/vuln"
"github.com/pkg/errors"
)
// CVESet defines the CVE whitelist with a hash set way for easy query.

View File

@ -18,9 +18,9 @@ import (
"encoding/json"
"reflect"
"github.com/goharbor/harbor/src/lib/errors"
v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
"github.com/goharbor/harbor/src/pkg/scan/vuln"
"github.com/pkg/errors"
)
// SupportedMimes indicates what mime types are supported to render at UI end.

View File

@ -17,7 +17,7 @@ package auth
import (
"net/http"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
)
// apiKeyAuthorizer authorize by adding a header `X-ScannerAdapter-API-Key` with value "credential"

View File

@ -18,7 +18,7 @@ import (
"net/http"
"strings"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
)
const (

View File

@ -19,7 +19,7 @@ import (
"fmt"
"net/http"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
)
// basicAuthorizer authorizes the request by adding `Authorization Basic base64(credential)` header

View File

@ -18,7 +18,7 @@ import (
"fmt"
"net/http"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
)
// bearerAuthorizer authorizes the request by adding `Authorization Bearer credential` header

View File

@ -26,8 +26,8 @@ import (
"time"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/pkg/scan/rest/auth"
"github.com/pkg/errors"
)
const (

View File

@ -22,7 +22,7 @@ import (
"syscall"
"time"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
)
const (

View File

@ -18,7 +18,7 @@ import (
"encoding/json"
"fmt"
"github.com/pkg/errors"
"github.com/goharbor/harbor/src/lib/errors"
)
// Scanner represents metadata of a Scanner Adapter which allow Harbor to lookup a scanner capable of

View File

@ -15,10 +15,10 @@
package scanner
import (
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/q"
"github.com/goharbor/harbor/src/pkg/scan/dao/scanner"
"github.com/google/uuid"
"github.com/pkg/errors"
)
// Manager defines the related scanner API endpoints

View File

@ -25,9 +25,9 @@ import (
"github.com/goharbor/harbor/src/common/job"
"github.com/goharbor/harbor/src/common/job/models"
"github.com/goharbor/harbor/src/core/config"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/pkg/scheduler/model"
"github.com/pkg/errors"
)
// const definitions

View File

@ -22,9 +22,9 @@ import (
"net/http"
"strings"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/replication/model"
"github.com/pkg/errors"
)
func (a *adapter) FetchCharts(filters []*model.Filter) ([]*model.Resource, error) {

View File

@ -3,9 +3,9 @@ package helmhub
import (
"encoding/json"
"fmt"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/replication/model"
"github.com/goharbor/harbor/src/replication/util"
"github.com/pkg/errors"
"io/ioutil"
"net/http"
)

View File

@ -15,10 +15,10 @@
package error
import (
std_errors "errors"
openapi "github.com/go-openapi/errors"
commonhttp "github.com/goharbor/harbor/src/common/http"
"github.com/goharbor/harbor/src/lib/errors"
pkg_errors "github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"net/http"
"net/http/httptest"
@ -75,7 +75,7 @@ func TestAPIError(t *testing.T) {
assert.Contains(t, stacktrace, `error.TestAPIError`)
// common error, common error has no stacktrace
e := pkg_errors.New("customized error")
e := std_errors.New("customized error")
statusCode, payload, stacktrace = apiError(e)
assert.Equal(t, http.StatusInternalServerError, statusCode)
assert.Equal(t, `{"errors":[{"code":"UNKNOWN","message":"unknown: customized error"}]}`, payload)