Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-13 19:21:56 +01:00
Code Issues Projects Releases Wiki Activity

bump up astaxie/beego@v1.12.1 to beego/beego/@v1.12.7 (#16770)

Browse Source 
Signed-off-by: yminer <yminer@vmmware.com>

goo mod tidy

Signed-off-by: yminer <yminer@vmmware.com>

Co-authored-by: yminer <yminer@vmmware.com>
This commit is contained in:
MinerYang 2022-04-28 11:58:44 +08:00 committed by GitHub
parent 030c61059e
commit 083b44e719
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
269 changed files with 2362 additions and 12073 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/chartserver/cache.go
View File

@ -6,11 +6,11 @@ import (
"math"
"time"
beego_cache "github.com/astaxie/beego/cache"
beego_cache "github.com/beego/beego/cache"
hlog "github.com/goharbor/harbor/src/lib/log"
// Enable redis cache adaptor
_ "github.com/astaxie/beego/cache/redis"
_ "github.com/beego/beego/cache/redis"
)
const (

6
src/chartserver/redis_sentinel.go
View File

@ -4,14 +4,16 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/FZambia/sentinel"
"strconv"
"time"
"github.com/FZambia/sentinel"
"github.com/gomodule/redigo/redis"
"github.com/astaxie/beego/cache"
"strings"
"github.com/beego/beego/cache"
)
var (

4
src/common/api/base.go
View File

@ -22,8 +22,8 @@ import (
"net/http"
"strconv"
"github.com/astaxie/beego"
"github.com/astaxie/beego/validation"
"github.com/beego/beego"
"github.com/beego/beego/validation"
commonhttp "github.com/goharbor/harbor/src/common/http"
lib_http "github.com/goharbor/harbor/src/lib/http"
"github.com/goharbor/harbor/src/lib/log"

7
src/common/dao/base.go
View File

@ -17,12 +17,13 @@ package dao
import (
"errors"
"fmt"
proModels "github.com/goharbor/harbor/src/pkg/project/models"
userModels "github.com/goharbor/harbor/src/pkg/user/models"
"strconv"
"sync"
"github.com/astaxie/beego/orm"
proModels "github.com/goharbor/harbor/src/pkg/project/models"
userModels "github.com/goharbor/harbor/src/pkg/user/models"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/lib/log"
)

7
src/common/dao/dao_test.go
View File

@ -16,13 +16,14 @@ package dao
import (
"context"
"github.com/astaxie/beego/orm"
"os"
"testing"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/lib/log"
libOrm "github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/pkg/user"
"os"
"testing"
)
var testCtx context.Context

2
src/common/dao/mysql.go
View File

@ -18,7 +18,7 @@ import (
"fmt"
"time"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
_ "github.com/go-sql-driver/mysql" // register mysql driver
"github.com/goharbor/harbor/src/common/utils"
)

4
src/common/dao/pgsql.go
View File

@ -22,7 +22,7 @@ import (
"strconv"
"time"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/common/utils"
"github.com/goharbor/harbor/src/lib/log"
@ -96,7 +96,7 @@ func (p *pgsql) Register(alias ...string) error {
// Due to the issues of beego v1.12.1 and v1.12.2, we set the max open conns ourselves.
// See https://github.com/goharbor/harbor/issues/12403
// and https://github.com/astaxie/beego/issues/4059 for more info.
// and https://github.com/beego/beego/issues/4059 for more info.
db, _ := orm.GetDB(an)
db.SetMaxOpenConns(p.maxOpenConns)
db.SetConnMaxLifetime(5 * time.Minute)

2
src/common/dao/pgsql_test.go
View File

@ -19,7 +19,7 @@ import (
"sync"
"testing"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
)
func TestMaxOpenConns(t *testing.T) {

5
src/common/dao/resource_label.go
View File

@ -15,10 +15,11 @@
package dao
import (
"github.com/goharbor/harbor/src/common/models"
"time"
"github.com/astaxie/beego/orm"
"github.com/goharbor/harbor/src/common/models"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/pkg/label/model"
)

2
src/common/dao/sqlite.go
View File

@ -17,7 +17,7 @@ package dao
import (
"fmt"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
// _ "github.com/mattn/go-sqlite3" // register sqlite driver
)

2
src/common/models/base.go
View File

@ -15,7 +15,7 @@
package models
import (
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
)
func init() {

2
src/controller/event/handler/internal/artifact_test.go
View File

@ -19,7 +19,7 @@ import (
"testing"
"time"
beegoorm "github.com/astaxie/beego/orm"
beegoorm "github.com/beego/beego/orm"
common_dao "github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/controller/event"
"github.com/goharbor/harbor/src/lib/config"

2
src/controller/event/handler/webhook/artifact/artifact.go
View File

@ -18,7 +18,7 @@ import (
"context"
"fmt"
beegorm "github.com/astaxie/beego/orm"
beegorm "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/controller/event"
"github.com/goharbor/harbor/src/controller/event/handler/util"
"github.com/goharbor/harbor/src/controller/project"

2
src/controller/event/handler/webhook/scan/scan.go
View File

@ -18,7 +18,7 @@ import (
"context"
"time"
o "github.com/astaxie/beego/orm"
o "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/controller/artifact"
"github.com/goharbor/harbor/src/controller/event"
"github.com/goharbor/harbor/src/controller/event/handler/util"

2
src/controller/health/checker.go
View File

@ -23,7 +23,7 @@ import (
"sync"
"time"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
"github.com/docker/distribution/health"
httputil "github.com/goharbor/harbor/src/common/http"
"github.com/goharbor/harbor/src/common/utils"

5
src/core/api/chart_repository_test.go
View File

@ -3,12 +3,13 @@ package api
import (
"context"
"errors"
proModels "github.com/goharbor/harbor/src/pkg/project/models"
"net/http"
"net/http/httptest"
"testing"
bcontext "github.com/astaxie/beego/context"
proModels "github.com/goharbor/harbor/src/pkg/project/models"
bcontext "github.com/beego/beego/context"
"github.com/goharbor/harbor/src/chartserver"
projecttesting "github.com/goharbor/harbor/src/testing/controller/project"
"github.com/goharbor/harbor/src/testing/mock"

13
src/core/api/harborapi_test.go
View File

@ -17,7 +17,13 @@ package api
import (
"bytes"
"github.com/astaxie/beego"
"io/ioutil"
"net/http"
"net/http/httptest"
"path/filepath"
"runtime"
"github.com/beego/beego"
"github.com/dghubble/sling"
"github.com/goharbor/harbor/src/common/api"
"github.com/goharbor/harbor/src/common/dao"
@ -30,11 +36,6 @@ import (
"github.com/goharbor/harbor/src/server/middleware"
"github.com/goharbor/harbor/src/server/middleware/orm"
"github.com/goharbor/harbor/src/server/middleware/security"
"io/ioutil"
"net/http"
"net/http/httptest"
"path/filepath"
"runtime"
)
const (

2
src/core/api/internal.go
View File

@ -19,7 +19,7 @@ import (
"github.com/goharbor/harbor/src/lib/config"
o "github.com/astaxie/beego/orm"
o "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/common"
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/controller/quota"

2
src/core/controllers/base.go
View File

@ -20,7 +20,7 @@ import (
"os"
"strings"
"github.com/astaxie/beego"
"github.com/beego/beego"
"github.com/beego/i18n"
"github.com/goharbor/harbor/src/common"
"github.com/goharbor/harbor/src/common/models"

2
src/core/controllers/controllers_test.go
View File

@ -28,7 +28,7 @@ import (
"github.com/goharbor/harbor/src/lib/config"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/astaxie/beego"
"github.com/beego/beego"
"github.com/goharbor/harbor/src/common"
utilstest "github.com/goharbor/harbor/src/common/utils/test"
_ "github.com/goharbor/harbor/src/pkg/config/db"

2
src/core/controllers/error.go
View File

@ -15,7 +15,7 @@
package controllers
import (
"github.com/astaxie/beego"
"github.com/beego/beego"
)
// ErrorController handles beego error pages

2
src/core/main.go
View File

@ -25,7 +25,7 @@ import (
"syscall"
"time"
"github.com/astaxie/beego"
"github.com/beego/beego"
"github.com/goharbor/harbor/src/core/session"
"github.com/goharbor/harbor/src/common/dao"

2
src/core/middlewares/middlewares.go
View File

@ -18,7 +18,7 @@ import (
"net/http"
"regexp"
"github.com/astaxie/beego"
"github.com/beego/beego"
"github.com/goharbor/harbor/src/pkg/distribution"
"github.com/goharbor/harbor/src/server/middleware"
"github.com/goharbor/harbor/src/server/middleware/artifactinfo"

2
src/core/service/token/token.go
View File

@ -19,7 +19,7 @@ import (
"html/template"
"net/http"
"github.com/astaxie/beego"
"github.com/beego/beego"
"github.com/goharbor/harbor/src/lib/log"
)

2
src/core/session/codec.go
View File

@ -17,7 +17,7 @@ package session
import (
"encoding/gob"
"github.com/astaxie/beego/session"
"github.com/beego/beego/session"
commonmodels "github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/lib/cache"
"github.com/goharbor/harbor/src/lib/errors"

2
src/core/session/session.go
View File

@ -21,7 +21,7 @@ import (
"sync"
"time"
"github.com/astaxie/beego/session"
"github.com/beego/beego/session"
goredis "github.com/go-redis/redis/v8"
"github.com/goharbor/harbor/src/lib/cache"
"github.com/goharbor/harbor/src/lib/cache/redis"

2
src/core/session/session_test.go
View File

@ -17,7 +17,7 @@ package session
import (
"testing"
"github.com/astaxie/beego/session"
"github.com/beego/beego/session"
"github.com/stretchr/testify/suite"
)

5
src/go.mod
View File

@ -7,7 +7,6 @@ require (
github.com/Masterminds/semver v1.5.0
github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190726115642-cd293c93fd97
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
github.com/astaxie/beego v1.12.1
github.com/aws/aws-sdk-go v1.34.28
github.com/beego/i18n v0.0.0-20140604031826-e87155e8f0c0
github.com/bmatcuk/doublestar v1.1.1
@ -76,6 +75,8 @@ require (
k8s.io/client-go v0.22.1
)
require github.com/beego/beego v1.12.7
require (
cloud.google.com/go v0.88.0 // indirect
github.com/Azure/azure-sdk-for-go v37.2.0+incompatible // indirect
@ -122,7 +123,6 @@ require (
github.com/go-openapi/analysis v0.19.10 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-redis/redis v6.14.2+incompatible // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
@ -139,6 +139,7 @@ require (
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect

44
src/go.sum
View File

@ -121,7 +121,6 @@ github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:m
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/OwnLocal/goes v1.0.0/go.mod h1:8rIFjBGTue3lCU0wplczcUgt9Gxgrkkrw7etMIcn8TM=
github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
@ -144,6 +143,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190726115642-cd293c93fd97 h1:bNE5ID4C3YOkROfvBjXJUG53gyb+8az3TQN02LqnGBk=
github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190726115642-cd293c93fd97/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ=
github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
@ -165,8 +166,6 @@ github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:o
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/astaxie/beego v1.12.1 h1:dfpuoxpzLVgclveAXe4PyNKqkzgm5zF4tgF2B3kkM2I=
github.com/astaxie/beego v1.12.1/go.mod h1:kPBWpSANNbSdIqOc8SUL9h+1oyBMZhROeYsXQDbidWQ=
github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
@ -201,6 +200,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21
github.com/aws/smithy-go v1.7.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
github.com/beego/beego v1.12.7 h1:/fF8LlUlWVPu/X3BbTxPI0FvephyGER5KTJsU0xx2tY=
github.com/beego/beego v1.12.7/go.mod h1:QURFL1HldOcCZAxnc1cZ7wrplsYR5dKPHFjmk6WkLAs=
github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ=
github.com/beego/i18n v0.0.0-20140604031826-e87155e8f0c0 h1:fQaDnUQvBXHHQdGBu9hz8nPznB4BeiPQokvmQVjmNEw=
github.com/beego/i18n v0.0.0-20140604031826-e87155e8f0c0/go.mod h1:KLeFCpAMq2+50NkXC8iiJxLLiiTfTqrGtKEVm+2fk7s=
@ -247,7 +248,6 @@ github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@ -387,9 +387,9 @@ github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/couchbase/go-couchbase v0.0.0-20181122212707-3e9b6e1258bb/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U=
github.com/couchbase/gomemcached v0.0.0-20181122193126-5125a94a666c/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
github.com/couchbase/go-couchbase v0.0.0-20201216133707-c04035124b17/go.mod h1:+/bddYDxXsf9qt0xpDUtRR47A2GjaXmGGAqQ/k3GJ8A=
github.com/couchbase/gomemcached v0.1.2-0.20201224031647-c432ccf49f32/go.mod h1:mxliKQxOv84gQ0bJWbI+w9Wxdpt9HjDvgW9MjCym5Vo=
github.com/couchbase/goutils v0.0.0-20210118111533-e33d3ffb5401/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
@ -460,6 +460,7 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
@ -507,6 +508,7 @@ github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49P
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw=
github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
github.com/go-asn1-ber/asn1-ber v1.5.1 h1:pDbRAunXzIUXfx4CB2QJFv5IuPiuoW+sWvr/Us009o8=
@ -826,6 +828,8 @@ github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09
github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
@ -986,6 +990,7 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4=
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o=
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw=
github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6/go.mod h1:n931TsDuKuq+uX4v1fulaMbA/7ZLLhjc85h7chZGBCQ=
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@ -1039,8 +1044,9 @@ github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vq
github.com/mattn/go-shellwords v1.0.11/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
@ -1116,8 +1122,8 @@ github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba/go.mod h1:
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
@ -1135,8 +1141,8 @@ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
@ -1145,8 +1151,8 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA=
github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c=
github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@ -1186,6 +1192,7 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
@ -1195,6 +1202,7 @@ github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko
github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc=
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=
@ -1221,6 +1229,7 @@ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDf
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ=
github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
@ -1288,8 +1297,8 @@ github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhr
github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
github.com/siddontang/ledisdb v0.0.0-20181029004158-becf5f38d373/go.mod h1:mF1DpOSOUiJRMR+FDqaqu3EBqrybQtrDDszLUZ6oxPg=
github.com/siddontang/go v0.0.0-20170517070808-cb568a3e5cc0/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
github.com/siddontang/goredis v0.0.0-20150324035039-760763f78400/go.mod h1:DDcKzU3qCuvj/tPnimWSsZZzvk9qvkvrIL5naVBPh5s=
github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA=
github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
@ -1362,7 +1371,7 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69
github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I=
github.com/tencentcloud/tencentcloud-sdk-go v1.0.62 h1:Vnr3IqaafEuQUciG6D6EaeLJm26Mg8sjAfbI4OoeauM=
github.com/tencentcloud/tencentcloud-sdk-go v1.0.62/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
@ -1373,6 +1382,7 @@ github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhV
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
@ -1388,7 +1398,7 @@ github.com/vmihailenco/msgpack/v5 v5.0.0-rc.2 h1:ognci8XPlosGhIHK1OLYSpSpnlhSFeB
github.com/vmihailenco/msgpack/v5 v5.0.0-rc.2/go.mod h1:HVxBVPUK/+fZMonk4bi1islLa8V3cfnBug0+4dykPzo=
github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc=
github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
github.com/wendal/errors v0.0.0-20181209125328-7f31f4b264ec/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
@ -1414,6 +1424,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTNSBd8DVTNGHx7o/IKu9HYDvLMffDhbyLccI=
github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMztlGpl/VA+Zm1AcTPHYkHJPbHqE6WJUXE=
@ -1546,6 +1557,7 @@ golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
@ -1843,7 +1855,6 @@ golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtn
golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200117065230-39095c1d176c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
@ -2012,6 +2023,7 @@ gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=

2
src/jobservice/job/impl/context.go
View File

@ -22,7 +22,7 @@ import (
"sync"
"time"
o "github.com/astaxie/beego/orm"
o "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/jobservice/config"
"github.com/goharbor/harbor/src/jobservice/job"

3
src/jobservice/job/impl/default_context.go
View File

@ -17,7 +17,8 @@ package impl
import (
"context"
"errors"
o "github.com/astaxie/beego/orm"
o "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/jobservice/logger"
"github.com/goharbor/harbor/src/lib/orm"

2
src/jobservice/sync/schedule.go
View File

@ -19,7 +19,7 @@ import (
"fmt"
"time"
o "github.com/astaxie/beego/orm"
o "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/jobservice/env"
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/jobservice/logger"

2
src/lib/config/models/model.go
View File

@ -15,7 +15,7 @@
package models
import (
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
)
// Email ...

2
src/lib/orm/creator.go
View File

@ -14,7 +14,7 @@
package orm
import "github.com/astaxie/beego/orm"
import "github.com/beego/beego/orm"
var (
// Crt is a global instance of ORM creator

2
src/lib/orm/error.go
View File

@ -15,7 +15,7 @@
package orm
import (
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/jackc/pgconn"
)

2
src/lib/orm/error_test.go
View File

@ -17,7 +17,7 @@ package orm
import (
"testing"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/jackc/pgconn"
"github.com/stretchr/testify/assert"

2
src/lib/orm/metadata.go
View File

@ -21,7 +21,7 @@ import (
"sync"
"unicode"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/q"
)

2
src/lib/orm/metadata_test.go
View File

@ -18,7 +18,7 @@ import (
"context"
"testing"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/q"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

2
src/lib/orm/orm.go
View File

@ -23,7 +23,7 @@ import (
"strings"
"time"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/log"
tracelib "github.com/goharbor/harbor/src/lib/trace"

2
src/lib/orm/query.go
View File

@ -20,7 +20,7 @@ import (
"reflect"
"strings"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/q"
)

7
src/lib/orm/test/orm_test.go
View File

@ -17,12 +17,13 @@ package test
import (
"context"
"errors"
. "github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/lib/q"
"sync"
"testing"
"github.com/astaxie/beego/orm"
. "github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/lib/q"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/common/dao"
"github.com/stretchr/testify/suite"
)

2
src/lib/orm/tx.go
View File

@ -18,7 +18,7 @@ import (
"encoding/hex"
"fmt"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
"github.com/google/uuid"
)

5
src/migration/migration.go
View File

@ -17,13 +17,14 @@ package migration
import (
"context"
"fmt"
beegorm "github.com/astaxie/beego/orm"
"time"
beegorm "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/golang-migrate/migrate/v4"
"time"
)
const (

5
src/pkg/accessory/dao/dao_test.go
View File

@ -17,7 +17,9 @@ package dao
import (
"context"
"fmt"
beegoorm "github.com/astaxie/beego/orm"
"testing"
beegoorm "github.com/beego/beego/orm"
common_dao "github.com/goharbor/harbor/src/common/dao"
errors "github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"
@ -25,7 +27,6 @@ import (
artdao "github.com/goharbor/harbor/src/pkg/artifact/dao"
htesting "github.com/goharbor/harbor/src/testing"
"github.com/stretchr/testify/suite"
"testing"
)
type daoTestSuite struct {

3
src/pkg/accessory/dao/model.go
View File

@ -15,8 +15,9 @@
package dao
import (
"github.com/astaxie/beego/orm"
"time"
"github.com/beego/beego/orm"
)
func init() {

2
src/pkg/allowlist/dao/dao.go
View File

@ -6,7 +6,7 @@ import (
"fmt"
"time"
beegoorm "github.com/astaxie/beego/orm"
beegoorm "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/log"
"github.com/goharbor/harbor/src/lib/orm"

2
src/pkg/artifact/dao/dao.go
View File

@ -20,7 +20,7 @@ import (
"strings"
"time"
beegoorm "github.com/astaxie/beego/orm"
beegoorm "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/lib/q"

2
src/pkg/artifact/dao/dao_test.go
View File

@ -19,7 +19,7 @@ import (
"testing"
"time"
beegoorm "github.com/astaxie/beego/orm"
beegoorm "github.com/beego/beego/orm"
common_dao "github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"

2
src/pkg/artifact/dao/model.go
View File

@ -17,7 +17,7 @@ package dao
import (
"time"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/q"
)

7
src/pkg/artifactrash/dao/dao_test.go
View File

@ -2,7 +2,10 @@ package dao
import (
"context"
beegoorm "github.com/astaxie/beego/orm"
"testing"
"time"
beegoorm "github.com/beego/beego/orm"
errors "github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"
artdao "github.com/goharbor/harbor/src/pkg/artifact/dao"
@ -10,8 +13,6 @@ import (
htesting "github.com/goharbor/harbor/src/testing"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/stretchr/testify/suite"
"testing"
"time"
)
type daoTestSuite struct {

3
src/pkg/artifactrash/model/model.go
View File

@ -16,8 +16,9 @@ package model
import (
"fmt"
"github.com/astaxie/beego/orm"
"time"
"github.com/beego/beego/orm"
)
func init() {

5
src/pkg/audit/dao/dao_test.go
View File

@ -16,14 +16,15 @@ package dao
import (
"context"
beegoorm "github.com/astaxie/beego/orm"
"testing"
beegoorm "github.com/beego/beego/orm"
common_dao "github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/lib/q"
"github.com/goharbor/harbor/src/pkg/audit/model"
"github.com/stretchr/testify/suite"
"testing"
)
type daoTestSuite struct {

3
src/pkg/audit/model/model.go
View File

@ -1,8 +1,9 @@
package model
import (
beego_orm "github.com/astaxie/beego/orm"
"time"
beego_orm "github.com/beego/beego/orm"
)
func init() {

7
src/pkg/blob/models/blob.go
View File

@ -17,13 +17,14 @@ package models
import (
"context"
"fmt"
"github.com/astaxie/beego/orm"
"strings"
"time"
"github.com/beego/beego/orm"
"github.com/docker/distribution/manifest/manifestlist"
"github.com/docker/distribution/manifest/schema1"
"github.com/docker/distribution/manifest/schema2"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
"strings"
"time"
)
func init() {

2
src/pkg/immutable/dao/model/rule.go
View File

@ -1,7 +1,7 @@
package model
import (
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
)
func init() {

2
src/pkg/immutable/model/rule.go
View File

@ -1,7 +1,7 @@
package model
import (
"github.com/astaxie/beego/validation"
"github.com/beego/beego/validation"
)
// Metadata of the immutable rule

3
src/pkg/joblog/models/joblog.go
View File

@ -1,8 +1,9 @@
package models
import (
"github.com/astaxie/beego/orm"
"time"
"github.com/beego/beego/orm"
)
func init() {

5
src/pkg/label/dao/dao_test.go
View File

@ -16,7 +16,9 @@ package dao
import (
"context"
beegoorm "github.com/astaxie/beego/orm"
"testing"
beegoorm "github.com/beego/beego/orm"
common_dao "github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"
@ -25,7 +27,6 @@ import (
"github.com/goharbor/harbor/src/pkg/label/model"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/stretchr/testify/suite"
"testing"
)
type labelDaoTestSuite struct {

7
src/pkg/label/model/model.go
View File

@ -1,11 +1,12 @@
package model
import (
"github.com/goharbor/harbor/src/common"
"github.com/goharbor/harbor/src/lib/errors"
"time"
"github.com/astaxie/beego/orm"
"github.com/goharbor/harbor/src/common"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/beego/beego/orm"
)
func init() {

3
src/pkg/notification/job/model/model.go
View File

@ -1,8 +1,9 @@
package model
import (
"github.com/astaxie/beego/orm"
"time"
"github.com/beego/beego/orm"
)
func init() {

3
src/pkg/notification/policy/model/model.go
View File

@ -2,8 +2,9 @@ package model
import (
"encoding/json"
"github.com/astaxie/beego/orm"
"time"
"github.com/beego/beego/orm"
)
func init() {

2
src/pkg/p2p/preheat/dao/instance/dao.go
View File

@ -4,7 +4,7 @@ import (
"context"
"fmt"
beego_orm "github.com/astaxie/beego/orm"
beego_orm "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/lib/q"
"github.com/goharbor/harbor/src/pkg/p2p/preheat/models/provider"

2
src/pkg/p2p/preheat/dao/instance/dao_test.go
View File

@ -4,7 +4,7 @@ import (
"context"
"testing"
beego_orm "github.com/astaxie/beego/orm"
beego_orm "github.com/beego/beego/orm"
common_dao "github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"

2
src/pkg/p2p/preheat/dao/policy/dao.go
View File

@ -17,7 +17,7 @@ package policy
import (
"context"
beego_orm "github.com/astaxie/beego/orm"
beego_orm "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/lib/q"

2
src/pkg/p2p/preheat/dao/policy/dao_test.go
View File

@ -19,7 +19,7 @@ import (
"testing"
"time"
beego_orm "github.com/astaxie/beego/orm"
beego_orm "github.com/beego/beego/orm"
common_dao "github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"

4
src/pkg/p2p/preheat/models/policy/policy.go
View File

@ -20,8 +20,8 @@ import (
"strconv"
"time"
beego_orm "github.com/astaxie/beego/orm"
"github.com/astaxie/beego/validation"
beego_orm "github.com/beego/beego/orm"
"github.com/beego/beego/validation"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/q"
"github.com/robfig/cron"

2
src/pkg/p2p/preheat/models/policy/policy_test.go
View File

@ -17,7 +17,7 @@ package policy
import (
"testing"
"github.com/astaxie/beego/validation"
"github.com/beego/beego/validation"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
)

2
src/pkg/p2p/preheat/models/provider/instance.go
View File

@ -17,7 +17,7 @@ package provider
import (
"encoding/json"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/errors"
)

3
src/pkg/project/metadata/models/metadata.go
View File

@ -15,8 +15,9 @@
package models
import (
"github.com/astaxie/beego/orm"
"time"
"github.com/beego/beego/orm"
)
func init() {

2
src/pkg/quota/dao/model.go
View File

@ -17,7 +17,7 @@ package dao
import (
"time"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
)
func init() {

3
src/pkg/rbac/model/model.go
View File

@ -1,8 +1,9 @@
package model
import (
"github.com/astaxie/beego/orm"
"time"
"github.com/beego/beego/orm"
)
func init() {

2
src/pkg/reg/dao/dao_test.go
View File

@ -18,7 +18,7 @@ import (
"context"
"testing"
beegoorm "github.com/astaxie/beego/orm"
beegoorm "github.com/beego/beego/orm"
common_dao "github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"

3
src/pkg/reg/dao/model.go
View File

@ -15,8 +15,9 @@
package dao
import (
"github.com/astaxie/beego/orm"
"time"
"github.com/beego/beego/orm"
)
func init() {

2
src/pkg/replication/dao/dao_test.go
View File

@ -18,7 +18,7 @@ import (
"context"
"testing"
beegoorm "github.com/astaxie/beego/orm"
beegoorm "github.com/beego/beego/orm"
common_dao "github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"

2
src/pkg/replication/model/model.go
View File

@ -17,7 +17,7 @@ package model
import (
"time"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
)
func init() {

2
src/pkg/repository/dao/dao.go
View File

@ -18,7 +18,7 @@ import (
"context"
"time"
o "github.com/astaxie/beego/orm"
o "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/lib/q"

2
src/pkg/repository/dao/dao_test.go
View File

@ -20,7 +20,7 @@ import (
"testing"
"time"
beegoorm "github.com/astaxie/beego/orm"
beegoorm "github.com/beego/beego/orm"
common_dao "github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"

2
src/pkg/retention/dao/models/retention.go
View File

@ -3,7 +3,7 @@ package models
import (
"time"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
)
// const definitions

5
src/pkg/retention/manager.go
View File

@ -18,10 +18,11 @@ import (
"context"
"encoding/json"
"fmt"
"github.com/goharbor/harbor/src/pkg/retention/policy"
"time"
"github.com/astaxie/beego/orm"
"github.com/goharbor/harbor/src/pkg/retention/policy"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/pkg/retention/dao"
"github.com/goharbor/harbor/src/pkg/retention/dao/models"
)

2
src/pkg/retention/policy/models.go
View File

@ -15,7 +15,7 @@
package policy
import (
"github.com/astaxie/beego/validation"
"github.com/beego/beego/validation"
"github.com/goharbor/harbor/src/lib/selector/selectors/doublestar"
"github.com/goharbor/harbor/src/pkg/retention/policy/rule"
"github.com/goharbor/harbor/src/pkg/retention/policy/rule/index"

5
src/pkg/retention/policy/models_test.go
View File

@ -2,10 +2,11 @@ package policy
import (
"fmt"
"github.com/astaxie/beego/validation"
"testing"
"github.com/beego/beego/validation"
"github.com/goharbor/harbor/src/pkg/retention/policy/rule"
"github.com/stretchr/testify/require"
"testing"
)
func TestAlgorithm(t *testing.T) {

2
src/pkg/retention/policy/rule/models.go
View File

@ -15,7 +15,7 @@
package rule
import (
"github.com/astaxie/beego/validation"
"github.com/beego/beego/validation"
)
// Metadata of the retention rule

5
src/pkg/robot/model/model.go
View File

@ -2,10 +2,11 @@ package model
import (
"encoding/json"
"github.com/goharbor/harbor/src/lib/errors"
"time"
"github.com/astaxie/beego/orm"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/beego/beego/orm"
)
func init() {

2
src/pkg/scheduler/dao.go
View File

@ -18,7 +18,7 @@ import (
"context"
"time"
beegoorm "github.com/astaxie/beego/orm"
beegoorm "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/lib/q"

3
src/pkg/tag/dao/dao.go
View File

@ -16,7 +16,8 @@ package dao
import (
"context"
beego_orm "github.com/astaxie/beego/orm"
beego_orm "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/lib/q"

7
src/pkg/tag/dao/dao_test.go
View File

@ -16,7 +16,10 @@ package dao
import (
"context"
beegoorm "github.com/astaxie/beego/orm"
"testing"
"time"
beegoorm "github.com/beego/beego/orm"
common_dao "github.com/goharbor/harbor/src/common/dao"
errors "github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"
@ -24,8 +27,6 @@ import (
artdao "github.com/goharbor/harbor/src/pkg/artifact/dao"
"github.com/goharbor/harbor/src/pkg/tag/model/tag"
"github.com/stretchr/testify/suite"
"testing"
"time"
)
type daoTestSuite struct {

2
src/pkg/task/dao/model.go
View File

@ -17,7 +17,7 @@ package dao
import (
"time"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/q"
)

9
src/server/middleware/blob/head_blob_test.go
View File

@ -2,7 +2,11 @@ package blob
import (
"fmt"
beego_orm "github.com/astaxie/beego/orm"
"net/http"
"net/http/httptest"
"testing"
beego_orm "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/controller/blob"
"github.com/goharbor/harbor/src/lib"
"github.com/goharbor/harbor/src/lib/orm"
@ -10,9 +14,6 @@ import (
blob_models "github.com/goharbor/harbor/src/pkg/blob/models"
htesting "github.com/goharbor/harbor/src/testing"
"github.com/stretchr/testify/suite"
"net/http"
"net/http/httptest"
"testing"
)
type HeadBlobUploadMiddlewareTestSuite struct {

2
src/server/middleware/orm/orm.go
View File

@ -17,7 +17,7 @@ package orm
import (
"net/http"
o "github.com/astaxie/beego/orm"
o "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/server/middleware"
)

2
src/server/middleware/orm/orm_test.go
View File

@ -19,7 +19,7 @@ import (
"net/http/httptest"
"testing"
o "github.com/astaxie/beego/orm"
o "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/stretchr/testify/assert"
)

2
src/server/middleware/security/session.go
View File

@ -18,7 +18,7 @@ import (
"net/http"
"net/http/httptest"
"github.com/astaxie/beego"
"github.com/beego/beego"
"github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/common/security"
"github.com/goharbor/harbor/src/common/security/local"

11
src/server/middleware/security/session_test.go
View File

@ -15,15 +15,16 @@
package security
import (
"github.com/astaxie/beego"
beegosession "github.com/astaxie/beego/session"
"github.com/goharbor/harbor/src/common/models"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"net/http"
"net/http/httptest"
"path/filepath"
"testing"
"github.com/beego/beego"
beegosession "github.com/beego/beego/session"
"github.com/goharbor/harbor/src/common/models"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestSession(t *testing.T) {

13
src/server/middleware/session/session_test.go
View File

@ -15,16 +15,17 @@
package session
import (
"github.com/astaxie/beego"
beegosession "github.com/astaxie/beego/session"
"github.com/goharbor/harbor/src/lib"
"github.com/goharbor/harbor/src/lib/config"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"net/http"
"net/http/httptest"
"path/filepath"
"testing"
"github.com/beego/beego"
beegosession "github.com/beego/beego/session"
"github.com/goharbor/harbor/src/lib"
"github.com/goharbor/harbor/src/lib/config"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestSession(t *testing.T) {

2
src/server/middleware/transaction/transaction_test.go
View File

@ -22,7 +22,7 @@ import (
"net/http/httptest"
"testing"
o "github.com/astaxie/beego/orm"
o "github.com/beego/beego/orm"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/server/middleware"
"github.com/stretchr/testify/assert"

5
src/server/registry/manifest_test.go
View File

@ -16,12 +16,13 @@ package registry
import (
"context"
beegocontext "github.com/astaxie/beego/context"
"github.com/goharbor/harbor/src/server/router"
"net/http"
"net/http/httptest"
"testing"
beegocontext "github.com/beego/beego/context"
"github.com/goharbor/harbor/src/server/router"
"github.com/goharbor/harbor/src/controller/artifact"
"github.com/goharbor/harbor/src/controller/repository"
"github.com/goharbor/harbor/src/lib/errors"

5
src/server/route.go
View File

@ -15,10 +15,11 @@
package server
import (
"github.com/goharbor/harbor/src/lib/config"
"net/http"
"github.com/astaxie/beego"
"github.com/goharbor/harbor/src/lib/config"
"github.com/beego/beego"
"github.com/goharbor/harbor/src/common"
"github.com/goharbor/harbor/src/core/api"
"github.com/goharbor/harbor/src/core/controllers"

7
src/server/router/router.go
View File

@ -16,11 +16,12 @@ package router
import (
"context"
"github.com/astaxie/beego"
beegocontext "github.com/astaxie/beego/context"
"github.com/goharbor/harbor/src/server/middleware"
"net/http"
"path/filepath"
"github.com/beego/beego"
beegocontext "github.com/beego/beego/context"
"github.com/goharbor/harbor/src/server/middleware"
)
// ContextKeyInput ...

7
src/server/router/router_test.go
View File

@ -16,11 +16,12 @@ package router
import (
"context"
beegocontext "github.com/astaxie/beego/context"
"github.com/goharbor/harbor/src/server/middleware"
"github.com/stretchr/testify/suite"
"net/http"
"testing"
beegocontext "github.com/beego/beego/context"
"github.com/goharbor/harbor/src/server/middleware"
"github.com/stretchr/testify/suite"
)
type routerTestSuite struct {

2
src/server/v2.0/route/legacy.go
View File

@ -15,7 +15,7 @@
package route
import (
"github.com/astaxie/beego"
"github.com/beego/beego"
"github.com/goharbor/harbor/src/core/api"
"github.com/goharbor/harbor/src/lib/config"
)

2
src/testing/lib/orm/creator.go
View File

@ -3,7 +3,7 @@
package orm
import (
orm "github.com/astaxie/beego/orm"
orm "github.com/beego/beego/orm"
mock "github.com/stretchr/testify/mock"
)

Some files were not shown because too many files have changed in this diff Show More