From dcf4e2ee78ff36ff4fbda407f1cac5b308258cbd Mon Sep 17 00:00:00 2001 From: Daniel Jiang Date: Thu, 23 Aug 2018 15:02:20 +0800 Subject: [PATCH] Update import path in go code vmware -> goharbor Signed-off-by: Daniel Jiang --- .drone.yml | 2 +- .travis.yml | 4 +-- Makefile | 4 +-- make/dev/adminserver/Dockerfile | 4 +-- make/dev/jobservice/Dockerfile | 4 +-- make/dev/registryctl/Dockerfile | 4 +-- make/dev/ui/Dockerfile | 4 +-- src/adminserver/api/cfg.go | 4 +-- src/adminserver/api/cfg_test.go | 4 +-- src/adminserver/api/monitor.go | 2 +- src/adminserver/api/systeminfo.go | 4 +-- src/adminserver/api/systeminfo_test.go | 2 +- src/adminserver/auth/auth.go | 2 +- src/adminserver/auth/auth_test.go | 2 +- src/adminserver/client/client.go | 8 ++--- src/adminserver/client/client_test.go | 4 +-- src/adminserver/handlers/handler.go | 4 +-- src/adminserver/handlers/handlers_test.go | 2 +- src/adminserver/handlers/router.go | 2 +- src/adminserver/main.go | 8 ++--- src/adminserver/systemcfg/encrypt/encrypt.go | 4 +-- .../systemcfg/encrypt/encrypt_test.go | 2 +- .../systemcfg/store/database/driver_db.go | 8 ++--- .../store/database/driver_db_test.go | 4 +-- .../systemcfg/store/encrypt/driver.go | 6 ++-- .../systemcfg/store/json/driver_json.go | 4 +-- src/adminserver/systemcfg/systemcfg.go | 22 ++++++------- src/adminserver/systemcfg/systemcfg_test.go | 2 +- .../imagestorage/filesystem/driver.go | 4 +-- .../imagestorage/filesystem/driver_test.go | 2 +- src/adminserver/systeminfo/systeminfo.go | 4 +-- src/chartserver/base_test.go | 24 +++++++------- src/chartserver/cache.go | 2 +- src/chartserver/chart_operator.go | 2 +- src/chartserver/controller.go | 2 +- src/chartserver/manipulation_handler.go | 2 +- src/chartserver/repo_handler.go | 4 +-- src/common/api/base.go | 4 +-- src/common/config/config.go | 4 +-- src/common/dao/accesslog.go | 4 +-- src/common/dao/admin_job.go | 4 +-- src/common/dao/admin_job_test.go | 2 +- src/common/dao/base.go | 4 +-- src/common/dao/clair.go | 4 +-- src/common/dao/clair/base.go | 2 +- src/common/dao/config.go | 2 +- src/common/dao/config_test.go | 2 +- src/common/dao/dao_test.go | 8 ++--- src/common/dao/group/usergroup.go | 8 ++--- src/common/dao/group/usergroup_test.go | 10 +++--- src/common/dao/label.go | 2 +- src/common/dao/label_test.go | 4 +-- src/common/dao/mysql.go | 2 +- src/common/dao/pgsql.go | 4 +-- src/common/dao/pro_meta.go | 2 +- src/common/dao/pro_meta_test.go | 2 +- src/common/dao/project.go | 6 ++-- src/common/dao/project/projectmember.go | 6 ++-- src/common/dao/project/projectmember_test.go | 14 ++++---- src/common/dao/project_test.go | 2 +- src/common/dao/register.go | 4 +-- src/common/dao/replication_job.go | 4 +-- src/common/dao/repository.go | 2 +- src/common/dao/repository_test.go | 4 +-- src/common/dao/resource_label.go | 2 +- src/common/dao/resource_label_test.go | 4 +-- src/common/dao/role.go | 2 +- src/common/dao/scan_job.go | 4 +-- src/common/dao/testutils.go | 4 +-- src/common/dao/user.go | 6 ++-- src/common/dao/user_test.go | 2 +- src/common/dao/version.go | 2 +- src/common/dao/watch_item.go | 2 +- src/common/dao/watch_item_test.go | 2 +- src/common/http/client.go | 2 +- src/common/http/modifier/auth/auth.go | 4 +-- src/common/http/modifier/auth/auth_test.go | 2 +- src/common/job/client.go | 6 ++-- src/common/job/client_test.go | 4 +-- src/common/job/test/server.go | 2 +- src/common/models/label.go | 2 +- src/common/models/replication_job.go | 2 +- src/common/notifier/config_watcher.go | 4 +-- src/common/notifier/notifier.go | 2 +- src/common/notifier/notifier_test.go | 2 +- .../scan_policy_notitification_handler.go | 6 ++-- ...scan_policy_notitification_handler_test.go | 4 +-- src/common/notifier/topics.go | 2 +- src/common/registryctl/client.go | 6 ++-- .../scheduler/policy/alternate_policy.go | 4 +-- src/common/scheduler/policy/policy.go | 2 +- src/common/scheduler/scheduler.go | 4 +-- src/common/scheduler/scheduler_test.go | 4 +-- .../task/replication/replication_task.go | 6 ++-- src/common/scheduler/task/scan_all_task.go | 2 +- src/common/scheduler/watcher.go | 6 ++-- .../admiral/authcontext/authcontext.go | 10 +++--- src/common/security/admiral/context.go | 10 +++--- src/common/security/context.go | 2 +- src/common/security/local/context.go | 12 +++---- src/common/security/local/context_test.go | 14 ++++---- src/common/security/secret/context.go | 8 ++--- src/common/security/secret/context_test.go | 4 +-- src/common/utils/clair/client.go | 4 +-- src/common/utils/clair/client_test.go | 4 +-- src/common/utils/clair/test/server.go | 4 +-- src/common/utils/clair/utils.go | 6 ++-- src/common/utils/clair/utils_test.go | 2 +- src/common/utils/email/mail.go | 2 +- src/common/utils/ldap/ldap.go | 6 ++-- src/common/utils/ldap/ldap_test.go | 12 +++---- src/common/utils/notary/helper.go | 8 ++--- src/common/utils/notary/helper_test.go | 8 ++--- src/common/utils/registry/auth/credential.go | 4 +-- src/common/utils/registry/auth/path.go | 2 +- .../utils/registry/auth/tokenauthorizer.go | 8 ++--- .../registry/auth/tokenauthorizer_test.go | 4 +-- src/common/utils/registry/auth/util.go | 6 ++-- src/common/utils/registry/registry.go | 4 +-- src/common/utils/registry/registry_test.go | 2 +- src/common/utils/registry/repository.go | 4 +-- src/common/utils/registry/repository_test.go | 4 +-- src/common/utils/registry/transport.go | 4 +-- src/common/utils/registry/transport_test.go | 2 +- src/common/utils/test/adminserver.go | 4 +-- src/common/utils/test/database.go | 6 ++-- src/common/utils/test/policy_manager.go | 4 +-- src/common/utils/test/watch_item.go | 2 +- src/common/utils/uaa/client.go | 2 +- src/common/utils/uaa/client_test.go | 2 +- src/common/utils/utils.go | 2 +- src/jobservice/api/authenticator.go | 4 +-- src/jobservice/api/handler.go | 8 ++--- src/jobservice/api/handler_test.go | 4 +-- src/jobservice/api/router.go | 2 +- src/jobservice/api/server.go | 6 ++-- src/jobservice/config/config.go | 2 +- src/jobservice/core/controller.go | 12 +++---- src/jobservice/core/controller_test.go | 6 ++-- src/jobservice/core/interface.go | 2 +- src/jobservice/env/job_context.go | 2 +- src/jobservice/job/impl/context.go | 18 +++++------ src/jobservice/job/impl/demo_job.go | 10 +++--- src/jobservice/job/impl/gc/job.go | 16 +++++----- src/jobservice/job/impl/logger/job_logger.go | 4 +-- .../job/impl/logger/service_logger.go | 2 +- src/jobservice/job/impl/replication/delete.go | 8 ++--- .../job/impl/replication/registry.go | 6 ++-- .../job/impl/replication/replicate.go | 10 +++--- .../job/impl/replication/transfer.go | 18 +++++------ src/jobservice/job/impl/scan/job.go | 16 +++++----- src/jobservice/job/impl/utils/utils.go | 6 ++-- src/jobservice/job/interface.go | 2 +- src/jobservice/main.go | 16 +++++----- src/jobservice/opm/hook_client.go | 4 +-- src/jobservice/opm/hook_client_test.go | 2 +- src/jobservice/opm/hook_store.go | 2 +- src/jobservice/opm/job_stats_mgr.go | 2 +- src/jobservice/opm/op_commands.go | 6 ++-- src/jobservice/opm/redis_job_stats_mgr.go | 10 +++--- .../opm/redis_job_stats_mgr_test.go | 6 ++-- src/jobservice/period/enqueuer.go | 6 ++-- src/jobservice/period/enqueuer_test.go | 4 +-- src/jobservice/period/interface.go | 2 +- src/jobservice/period/job_policy.go | 2 +- src/jobservice/period/redis_scheduler.go | 10 +++--- src/jobservice/period/redis_scheduler_test.go | 6 ++-- src/jobservice/period/sweeper.go | 4 +-- src/jobservice/period/sweeper_test.go | 4 +-- src/jobservice/pool/interface.go | 2 +- src/jobservice/pool/message_server.go | 10 +++--- src/jobservice/pool/message_server_test.go | 10 +++--- src/jobservice/pool/redis_job_wrapper.go | 10 +++--- src/jobservice/pool/redis_pool.go | 14 ++++---- src/jobservice/pool/redis_pool_test.go | 12 +++---- src/jobservice/pool/runner.go | 2 +- src/jobservice/runtime/bootstrap.go | 22 ++++++------- src/registryctl/api/health.go | 2 +- src/registryctl/api/registry.go | 2 +- src/registryctl/auth/secret.go | 2 +- src/registryctl/auth/secret_test.go | 2 +- src/registryctl/client/client.go | 10 +++--- src/registryctl/client/client_test.go | 2 +- src/registryctl/handlers/handler.go | 4 +-- src/registryctl/handlers/handler_test.go | 2 +- src/registryctl/handlers/router.go | 2 +- src/registryctl/main.go | 6 ++-- src/replication/core/controller.go | 20 ++++++------ src/replication/core/controller_test.go | 12 +++---- src/replication/event/init.go | 6 ++-- src/replication/event/on_deletion_handler.go | 4 +-- .../event/on_deletion_handler_test.go | 6 ++-- src/replication/event/on_push_handler.go | 18 +++++------ src/replication/event/on_push_handler_test.go | 6 ++-- .../event/start_replication_handler.go | 4 +-- .../event/start_replication_handler_test.go | 6 ++-- src/replication/models/filter.go | 2 +- src/replication/models/filter_test.go | 2 +- src/replication/models/trigger.go | 2 +- src/replication/models/trigger_test.go | 2 +- src/replication/policy/manager.go | 10 +++--- src/replication/policy/manager_test.go | 2 +- src/replication/registry/adaptor.go | 2 +- src/replication/registry/harbor_adaptor.go | 12 +++---- src/replication/replicator/replicator.go | 14 ++++---- src/replication/source/convertor.go | 2 +- .../source/default_filter_chain.go | 2 +- .../source/default_filter_chain_test.go | 4 +-- src/replication/source/filter.go | 2 +- src/replication/source/filter_chain.go | 2 +- src/replication/source/label_filter.go | 10 +++--- src/replication/source/label_filter_test.go | 6 ++-- src/replication/source/pattern_filter.go | 4 +-- src/replication/source/pattern_filter_test.go | 4 +-- .../source/repository_convertor.go | 6 ++-- .../source/repository_convertor_test.go | 4 +-- src/replication/source/repository_filter.go | 10 +++--- .../source/repository_filter_test.go | 6 ++-- src/replication/source/sourcer.go | 4 +-- src/replication/source/sourcer_test.go | 2 +- .../source/tag_combination_filter.go | 6 ++-- .../source/tag_combination_filter_test.go | 4 +-- src/replication/source/tag_convertor.go | 6 ++-- src/replication/source/tag_convertor_test.go | 4 +-- src/replication/source/tag_filter.go | 8 ++--- src/replication/source/tag_filter_test.go | 6 ++-- src/replication/target/target.go | 8 ++--- src/replication/trigger/immediate.go | 2 +- src/replication/trigger/immediate_test.go | 6 ++-- src/replication/trigger/manager.go | 6 ++-- src/replication/trigger/manager_test.go | 8 ++--- src/replication/trigger/schedule.go | 20 ++++++------ src/replication/trigger/schedule_test.go | 2 +- src/replication/trigger/watch_list.go | 4 +-- src/replication/trigger/watch_list_test.go | 4 +-- src/ui/api/api_test.go | 10 +++--- src/ui/api/base.go | 12 +++---- src/ui/api/chart_repository.go | 6 ++-- src/ui/api/chart_repository_test.go | 4 +-- src/ui/api/config.go | 10 +++--- src/ui/api/config_test.go | 4 +-- src/ui/api/dataprepare_test.go | 4 +-- src/ui/api/email.go | 6 ++-- src/ui/api/harborapi_test.go | 24 +++++++------- src/ui/api/internal.go | 8 ++--- src/ui/api/label.go | 12 +++---- src/ui/api/label_test.go | 10 +++--- src/ui/api/ldap.go | 8 ++--- src/ui/api/ldap_test.go | 2 +- src/ui/api/log.go | 6 ++-- src/ui/api/log_test.go | 4 +-- src/ui/api/metadata.go | 6 ++-- src/ui/api/metadata_test.go | 2 +- src/ui/api/models/reg_gc.go | 10 +++--- src/ui/api/models/reg_gc_test.go | 6 ++-- src/ui/api/models/replication_policy.go | 4 +-- src/ui/api/project.go | 14 ++++---- src/ui/api/project_test.go | 8 ++--- src/ui/api/projectmember.go | 10 +++--- src/ui/api/projectmember_test.go | 6 ++-- src/ui/api/reg_gc.go | 14 ++++---- src/ui/api/reg_gc_test.go | 2 +- src/ui/api/replication.go | 16 +++++----- src/ui/api/replication_job.go | 16 +++++----- src/ui/api/replication_policy.go | 16 +++++----- src/ui/api/replication_policy_test.go | 14 ++++---- src/ui/api/replication_test.go | 8 ++--- src/ui/api/repository.go | 28 ++++++++-------- src/ui/api/repository_label.go | 10 +++--- src/ui/api/repository_label_test.go | 6 ++-- src/ui/api/repository_test.go | 6 ++-- src/ui/api/scan_job.go | 8 ++--- src/ui/api/search.go | 12 +++---- src/ui/api/search_test.go | 8 ++--- src/ui/api/statistic.go | 6 ++-- src/ui/api/statistic_test.go | 2 +- src/ui/api/systeminfo.go | 16 +++++----- src/ui/api/target.go | 14 ++++---- src/ui/api/target_test.go | 2 +- src/ui/api/user.go | 12 +++---- src/ui/api/user_test.go | 8 ++--- src/ui/api/usergroup.go | 12 +++---- src/ui/api/usergroup_test.go | 6 ++-- src/ui/api/utils.go | 26 +++++++-------- src/ui/auth/auth_test.go | 4 +-- src/ui/auth/authenticator.go | 10 +++--- src/ui/auth/db/db.go | 6 ++-- src/ui/auth/db/db_test.go | 14 ++++---- src/ui/auth/ldap/ldap.go | 16 +++++----- src/ui/auth/ldap/ldap_test.go | 18 +++++------ src/ui/auth/uaa/uaa.go | 14 ++++---- src/ui/auth/uaa/uaa_test.go | 12 +++---- src/ui/config/config.go | 22 ++++++------- src/ui/config/config_test.go | 4 +-- src/ui/controllers/base.go | 16 +++++----- src/ui/controllers/controllers_test.go | 12 +++---- src/ui/controllers/index.go | 2 +- src/ui/controllers/proxy.go | 2 +- src/ui/filter/mediatype.go | 2 +- src/ui/filter/readonly.go | 4 +-- src/ui/filter/readonly_test.go | 6 ++-- src/ui/filter/security.go | 24 +++++++------- src/ui/filter/security_test.go | 22 ++++++------- src/ui/main.go | 32 +++++++++---------- src/ui/promgr/metamgr/metamgr.go | 4 +-- src/ui/promgr/metamgr/metamgr_test.go | 4 +-- src/ui/promgr/pmsdriver/admiral/admiral.go | 10 +++--- .../promgr/pmsdriver/admiral/admiral_test.go | 4 +-- src/ui/promgr/pmsdriver/driver.go | 2 +- src/ui/promgr/pmsdriver/local/local.go | 14 ++++---- src/ui/promgr/pmsdriver/local/local_test.go | 6 ++-- src/ui/promgr/promgr.go | 8 ++--- src/ui/promgr/promgr_test.go | 4 +-- src/ui/proxy/interceptor_test.go | 14 ++++---- src/ui/proxy/interceptors.go | 16 +++++----- src/ui/proxy/proxy.go | 2 +- src/ui/router.go | 16 +++++----- src/ui/service/notifications/admin/handler.go | 12 +++---- src/ui/service/notifications/clair/handler.go | 14 ++++---- src/ui/service/notifications/jobs/handler.go | 12 +++---- .../service/notifications/registry/handler.go | 22 ++++++------- src/ui/service/token/authutils.go | 10 +++--- src/ui/service/token/creator.go | 12 +++---- src/ui/service/token/token.go | 2 +- src/ui/service/token/token_test.go | 6 ++-- src/ui/utils/job.go | 14 ++++---- src/ui/utils/response_handlers.go | 4 +-- src/ui/utils/utils.go | 8 ++--- .../apitests/api-testing/envs/environment.go | 2 +- tests/apitests/api-testing/lib/image.go | 4 +-- tests/apitests/api-testing/lib/project.go | 4 +-- tests/apitests/api-testing/lib/system.go | 4 +-- tests/apitests/api-testing/lib/user.go | 4 +-- .../api-testing/tests/suites/base/suite.go | 4 +-- .../api-testing/tests/suites/suite.go | 4 +-- .../tests/suites/suite01/run_test.go | 2 +- .../api-testing/tests/suites/suite01/suite.go | 6 ++-- .../tests/suites/suite02/run_test.go | 2 +- .../api-testing/tests/suites/suite02/suite.go | 6 ++-- tests/apitests/apilib/search.go | 2 +- tests/coverage4gotest.sh | 2 +- 341 files changed, 1104 insertions(+), 1104 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7bec1717e..6df258f38 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ workspace: base: /drone - path: src/github.com/vmware/harbor + path: src/github.com/goharbor/harbor clone: git: diff --git a/.travis.yml b/.travis.yml index ecdcd26e7..9f44e589c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: go go: - 1.9.2 -go_import_path: github.com/vmware/harbor +go_import_path: github.com/goharbor/harbor services: - docker @@ -99,7 +99,7 @@ script: - sudo ./admiral.sh - cd .. - go test -race -i ./src/ui ./src/adminserver ./src/jobservice - - sudo -E env "PATH=$PATH" "POSTGRES_MIGRATION_SCRIPTS_PATH=/home/travis/gopath/src/github.com/vmware/harbor/make/migrations/postgresql/" ./tests/coverage4gotest.sh + - sudo -E env "PATH=$PATH" "POSTGRES_MIGRATION_SCRIPTS_PATH=/home/travis/gopath/src/github.com/goharbor/harbor/make/migrations/postgresql/" ./tests/coverage4gotest.sh - goveralls -coverprofile=profile.cov -service=travis-ci - docker-compose -f make/docker-compose.test.yml down - ls /data/cert diff --git a/Makefile b/Makefile index c4644fbc4..9a5a9ddba 100644 --- a/Makefile +++ b/Makefile @@ -69,12 +69,12 @@ SRCPATH=./src TOOLSPATH=$(BUILDPATH)/tools UIPATH=$(BUILDPATH)/src/ui UINGPATH=$(BUILDPATH)/src/ui_ng -GOBASEPATH=/go/src/github.com/vmware +GOBASEPATH=/go/src/github.com/goharbor CHECKENVCMD=checkenv.sh # parameters REGISTRYSERVER= -REGISTRYPROJECTNAME=vmware +REGISTRYPROJECTNAME=goharbor DEVFLAG=true NOTARYFLAG=false CLAIRFLAG=false diff --git a/make/dev/adminserver/Dockerfile b/make/dev/adminserver/Dockerfile index 5591b6415..20238f8a3 100644 --- a/make/dev/adminserver/Dockerfile +++ b/make/dev/adminserver/Dockerfile @@ -2,9 +2,9 @@ FROM golang:1.9.2 MAINTAINER yinw@vmware.com -COPY . /go/src/github.com/vmware/harbor +COPY . /go/src/github.com/goharbor/harbor -WORKDIR /go/src/github.com/vmware/harbor/src/adminserver +WORKDIR /go/src/github.com/goharbor/harbor/src/adminserver RUN go build -a -o /go/bin/harbor_adminserver \ && chmod u+x /go/bin/harbor_adminserver diff --git a/make/dev/jobservice/Dockerfile b/make/dev/jobservice/Dockerfile index dc76a88bb..62b8a8c8c 100644 --- a/make/dev/jobservice/Dockerfile +++ b/make/dev/jobservice/Dockerfile @@ -2,9 +2,9 @@ FROM golang:1.9.2 MAINTAINER jiangd@vmware.com -COPY . /go/src/github.com/vmware/harbor +COPY . /go/src/github.com/goharbor/harbor -WORKDIR /go/src/github.com/vmware/harbor/src/jobservice +WORKDIR /go/src/github.com/goharbor/harbor/src/jobservice RUN go build -a -o /go/bin/harbor_jobservice \ && chmod u+x /go/bin/harbor_jobservice diff --git a/make/dev/registryctl/Dockerfile b/make/dev/registryctl/Dockerfile index 84fd27304..69875a9b7 100644 --- a/make/dev/registryctl/Dockerfile +++ b/make/dev/registryctl/Dockerfile @@ -2,9 +2,9 @@ FROM golang:1.9.2 MAINTAINER wangyan@vmware.com -COPY . /go/src/github.com/vmware/harbor +COPY . /go/src/github.com/goharbor/harbor -WORKDIR /go/src/github.com/vmware/harbor/src/registryctl +WORKDIR /go/src/github.com/goharbor/harbor/src/registryctl RUN go build -a -o /go/bin/harbor_registryctl \ && chmod u+x /go/bin/harbor_registryctl diff --git a/make/dev/ui/Dockerfile b/make/dev/ui/Dockerfile index ac4978ef1..42ee5ec41 100644 --- a/make/dev/ui/Dockerfile +++ b/make/dev/ui/Dockerfile @@ -2,8 +2,8 @@ FROM golang:1.9.2 MAINTAINER jiangd@vmware.com -COPY src/. /go/src/github.com/vmware/harbor/src -WORKDIR /go/src/github.com/vmware/harbor/src/ui +COPY src/. /go/src/github.com/goharbor/harbor/src +WORKDIR /go/src/github.com/goharbor/harbor/src/ui RUN go build -a -o /go/bin/harbor_ui diff --git a/src/adminserver/api/cfg.go b/src/adminserver/api/cfg.go index e18b0081e..3281cf036 100644 --- a/src/adminserver/api/cfg.go +++ b/src/adminserver/api/cfg.go @@ -19,8 +19,8 @@ import ( "io/ioutil" "net/http" - "github.com/vmware/harbor/src/adminserver/systemcfg" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/adminserver/systemcfg" + "github.com/goharbor/harbor/src/common/utils/log" ) // ListCfgs lists configurations diff --git a/src/adminserver/api/cfg_test.go b/src/adminserver/api/cfg_test.go index fb141d7f7..1b0c7bfbd 100644 --- a/src/adminserver/api/cfg_test.go +++ b/src/adminserver/api/cfg_test.go @@ -27,8 +27,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/adminserver/systemcfg" - "github.com/vmware/harbor/src/common" + "github.com/goharbor/harbor/src/adminserver/systemcfg" + "github.com/goharbor/harbor/src/common" ) type fakeCfgStore struct { diff --git a/src/adminserver/api/monitor.go b/src/adminserver/api/monitor.go index fa37f325d..fdb090aaf 100644 --- a/src/adminserver/api/monitor.go +++ b/src/adminserver/api/monitor.go @@ -2,7 +2,7 @@ package api import ( "net/http" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/log" ) // Ping monitor the server status diff --git a/src/adminserver/api/systeminfo.go b/src/adminserver/api/systeminfo.go index ca7f804d0..b442bbb87 100644 --- a/src/adminserver/api/systeminfo.go +++ b/src/adminserver/api/systeminfo.go @@ -17,8 +17,8 @@ package api import ( "net/http" - "github.com/vmware/harbor/src/adminserver/systeminfo/imagestorage" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/adminserver/systeminfo/imagestorage" + "github.com/goharbor/harbor/src/common/utils/log" ) // Capacity handles /api/systeminfo/capacity and returns system capacity diff --git a/src/adminserver/api/systeminfo_test.go b/src/adminserver/api/systeminfo_test.go index 41817a082..228f77160 100644 --- a/src/adminserver/api/systeminfo_test.go +++ b/src/adminserver/api/systeminfo_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/adminserver/systeminfo/imagestorage" + "github.com/goharbor/harbor/src/adminserver/systeminfo/imagestorage" ) type fakeImageStorageDriver struct { diff --git a/src/adminserver/auth/auth.go b/src/adminserver/auth/auth.go index 140cac559..ca6e7b133 100644 --- a/src/adminserver/auth/auth.go +++ b/src/adminserver/auth/auth.go @@ -15,7 +15,7 @@ package auth import ( - "github.com/vmware/harbor/src/common/secret" + "github.com/goharbor/harbor/src/common/secret" "net/http" ) diff --git a/src/adminserver/auth/auth_test.go b/src/adminserver/auth/auth_test.go index fb633dfb5..2e090ef1f 100644 --- a/src/adminserver/auth/auth_test.go +++ b/src/adminserver/auth/auth_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - commonsecret "github.com/vmware/harbor/src/common/secret" + commonsecret "github.com/goharbor/harbor/src/common/secret" ) func TestAuthenticate(t *testing.T) { diff --git a/src/adminserver/client/client.go b/src/adminserver/client/client.go index 115e903b6..54cb32a4b 100644 --- a/src/adminserver/client/client.go +++ b/src/adminserver/client/client.go @@ -17,10 +17,10 @@ package client import ( "strings" - "github.com/vmware/harbor/src/adminserver/systeminfo/imagestorage" - "github.com/vmware/harbor/src/common/http" - "github.com/vmware/harbor/src/common/http/modifier/auth" - "github.com/vmware/harbor/src/common/utils" + "github.com/goharbor/harbor/src/adminserver/systeminfo/imagestorage" + "github.com/goharbor/harbor/src/common/http" + "github.com/goharbor/harbor/src/common/http/modifier/auth" + "github.com/goharbor/harbor/src/common/utils" ) // Client defines methods that an Adminserver client should implement diff --git a/src/adminserver/client/client_test.go b/src/adminserver/client/client_test.go index 59d407a34..f3bede97d 100644 --- a/src/adminserver/client/client_test.go +++ b/src/adminserver/client/client_test.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/utils/test" ) var c Client diff --git a/src/adminserver/handlers/handler.go b/src/adminserver/handlers/handler.go index b071f40f4..80c3a7e92 100644 --- a/src/adminserver/handlers/handler.go +++ b/src/adminserver/handlers/handler.go @@ -19,8 +19,8 @@ import ( "os" gorilla_handlers "github.com/gorilla/handlers" - "github.com/vmware/harbor/src/adminserver/auth" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/adminserver/auth" + "github.com/goharbor/harbor/src/common/utils/log" ) // NewHandler returns a gorilla router which is wrapped by authenticate handler diff --git a/src/adminserver/handlers/handlers_test.go b/src/adminserver/handlers/handlers_test.go index af273bb88..b803abbd6 100644 --- a/src/adminserver/handlers/handlers_test.go +++ b/src/adminserver/handlers/handlers_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/adminserver/auth" + "github.com/goharbor/harbor/src/adminserver/auth" ) type fakeAuthenticator struct { diff --git a/src/adminserver/handlers/router.go b/src/adminserver/handlers/router.go index df11e8ac2..3a32d8834 100644 --- a/src/adminserver/handlers/router.go +++ b/src/adminserver/handlers/router.go @@ -18,7 +18,7 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/vmware/harbor/src/adminserver/api" + "github.com/goharbor/harbor/src/adminserver/api" ) func newRouter() http.Handler { diff --git a/src/adminserver/main.go b/src/adminserver/main.go index 0df838db1..b6b71e867 100644 --- a/src/adminserver/main.go +++ b/src/adminserver/main.go @@ -18,10 +18,10 @@ import ( "net/http" "os" - "github.com/vmware/harbor/src/adminserver/handlers" - syscfg "github.com/vmware/harbor/src/adminserver/systemcfg" - sysinfo "github.com/vmware/harbor/src/adminserver/systeminfo" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/adminserver/handlers" + syscfg "github.com/goharbor/harbor/src/adminserver/systemcfg" + sysinfo "github.com/goharbor/harbor/src/adminserver/systeminfo" + "github.com/goharbor/harbor/src/common/utils/log" ) // Server for admin component diff --git a/src/adminserver/systemcfg/encrypt/encrypt.go b/src/adminserver/systemcfg/encrypt/encrypt.go index 28c911d9b..76461dbee 100644 --- a/src/adminserver/systemcfg/encrypt/encrypt.go +++ b/src/adminserver/systemcfg/encrypt/encrypt.go @@ -15,8 +15,8 @@ package encrypt import ( - comcfg "github.com/vmware/harbor/src/common/config" - "github.com/vmware/harbor/src/common/utils" + comcfg "github.com/goharbor/harbor/src/common/config" + "github.com/goharbor/harbor/src/common/utils" ) // Encryptor encrypts or decrypts a strings diff --git a/src/adminserver/systemcfg/encrypt/encrypt_test.go b/src/adminserver/systemcfg/encrypt/encrypt_test.go index 18c8d4256..7c0c283ad 100644 --- a/src/adminserver/systemcfg/encrypt/encrypt_test.go +++ b/src/adminserver/systemcfg/encrypt/encrypt_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - comcfg "github.com/vmware/harbor/src/common/config" + comcfg "github.com/goharbor/harbor/src/common/config" ) type fakeKeyProvider struct { diff --git a/src/adminserver/systemcfg/store/database/driver_db.go b/src/adminserver/systemcfg/store/database/driver_db.go index a5ab833fc..127610bd1 100644 --- a/src/adminserver/systemcfg/store/database/driver_db.go +++ b/src/adminserver/systemcfg/store/database/driver_db.go @@ -19,10 +19,10 @@ import ( "fmt" "strconv" - "github.com/vmware/harbor/src/adminserver/systemcfg/store" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/adminserver/systemcfg/store" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" ) const ( diff --git a/src/adminserver/systemcfg/store/database/driver_db_test.go b/src/adminserver/systemcfg/store/database/driver_db_test.go index 38aa3c8c5..75d2cd7b9 100644 --- a/src/adminserver/systemcfg/store/database/driver_db_test.go +++ b/src/adminserver/systemcfg/store/database/driver_db_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/models" ) func TestCfgStore_Name(t *testing.T) { diff --git a/src/adminserver/systemcfg/store/encrypt/driver.go b/src/adminserver/systemcfg/store/encrypt/driver.go index b40435661..27b8c27ae 100644 --- a/src/adminserver/systemcfg/store/encrypt/driver.go +++ b/src/adminserver/systemcfg/store/encrypt/driver.go @@ -15,9 +15,9 @@ package encrypt import ( - "github.com/vmware/harbor/src/adminserver/systemcfg/encrypt" - "github.com/vmware/harbor/src/adminserver/systemcfg/store" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/adminserver/systemcfg/encrypt" + "github.com/goharbor/harbor/src/adminserver/systemcfg/store" + "github.com/goharbor/harbor/src/common/utils/log" ) const ( diff --git a/src/adminserver/systemcfg/store/json/driver_json.go b/src/adminserver/systemcfg/store/json/driver_json.go index 4e795a52a..ea2bf33a9 100644 --- a/src/adminserver/systemcfg/store/json/driver_json.go +++ b/src/adminserver/systemcfg/store/json/driver_json.go @@ -21,8 +21,8 @@ import ( "path/filepath" "sync" - "github.com/vmware/harbor/src/adminserver/systemcfg/store" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/adminserver/systemcfg/store" + "github.com/goharbor/harbor/src/common/utils/log" ) const ( diff --git a/src/adminserver/systemcfg/systemcfg.go b/src/adminserver/systemcfg/systemcfg.go index 07285cb03..40d2ffff4 100644 --- a/src/adminserver/systemcfg/systemcfg.go +++ b/src/adminserver/systemcfg/systemcfg.go @@ -21,17 +21,17 @@ import ( "strconv" "strings" - enpt "github.com/vmware/harbor/src/adminserver/systemcfg/encrypt" - "github.com/vmware/harbor/src/adminserver/systemcfg/store" - "github.com/vmware/harbor/src/adminserver/systemcfg/store/database" - "github.com/vmware/harbor/src/adminserver/systemcfg/store/encrypt" - "github.com/vmware/harbor/src/adminserver/systemcfg/store/json" - "github.com/vmware/harbor/src/common" - comcfg "github.com/vmware/harbor/src/common/config" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" + enpt "github.com/goharbor/harbor/src/adminserver/systemcfg/encrypt" + "github.com/goharbor/harbor/src/adminserver/systemcfg/store" + "github.com/goharbor/harbor/src/adminserver/systemcfg/store/database" + "github.com/goharbor/harbor/src/adminserver/systemcfg/store/encrypt" + "github.com/goharbor/harbor/src/adminserver/systemcfg/store/json" + "github.com/goharbor/harbor/src/common" + comcfg "github.com/goharbor/harbor/src/common/config" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" ) const ( diff --git a/src/adminserver/systemcfg/systemcfg_test.go b/src/adminserver/systemcfg/systemcfg_test.go index efc4bc1f5..2be9eeabd 100644 --- a/src/adminserver/systemcfg/systemcfg_test.go +++ b/src/adminserver/systemcfg/systemcfg_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common" + "github.com/goharbor/harbor/src/common" ) func TestParseStringToInt(t *testing.T) { diff --git a/src/adminserver/systeminfo/imagestorage/filesystem/driver.go b/src/adminserver/systeminfo/imagestorage/filesystem/driver.go index f2484f06d..151383b40 100644 --- a/src/adminserver/systeminfo/imagestorage/filesystem/driver.go +++ b/src/adminserver/systeminfo/imagestorage/filesystem/driver.go @@ -18,8 +18,8 @@ import ( "os" "syscall" - storage "github.com/vmware/harbor/src/adminserver/systeminfo/imagestorage" - "github.com/vmware/harbor/src/common/utils/log" + storage "github.com/goharbor/harbor/src/adminserver/systeminfo/imagestorage" + "github.com/goharbor/harbor/src/common/utils/log" ) const ( diff --git a/src/adminserver/systeminfo/imagestorage/filesystem/driver_test.go b/src/adminserver/systeminfo/imagestorage/filesystem/driver_test.go index 794c0c4f7..e72ef13d0 100644 --- a/src/adminserver/systeminfo/imagestorage/filesystem/driver_test.go +++ b/src/adminserver/systeminfo/imagestorage/filesystem/driver_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - storage "github.com/vmware/harbor/src/adminserver/systeminfo/imagestorage" + storage "github.com/goharbor/harbor/src/adminserver/systeminfo/imagestorage" ) func TestName(t *testing.T) { diff --git a/src/adminserver/systeminfo/systeminfo.go b/src/adminserver/systeminfo/systeminfo.go index a8e6fd25c..97a151d0f 100644 --- a/src/adminserver/systeminfo/systeminfo.go +++ b/src/adminserver/systeminfo/systeminfo.go @@ -17,8 +17,8 @@ package systeminfo import ( "os" - "github.com/vmware/harbor/src/adminserver/systeminfo/imagestorage" - "github.com/vmware/harbor/src/adminserver/systeminfo/imagestorage/filesystem" + "github.com/goharbor/harbor/src/adminserver/systeminfo/imagestorage" + "github.com/goharbor/harbor/src/adminserver/systeminfo/imagestorage/filesystem" ) // Init image storage driver diff --git a/src/chartserver/base_test.go b/src/chartserver/base_test.go index a4fe65cd2..6d5167d23 100644 --- a/src/chartserver/base_test.go +++ b/src/chartserver/base_test.go @@ -10,9 +10,9 @@ import ( "net/url" "regexp" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/ui/filter" - "github.com/vmware/harbor/src/ui/promgr/metamgr" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/ui/filter" + "github.com/goharbor/harbor/src/ui/promgr/metamgr" ) //The backend server @@ -229,9 +229,9 @@ func getTheAddrOfFrontServer() string { var harborChartV = ` { "name": "harbor", - "home": "https://github.com/vmware/harbor", + "home": "https://github.com/goharbor/harbor", "sources": [ - "https://github.com/vmware/harbor/tree/master/contrib/helm/harbor" + "https://github.com/goharbor/harbor/tree/master/contrib/helm/harbor" ], "version": "0.2.0", "description": "An Enterprise-class Docker Registry by VMware", @@ -252,7 +252,7 @@ var harborChartV = ` } ], "engine": "gotpl", - "icon": "https://github.com/vmware/harbor/blob/master/docs/img/harbor_logo.png", + "icon": "https://github.com/goharbor/harbor/blob/master/docs/img/harbor_logo.png", "appVersion": "1.5.0", "urls": [ "charts/harbor-0.2.0.tgz" @@ -270,8 +270,8 @@ entries: description: An Enterprise-class Docker Registry by VMware digest: 758ae429f362200a7941c600c8112cc3122723b99ffa5713a0902902da9949ba engine: gotpl - home: https://github.com/vmware/harbor - icon: https://github.com/vmware/harbor/blob/master/docs/img/harbor_logo.png + home: https://github.com/goharbor/harbor + icon: https://github.com/goharbor/harbor/blob/master/docs/img/harbor_logo.png keywords: - vmware - docker @@ -284,7 +284,7 @@ entries: name: paulczar name: harbor sources: - - https://github.com/vmware/harbor/tree/master/contrib/helm/harbor + - https://github.com/goharbor/harbor/tree/master/contrib/helm/harbor urls: - charts/harbor-0.2.0.tgz version: 0.2.0 @@ -329,8 +329,8 @@ entries: description: An Enterprise-class Docker Registry by VMware digest: 758ae429f362200a7941c600c8112cc3122723b99ffa5713a0902902da9949ba engine: gotpl - home: https://github.com/vmware/harbor - icon: https://github.com/vmware/harbor/blob/master/docs/img/harbor_logo.png + home: https://github.com/goharbor/harbor + icon: https://github.com/goharbor/harbor/blob/master/docs/img/harbor_logo.png keywords: - vmware - docker @@ -343,7 +343,7 @@ entries: name: paulczar name: harbor sources: - - https://github.com/vmware/harbor/tree/master/contrib/helm/harbor + - https://github.com/goharbor/harbor/tree/master/contrib/helm/harbor urls: - charts/harbor-0.2.0.tgz version: 0.2.0 diff --git a/src/chartserver/cache.go b/src/chartserver/cache.go index 470e815ba..c0384ffe0 100644 --- a/src/chartserver/cache.go +++ b/src/chartserver/cache.go @@ -6,7 +6,7 @@ import ( "time" beego_cache "github.com/astaxie/beego/cache" - hlog "github.com/vmware/harbor/src/common/utils/log" + hlog "github.com/goharbor/harbor/src/common/utils/log" //Enable redis cache adaptor _ "github.com/astaxie/beego/cache/redis" diff --git a/src/chartserver/chart_operator.go b/src/chartserver/chart_operator.go index b9fba9eea..4908536c8 100644 --- a/src/chartserver/chart_operator.go +++ b/src/chartserver/chart_operator.go @@ -9,7 +9,7 @@ import ( "github.com/Masterminds/semver" - hlog "github.com/vmware/harbor/src/common/utils/log" + hlog "github.com/goharbor/harbor/src/common/utils/log" "k8s.io/helm/pkg/chartutil" helm_repo "k8s.io/helm/pkg/repo" ) diff --git a/src/chartserver/controller.go b/src/chartserver/controller.go index bf148387b..f4a4ffe90 100644 --- a/src/chartserver/controller.go +++ b/src/chartserver/controller.go @@ -7,7 +7,7 @@ import ( "os" "strings" - hlog "github.com/vmware/harbor/src/common/utils/log" + hlog "github.com/goharbor/harbor/src/common/utils/log" ) const ( diff --git a/src/chartserver/manipulation_handler.go b/src/chartserver/manipulation_handler.go index d085bfd2b..a27a29391 100644 --- a/src/chartserver/manipulation_handler.go +++ b/src/chartserver/manipulation_handler.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/ghodss/yaml" - hlog "github.com/vmware/harbor/src/common/utils/log" + hlog "github.com/goharbor/harbor/src/common/utils/log" helm_repo "k8s.io/helm/pkg/repo" ) diff --git a/src/chartserver/repo_handler.go b/src/chartserver/repo_handler.go index c400ce9bd..853826b0c 100644 --- a/src/chartserver/repo_handler.go +++ b/src/chartserver/repo_handler.go @@ -12,10 +12,10 @@ import ( "time" "github.com/ghodss/yaml" - "github.com/vmware/harbor/src/ui/filter" + "github.com/goharbor/harbor/src/ui/filter" helm_repo "k8s.io/helm/pkg/repo" - hlog "github.com/vmware/harbor/src/common/utils/log" + hlog "github.com/goharbor/harbor/src/common/utils/log" ) const ( diff --git a/src/common/api/base.go b/src/common/api/base.go index c83da7e0c..6b792dd7d 100644 --- a/src/common/api/base.go +++ b/src/common/api/base.go @@ -21,8 +21,8 @@ import ( "strconv" "github.com/astaxie/beego/validation" - http_error "github.com/vmware/harbor/src/common/utils/error" - "github.com/vmware/harbor/src/common/utils/log" + http_error "github.com/goharbor/harbor/src/common/utils/error" + "github.com/goharbor/harbor/src/common/utils/log" "github.com/astaxie/beego" ) diff --git a/src/common/config/config.go b/src/common/config/config.go index 750e7cdc2..e2e6f99b6 100644 --- a/src/common/config/config.go +++ b/src/common/config/config.go @@ -20,8 +20,8 @@ import ( "time" "github.com/astaxie/beego/cache" - "github.com/vmware/harbor/src/adminserver/client" - "github.com/vmware/harbor/src/common" + "github.com/goharbor/harbor/src/adminserver/client" + "github.com/goharbor/harbor/src/common" ) // Manager manages configurations diff --git a/src/common/dao/accesslog.go b/src/common/dao/accesslog.go index c0f716fdc..2711efa02 100644 --- a/src/common/dao/accesslog.go +++ b/src/common/dao/accesslog.go @@ -16,8 +16,8 @@ package dao import ( "github.com/astaxie/beego/orm" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" ) // AddAccessLog persists the access logs diff --git a/src/common/dao/admin_job.go b/src/common/dao/admin_job.go index dd61a7bf0..59c2a1d3d 100644 --- a/src/common/dao/admin_job.go +++ b/src/common/dao/admin_job.go @@ -18,8 +18,8 @@ import ( "time" "github.com/astaxie/beego/orm" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" ) // AddAdminJob ... diff --git a/src/common/dao/admin_job_test.go b/src/common/dao/admin_job_test.go index e15bc90a5..96143b466 100644 --- a/src/common/dao/admin_job_test.go +++ b/src/common/dao/admin_job_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) func TestAddAdminJob(t *testing.T) { diff --git a/src/common/dao/base.go b/src/common/dao/base.go index b9f293359..041048f3d 100644 --- a/src/common/dao/base.go +++ b/src/common/dao/base.go @@ -21,8 +21,8 @@ import ( "sync" "github.com/astaxie/beego/orm" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" ) const ( diff --git a/src/common/dao/clair.go b/src/common/dao/clair.go index b978566d2..95a4cca8e 100644 --- a/src/common/dao/clair.go +++ b/src/common/dao/clair.go @@ -15,8 +15,8 @@ package dao import ( - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" "time" ) diff --git a/src/common/dao/clair/base.go b/src/common/dao/clair/base.go index 9f952af4f..bd6d0f7f5 100644 --- a/src/common/dao/clair/base.go +++ b/src/common/dao/clair/base.go @@ -20,7 +20,7 @@ import ( "sync" "github.com/astaxie/beego/orm" - "github.com/vmware/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/dao" ) const ( diff --git a/src/common/dao/config.go b/src/common/dao/config.go index edf9db639..461be1348 100644 --- a/src/common/dao/config.go +++ b/src/common/dao/config.go @@ -15,7 +15,7 @@ package dao import ( - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) // AuthModeCanBeModified determines whether auth mode can be diff --git a/src/common/dao/config_test.go b/src/common/dao/config_test.go index 447dff871..4eee0f166 100644 --- a/src/common/dao/config_test.go +++ b/src/common/dao/config_test.go @@ -17,7 +17,7 @@ package dao import ( "testing" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) func TestAuthModeCanBeModified(t *testing.T) { diff --git a/src/common/dao/dao_test.go b/src/common/dao/dao_test.go index ad2d1a466..1b3c30849 100644 --- a/src/common/dao/dao_test.go +++ b/src/common/dao/dao_test.go @@ -22,10 +22,10 @@ import ( "github.com/astaxie/beego/orm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" ) func execUpdate(o orm.Ormer, sql string, params ...interface{}) error { diff --git a/src/common/dao/group/usergroup.go b/src/common/dao/group/usergroup.go index f39f7d7d9..4e19358a1 100644 --- a/src/common/dao/group/usergroup.go +++ b/src/common/dao/group/usergroup.go @@ -18,11 +18,11 @@ import ( "strings" "time" - "github.com/vmware/harbor/src/common" + "github.com/goharbor/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" ) // AddUserGroup - Add User Group diff --git a/src/common/dao/group/usergroup_test.go b/src/common/dao/group/usergroup_test.go index 62f9db262..23a5f7662 100644 --- a/src/common/dao/group/usergroup_test.go +++ b/src/common/dao/group/usergroup_test.go @@ -19,11 +19,11 @@ import ( "os" "testing" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/dao/project" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/dao/project" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" ) var createdUserGroupID int diff --git a/src/common/dao/label.go b/src/common/dao/label.go index dc65a5ac8..f4ffd0469 100644 --- a/src/common/dao/label.go +++ b/src/common/dao/label.go @@ -19,7 +19,7 @@ import ( "time" "github.com/astaxie/beego/orm" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) // AddLabel creates a label diff --git a/src/common/dao/label_test.go b/src/common/dao/label_test.go index 54c4258b6..8d9fe203d 100644 --- a/src/common/dao/label_test.go +++ b/src/common/dao/label_test.go @@ -17,8 +17,8 @@ package dao import ( "testing" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/common/dao/mysql.go b/src/common/dao/mysql.go index 3891de99d..e16d015e5 100644 --- a/src/common/dao/mysql.go +++ b/src/common/dao/mysql.go @@ -20,7 +20,7 @@ import ( "github.com/astaxie/beego/orm" _ "github.com/go-sql-driver/mysql" //register mysql driver - "github.com/vmware/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils" ) type mysql struct { diff --git a/src/common/dao/pgsql.go b/src/common/dao/pgsql.go index c0e348a26..c637bc3bc 100644 --- a/src/common/dao/pgsql.go +++ b/src/common/dao/pgsql.go @@ -24,8 +24,8 @@ import ( _ "github.com/golang-migrate/migrate/source/file" // import local file driver for migrator _ "github.com/lib/pq" //register pgsql driver - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" ) const defaultMigrationPath = "migrations/postgresql/" diff --git a/src/common/dao/pro_meta.go b/src/common/dao/pro_meta.go index c894d1414..857222fe4 100644 --- a/src/common/dao/pro_meta.go +++ b/src/common/dao/pro_meta.go @@ -19,7 +19,7 @@ import ( "strings" "time" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) // AddProjectMetadata adds metadata for a project diff --git a/src/common/dao/pro_meta_test.go b/src/common/dao/pro_meta_test.go index 8eba25a88..5a5dfcdfc 100644 --- a/src/common/dao/pro_meta_test.go +++ b/src/common/dao/pro_meta_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) func TestProMetaDaoMethods(t *testing.T) { diff --git a/src/common/dao/project.go b/src/common/dao/project.go index 75e2fc3ed..37f9f4fbb 100644 --- a/src/common/dao/project.go +++ b/src/common/dao/project.go @@ -15,9 +15,9 @@ package dao import ( - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" "fmt" "time" diff --git a/src/common/dao/project/projectmember.go b/src/common/dao/project/projectmember.go index 263cbe737..2f4c58152 100644 --- a/src/common/dao/project/projectmember.go +++ b/src/common/dao/project/projectmember.go @@ -17,9 +17,9 @@ package project import ( "fmt" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" ) // GetProjectMember gets all members of the project. diff --git a/src/common/dao/project/projectmember_test.go b/src/common/dao/project/projectmember_test.go index 4abe20d7d..336ed0363 100644 --- a/src/common/dao/project/projectmember_test.go +++ b/src/common/dao/project/projectmember_test.go @@ -19,13 +19,13 @@ import ( "os" "testing" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - _ "github.com/vmware/harbor/src/ui/auth/db" - _ "github.com/vmware/harbor/src/ui/auth/ldap" - cfg "github.com/vmware/harbor/src/ui/config" + "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/common/utils/log" + _ "github.com/goharbor/harbor/src/ui/auth/db" + _ "github.com/goharbor/harbor/src/ui/auth/ldap" + cfg "github.com/goharbor/harbor/src/ui/config" ) func TestMain(m *testing.M) { diff --git a/src/common/dao/project_test.go b/src/common/dao/project_test.go index 9e88b8928..b0d87b9c1 100644 --- a/src/common/dao/project_test.go +++ b/src/common/dao/project_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) func TestDeleteProject(t *testing.T) { diff --git a/src/common/dao/register.go b/src/common/dao/register.go index 317298aea..fd7f312a2 100644 --- a/src/common/dao/register.go +++ b/src/common/dao/register.go @@ -18,8 +18,8 @@ import ( "errors" "time" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" ) // Register is used for user to register, the password is encrypted before the record is inserted into database. diff --git a/src/common/dao/replication_job.go b/src/common/dao/replication_job.go index 310ee500f..143b1b93c 100644 --- a/src/common/dao/replication_job.go +++ b/src/common/dao/replication_job.go @@ -20,8 +20,8 @@ import ( "strings" "github.com/astaxie/beego/orm" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" ) // AddRepTarget ... diff --git a/src/common/dao/repository.go b/src/common/dao/repository.go index e4e2fa81a..8142ed4ff 100644 --- a/src/common/dao/repository.go +++ b/src/common/dao/repository.go @@ -19,7 +19,7 @@ import ( "time" "github.com/astaxie/beego/orm" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) // AddRepository adds a repo to the database. diff --git a/src/common/dao/repository_test.go b/src/common/dao/repository_test.go index ac293d6f8..251ae7f33 100644 --- a/src/common/dao/repository_test.go +++ b/src/common/dao/repository_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/models" ) var ( diff --git a/src/common/dao/resource_label.go b/src/common/dao/resource_label.go index b80b3bb03..eb43cfe07 100644 --- a/src/common/dao/resource_label.go +++ b/src/common/dao/resource_label.go @@ -18,7 +18,7 @@ import ( "time" "github.com/astaxie/beego/orm" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) // AddResourceLabel add a label to a resource diff --git a/src/common/dao/resource_label_test.go b/src/common/dao/resource_label_test.go index 467f019a0..8e0e926f8 100644 --- a/src/common/dao/resource_label_test.go +++ b/src/common/dao/resource_label_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/models" ) func TestMethodsOfResourceLabel(t *testing.T) { diff --git a/src/common/dao/role.go b/src/common/dao/role.go index c5c94d600..96d5f1a9c 100644 --- a/src/common/dao/role.go +++ b/src/common/dao/role.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/astaxie/beego/orm" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) // GetUserProjectRoles returns roles that the user has according to the project. diff --git a/src/common/dao/scan_job.go b/src/common/dao/scan_job.go index dff9dc0a7..7554bbc46 100644 --- a/src/common/dao/scan_job.go +++ b/src/common/dao/scan_job.go @@ -16,8 +16,8 @@ package dao import ( "github.com/astaxie/beego/orm" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" "encoding/json" "fmt" diff --git a/src/common/dao/testutils.go b/src/common/dao/testutils.go index 1d4a727a7..588e04ded 100644 --- a/src/common/dao/testutils.go +++ b/src/common/dao/testutils.go @@ -19,8 +19,8 @@ import ( "os" "strconv" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" ) var defaultRegistered = false diff --git a/src/common/dao/user.go b/src/common/dao/user.go index 3665e6937..ecfa576e9 100644 --- a/src/common/dao/user.go +++ b/src/common/dao/user.go @@ -21,10 +21,10 @@ import ( "github.com/astaxie/beego/orm" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/log" ) // GetUser ... diff --git a/src/common/dao/user_test.go b/src/common/dao/user_test.go index a4c85e81b..4a710f13f 100644 --- a/src/common/dao/user_test.go +++ b/src/common/dao/user_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) func TestDeleteUser(t *testing.T) { diff --git a/src/common/dao/version.go b/src/common/dao/version.go index 8d4e3423a..ba2c787c5 100644 --- a/src/common/dao/version.go +++ b/src/common/dao/version.go @@ -15,7 +15,7 @@ package dao import ( - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) const ( diff --git a/src/common/dao/watch_item.go b/src/common/dao/watch_item.go index 1b9b093dd..af3363fb1 100644 --- a/src/common/dao/watch_item.go +++ b/src/common/dao/watch_item.go @@ -17,7 +17,7 @@ package dao import ( "time" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) // DefaultDatabaseWatchItemDAO is an instance of DatabaseWatchItemDAO diff --git a/src/common/dao/watch_item_test.go b/src/common/dao/watch_item_test.go index b5b9b1b84..6e9087923 100644 --- a/src/common/dao/watch_item_test.go +++ b/src/common/dao/watch_item_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) func TestMethodsOfWatchItem(t *testing.T) { diff --git a/src/common/http/client.go b/src/common/http/client.go index a5971cbaf..8fb6d1893 100644 --- a/src/common/http/client.go +++ b/src/common/http/client.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "net/http" - "github.com/vmware/harbor/src/common/http/modifier" + "github.com/goharbor/harbor/src/common/http/modifier" ) // Client is a util for common HTTP operations, such Get, Head, Post, Put and Delete. diff --git a/src/common/http/modifier/auth/auth.go b/src/common/http/modifier/auth/auth.go index 25c042586..f6cf82ebf 100644 --- a/src/common/http/modifier/auth/auth.go +++ b/src/common/http/modifier/auth/auth.go @@ -18,8 +18,8 @@ import ( "errors" "net/http" - "github.com/vmware/harbor/src/common/http/modifier" - "github.com/vmware/harbor/src/common/secret" + "github.com/goharbor/harbor/src/common/http/modifier" + "github.com/goharbor/harbor/src/common/secret" ) // Authorizer is a kind of Modifier used to authorize the requests diff --git a/src/common/http/modifier/auth/auth_test.go b/src/common/http/modifier/auth/auth_test.go index 397f57c69..01651626e 100644 --- a/src/common/http/modifier/auth/auth_test.go +++ b/src/common/http/modifier/auth/auth_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - commonsecret "github.com/vmware/harbor/src/common/secret" + commonsecret "github.com/goharbor/harbor/src/common/secret" ) func TestAuthorizeOfSecretAuthorizer(t *testing.T) { diff --git a/src/common/job/client.go b/src/common/job/client.go index 331cd06a0..326f6141d 100644 --- a/src/common/job/client.go +++ b/src/common/job/client.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - commonhttp "github.com/vmware/harbor/src/common/http" - "github.com/vmware/harbor/src/common/http/modifier/auth" - "github.com/vmware/harbor/src/common/job/models" + commonhttp "github.com/goharbor/harbor/src/common/http" + "github.com/goharbor/harbor/src/common/http/modifier/auth" + "github.com/goharbor/harbor/src/common/job/models" ) // Client wraps interface to access jobservice. diff --git a/src/common/job/client_test.go b/src/common/job/client_test.go index e2b0936b9..821300af1 100644 --- a/src/common/job/client_test.go +++ b/src/common/job/client_test.go @@ -2,8 +2,8 @@ package job import ( "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/job/models" - "github.com/vmware/harbor/src/common/job/test" + "github.com/goharbor/harbor/src/common/job/models" + "github.com/goharbor/harbor/src/common/job/test" "os" "testing" ) diff --git a/src/common/job/test/server.go b/src/common/job/test/server.go index ee1dd689f..7dcfbed48 100644 --- a/src/common/job/test/server.go +++ b/src/common/job/test/server.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/vmware/harbor/src/common/job/models" + "github.com/goharbor/harbor/src/common/job/models" ) const ( diff --git a/src/common/models/label.go b/src/common/models/label.go index d2a2b7126..1e768933b 100644 --- a/src/common/models/label.go +++ b/src/common/models/label.go @@ -19,7 +19,7 @@ import ( "time" "github.com/astaxie/beego/validation" - "github.com/vmware/harbor/src/common" + "github.com/goharbor/harbor/src/common" ) // Label holds information used for a label diff --git a/src/common/models/replication_job.go b/src/common/models/replication_job.go index ec8a087e8..a2b7ebbd6 100644 --- a/src/common/models/replication_job.go +++ b/src/common/models/replication_job.go @@ -18,7 +18,7 @@ import ( "time" "github.com/astaxie/beego/validation" - "github.com/vmware/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils" ) const ( diff --git a/src/common/notifier/config_watcher.go b/src/common/notifier/config_watcher.go index 8eab3b88e..4ff00282b 100644 --- a/src/common/notifier/config_watcher.go +++ b/src/common/notifier/config_watcher.go @@ -3,8 +3,8 @@ package notifier import ( "errors" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" ) //WatchConfigChanges is used to watch the configuration changes. diff --git a/src/common/notifier/notifier.go b/src/common/notifier/notifier.go index c2519cfc3..2608447a8 100644 --- a/src/common/notifier/notifier.go +++ b/src/common/notifier/notifier.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/log" ) //HandlerIndexer is setup the relationship between the handler type and diff --git a/src/common/notifier/notifier_test.go b/src/common/notifier/notifier_test.go index 8bb93c59d..db839c38e 100644 --- a/src/common/notifier/notifier_test.go +++ b/src/common/notifier/notifier_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/vmware/harbor/src/common/scheduler" + "github.com/goharbor/harbor/src/common/scheduler" ) var statefulData int32 diff --git a/src/common/notifier/scan_policy_notitification_handler.go b/src/common/notifier/scan_policy_notitification_handler.go index 2949b3fb5..f2dcfab87 100644 --- a/src/common/notifier/scan_policy_notitification_handler.go +++ b/src/common/notifier/scan_policy_notitification_handler.go @@ -7,9 +7,9 @@ import ( "fmt" "time" - "github.com/vmware/harbor/src/common/scheduler" - "github.com/vmware/harbor/src/common/scheduler/policy" - "github.com/vmware/harbor/src/common/scheduler/task" + "github.com/goharbor/harbor/src/common/scheduler" + "github.com/goharbor/harbor/src/common/scheduler/policy" + "github.com/goharbor/harbor/src/common/scheduler/task" ) const ( diff --git a/src/common/notifier/scan_policy_notitification_handler_test.go b/src/common/notifier/scan_policy_notitification_handler_test.go index 89f1c651f..1211dc506 100644 --- a/src/common/notifier/scan_policy_notitification_handler_test.go +++ b/src/common/notifier/scan_policy_notitification_handler_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/vmware/harbor/src/common/scheduler" - "github.com/vmware/harbor/src/common/scheduler/policy" + "github.com/goharbor/harbor/src/common/scheduler" + "github.com/goharbor/harbor/src/common/scheduler/policy" ) var testingScheduler = scheduler.DefaultScheduler diff --git a/src/common/notifier/topics.go b/src/common/notifier/topics.go index 869ff1055..d88e79b69 100644 --- a/src/common/notifier/topics.go +++ b/src/common/notifier/topics.go @@ -1,7 +1,7 @@ package notifier import ( - "github.com/vmware/harbor/src/common" + "github.com/goharbor/harbor/src/common" ) //Define global topic names diff --git a/src/common/registryctl/client.go b/src/common/registryctl/client.go index fed8c055a..70e6abb2c 100644 --- a/src/common/registryctl/client.go +++ b/src/common/registryctl/client.go @@ -17,9 +17,9 @@ package registryctl import ( "os" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/registryctl/client" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/registryctl/client" ) var ( diff --git a/src/common/scheduler/policy/alternate_policy.go b/src/common/scheduler/policy/alternate_policy.go index fe72959c8..c8ba207a0 100644 --- a/src/common/scheduler/policy/alternate_policy.go +++ b/src/common/scheduler/policy/alternate_policy.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/vmware/harbor/src/common/scheduler/task" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/scheduler/task" + "github.com/goharbor/harbor/src/common/utils/log" ) const ( diff --git a/src/common/scheduler/policy/policy.go b/src/common/scheduler/policy/policy.go index 4fc72c0d6..865eda1b2 100644 --- a/src/common/scheduler/policy/policy.go +++ b/src/common/scheduler/policy/policy.go @@ -1,7 +1,7 @@ package policy import ( - "github.com/vmware/harbor/src/common/scheduler/task" + "github.com/goharbor/harbor/src/common/scheduler/task" ) //Policy is an if-then logic to determine how the attached tasks should be diff --git a/src/common/scheduler/scheduler.go b/src/common/scheduler/scheduler.go index ff58cd750..c8d0c9a07 100644 --- a/src/common/scheduler/scheduler.go +++ b/src/common/scheduler/scheduler.go @@ -1,8 +1,8 @@ package scheduler import ( - "github.com/vmware/harbor/src/common/scheduler/policy" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/scheduler/policy" + "github.com/goharbor/harbor/src/common/utils/log" "errors" "fmt" diff --git a/src/common/scheduler/scheduler_test.go b/src/common/scheduler/scheduler_test.go index 262f17a3c..5af11a051 100644 --- a/src/common/scheduler/scheduler_test.go +++ b/src/common/scheduler/scheduler_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/vmware/harbor/src/common/scheduler/policy" - "github.com/vmware/harbor/src/common/scheduler/task" + "github.com/goharbor/harbor/src/common/scheduler/policy" + "github.com/goharbor/harbor/src/common/scheduler/task" ) type fakePolicy struct { diff --git a/src/common/scheduler/task/replication/replication_task.go b/src/common/scheduler/task/replication/replication_task.go index 1d4917420..a6915aca9 100644 --- a/src/common/scheduler/task/replication/replication_task.go +++ b/src/common/scheduler/task/replication/replication_task.go @@ -1,9 +1,9 @@ package replication import ( - "github.com/vmware/harbor/src/common/notifier" - "github.com/vmware/harbor/src/replication/event/notification" - "github.com/vmware/harbor/src/replication/event/topic" + "github.com/goharbor/harbor/src/common/notifier" + "github.com/goharbor/harbor/src/replication/event/notification" + "github.com/goharbor/harbor/src/replication/event/topic" ) //Task is the task for triggering one replication diff --git a/src/common/scheduler/task/scan_all_task.go b/src/common/scheduler/task/scan_all_task.go index c7d70d838..d6f1871ad 100644 --- a/src/common/scheduler/task/scan_all_task.go +++ b/src/common/scheduler/task/scan_all_task.go @@ -1,7 +1,7 @@ package task import ( - "github.com/vmware/harbor/src/ui/utils" + "github.com/goharbor/harbor/src/ui/utils" ) //ScanAllTask is task of scanning all tags. diff --git a/src/common/scheduler/watcher.go b/src/common/scheduler/watcher.go index 8f133c70b..df70d2d65 100644 --- a/src/common/scheduler/watcher.go +++ b/src/common/scheduler/watcher.go @@ -1,9 +1,9 @@ package scheduler import ( - "github.com/vmware/harbor/src/common/scheduler/policy" - "github.com/vmware/harbor/src/common/scheduler/task" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/scheduler/policy" + "github.com/goharbor/harbor/src/common/scheduler/task" + "github.com/goharbor/harbor/src/common/utils/log" "fmt" "sync" diff --git a/src/common/security/admiral/authcontext/authcontext.go b/src/common/security/admiral/authcontext/authcontext.go index 3d1a8a433..76f76ec50 100644 --- a/src/common/security/admiral/authcontext/authcontext.go +++ b/src/common/security/admiral/authcontext/authcontext.go @@ -23,11 +23,11 @@ import ( "strconv" "strings" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - http_error "github.com/vmware/harbor/src/common/utils/error" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" + http_error "github.com/goharbor/harbor/src/common/utils/error" + "github.com/goharbor/harbor/src/common/utils/log" ) const ( diff --git a/src/common/security/admiral/context.go b/src/common/security/admiral/context.go index 56816139f..ef966d8fc 100644 --- a/src/common/security/admiral/context.go +++ b/src/common/security/admiral/context.go @@ -15,11 +15,11 @@ package admiral import ( - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/security/admiral/authcontext" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/promgr" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/security/admiral/authcontext" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/promgr" ) // SecurityContext implements security.Context interface based on diff --git a/src/common/security/context.go b/src/common/security/context.go index 9969721eb..bb7215350 100644 --- a/src/common/security/context.go +++ b/src/common/security/context.go @@ -15,7 +15,7 @@ package security import ( - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) // Context abstracts the operations related with authN and authZ diff --git a/src/common/security/local/context.go b/src/common/security/local/context.go index 7c2f713ab..b0cd4cd17 100644 --- a/src/common/security/local/context.go +++ b/src/common/security/local/context.go @@ -15,12 +15,12 @@ package local import ( - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/dao/group" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/promgr" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/dao/group" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/promgr" ) // SecurityContext implements security.Context interface based on database diff --git a/src/common/security/local/context_test.go b/src/common/security/local/context_test.go index 2683ee0e9..95d9b9dd4 100644 --- a/src/common/security/local/context_test.go +++ b/src/common/security/local/context_test.go @@ -21,13 +21,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/dao/project" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/promgr" - "github.com/vmware/harbor/src/ui/promgr/pmsdriver/local" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/dao/project" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/promgr" + "github.com/goharbor/harbor/src/ui/promgr/pmsdriver/local" ) var ( diff --git a/src/common/security/secret/context.go b/src/common/security/secret/context.go index 47762de25..f4642dd5e 100644 --- a/src/common/security/secret/context.go +++ b/src/common/security/secret/context.go @@ -17,10 +17,10 @@ package secret import ( "fmt" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/secret" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/secret" + "github.com/goharbor/harbor/src/common/utils/log" ) // SecurityContext implements security.Context interface based on secret store diff --git a/src/common/security/secret/context_test.go b/src/common/security/secret/context_test.go index fd732f8cb..4a7bfd501 100644 --- a/src/common/security/secret/context_test.go +++ b/src/common/security/secret/context_test.go @@ -18,8 +18,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/secret" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/secret" ) func TestIsAuthenticated(t *testing.T) { diff --git a/src/common/utils/clair/client.go b/src/common/utils/clair/client.go index 2f9e5b280..9622323b0 100644 --- a/src/common/utils/clair/client.go +++ b/src/common/utils/clair/client.go @@ -23,8 +23,8 @@ import ( "strings" // "path" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" ) // Client communicates with clair endpoint to scan image and get detailed scan result diff --git a/src/common/utils/clair/client_test.go b/src/common/utils/clair/client_test.go index 4f0317cce..24a04f150 100644 --- a/src/common/utils/clair/client_test.go +++ b/src/common/utils/clair/client_test.go @@ -18,8 +18,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/clair/test" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/clair/test" ) var ( diff --git a/src/common/utils/clair/test/server.go b/src/common/utils/clair/test/server.go index ebdaf8ac5..0ffa67d4d 100644 --- a/src/common/utils/clair/test/server.go +++ b/src/common/utils/clair/test/server.go @@ -24,8 +24,8 @@ import ( "runtime" "strings" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" ) func currPath() string { diff --git a/src/common/utils/clair/utils.go b/src/common/utils/clair/utils.go index 80348834d..87072f595 100644 --- a/src/common/utils/clair/utils.go +++ b/src/common/utils/clair/utils.go @@ -16,9 +16,9 @@ package clair import ( "fmt" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" "strings" ) diff --git a/src/common/utils/clair/utils_test.go b/src/common/utils/clair/utils_test.go index bda4701b0..ebf6eea3a 100644 --- a/src/common/utils/clair/utils_test.go +++ b/src/common/utils/clair/utils_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) func TestParseServerity(t *testing.T) { diff --git a/src/common/utils/email/mail.go b/src/common/utils/email/mail.go index f91830b69..fb72b9235 100644 --- a/src/common/utils/email/mail.go +++ b/src/common/utils/email/mail.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/log" ) // Send ... diff --git a/src/common/utils/ldap/ldap.go b/src/common/utils/ldap/ldap.go index bf96556f7..ecffce9b2 100644 --- a/src/common/utils/ldap/ldap.go +++ b/src/common/utils/ldap/ldap.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/config" goldap "gopkg.in/ldap.v2" ) diff --git a/src/common/utils/ldap/ldap_test.go b/src/common/utils/ldap/ldap_test.go index 7b9101878..cf9473349 100644 --- a/src/common/utils/ldap/ldap_test.go +++ b/src/common/utils/ldap/ldap_test.go @@ -5,12 +5,12 @@ import ( "reflect" "testing" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/common/utils/test" - uiConfig "github.com/vmware/harbor/src/ui/config" + "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/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/test" + uiConfig "github.com/goharbor/harbor/src/ui/config" goldap "gopkg.in/ldap.v2" ) diff --git a/src/common/utils/notary/helper.go b/src/common/utils/notary/helper.go index af7775a6e..485a6100a 100644 --- a/src/common/utils/notary/helper.go +++ b/src/common/utils/notary/helper.go @@ -27,10 +27,10 @@ import ( "github.com/docker/notary/client" "github.com/docker/notary/trustpinning" "github.com/docker/notary/tuf/data" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/common/utils/registry" - "github.com/vmware/harbor/src/ui/config" - tokenutil "github.com/vmware/harbor/src/ui/service/token" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/registry" + "github.com/goharbor/harbor/src/ui/config" + tokenutil "github.com/goharbor/harbor/src/ui/service/token" "github.com/opencontainers/go-digest" ) diff --git a/src/common/utils/notary/helper_test.go b/src/common/utils/notary/helper_test.go index 2a898e8e7..ba435b91b 100644 --- a/src/common/utils/notary/helper_test.go +++ b/src/common/utils/notary/helper_test.go @@ -18,10 +18,10 @@ import ( "fmt" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common" - notarytest "github.com/vmware/harbor/src/common/utils/notary/test" - utilstest "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common" + notarytest "github.com/goharbor/harbor/src/common/utils/notary/test" + utilstest "github.com/goharbor/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/ui/config" "net/http/httptest" "os" diff --git a/src/common/utils/registry/auth/credential.go b/src/common/utils/registry/auth/credential.go index b9f6aadc4..0a961e168 100644 --- a/src/common/utils/registry/auth/credential.go +++ b/src/common/utils/registry/auth/credential.go @@ -17,7 +17,7 @@ package auth import ( "net/http" - "github.com/vmware/harbor/src/common/http/modifier" + "github.com/goharbor/harbor/src/common/http/modifier" ) // Credential ... @@ -41,7 +41,7 @@ func (b *basicAuthCredential) AddAuthorization(req *http.Request) { req.SetBasicAuth(b.username, b.password) } -// implement github.com/vmware/harbor/src/common/http/modifier.Modifier +// implement github.com/goharbor/harbor/src/common/http/modifier.Modifier func (b *basicAuthCredential) Modify(req *http.Request) error { b.AddAuthorization(req) return nil diff --git a/src/common/utils/registry/auth/path.go b/src/common/utils/registry/auth/path.go index 9801d3414..8307da736 100644 --- a/src/common/utils/registry/auth/path.go +++ b/src/common/utils/registry/auth/path.go @@ -19,7 +19,7 @@ import ( "github.com/docker/distribution/digest" "github.com/docker/distribution/reference" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/log" ) var ( diff --git a/src/common/utils/registry/auth/tokenauthorizer.go b/src/common/utils/registry/auth/tokenauthorizer.go index 4e34a9f4d..6a0812169 100644 --- a/src/common/utils/registry/auth/tokenauthorizer.go +++ b/src/common/utils/registry/auth/tokenauthorizer.go @@ -23,10 +23,10 @@ import ( "time" "github.com/docker/distribution/registry/auth/token" - "github.com/vmware/harbor/src/common/http/modifier" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - token_util "github.com/vmware/harbor/src/ui/service/token" + "github.com/goharbor/harbor/src/common/http/modifier" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + token_util "github.com/goharbor/harbor/src/ui/service/token" ) const ( diff --git a/src/common/utils/registry/auth/tokenauthorizer_test.go b/src/common/utils/registry/auth/tokenauthorizer_test.go index 107dc5533..6d36f8916 100644 --- a/src/common/utils/registry/auth/tokenauthorizer_test.go +++ b/src/common/utils/registry/auth/tokenauthorizer_test.go @@ -25,8 +25,8 @@ import ( "github.com/docker/distribution/registry/auth/token" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/test" ) func TestFilterReq(t *testing.T) { diff --git a/src/common/utils/registry/auth/util.go b/src/common/utils/registry/auth/util.go index 88e48e9bf..c24ae394f 100644 --- a/src/common/utils/registry/auth/util.go +++ b/src/common/utils/registry/auth/util.go @@ -21,9 +21,9 @@ import ( "net/url" "github.com/docker/distribution/registry/auth/token" - "github.com/vmware/harbor/src/common/models" - registry_error "github.com/vmware/harbor/src/common/utils/error" - "github.com/vmware/harbor/src/common/utils/registry" + "github.com/goharbor/harbor/src/common/models" + registry_error "github.com/goharbor/harbor/src/common/utils/error" + "github.com/goharbor/harbor/src/common/utils/registry" ) const ( diff --git a/src/common/utils/registry/registry.go b/src/common/utils/registry/registry.go index bbd351309..11c4512cd 100644 --- a/src/common/utils/registry/registry.go +++ b/src/common/utils/registry/registry.go @@ -23,8 +23,8 @@ import ( "strings" // "time" - "github.com/vmware/harbor/src/common/utils" - registry_error "github.com/vmware/harbor/src/common/utils/error" + "github.com/goharbor/harbor/src/common/utils" + registry_error "github.com/goharbor/harbor/src/common/utils/error" ) // Registry holds information of a registry entity diff --git a/src/common/utils/registry/registry_test.go b/src/common/utils/registry/registry_test.go index b4204aaa3..03723934d 100644 --- a/src/common/utils/registry/registry_test.go +++ b/src/common/utils/registry/registry_test.go @@ -22,7 +22,7 @@ import ( "strconv" "testing" - "github.com/vmware/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/common/utils/test" ) func TestPing(t *testing.T) { diff --git a/src/common/utils/registry/repository.go b/src/common/utils/registry/repository.go index adef72860..e67ffc3be 100644 --- a/src/common/utils/registry/repository.go +++ b/src/common/utils/registry/repository.go @@ -30,8 +30,8 @@ import ( "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/manifest/schema2" - "github.com/vmware/harbor/src/common/utils" - registry_error "github.com/vmware/harbor/src/common/utils/error" + "github.com/goharbor/harbor/src/common/utils" + registry_error "github.com/goharbor/harbor/src/common/utils/error" ) // Repository holds information of a repository entity diff --git a/src/common/utils/registry/repository_test.go b/src/common/utils/registry/repository_test.go index 8bdbe60ff..615ea00ad 100644 --- a/src/common/utils/registry/repository_test.go +++ b/src/common/utils/registry/repository_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/require" "github.com/docker/distribution/manifest/schema2" - registry_error "github.com/vmware/harbor/src/common/utils/error" - "github.com/vmware/harbor/src/common/utils/test" + registry_error "github.com/goharbor/harbor/src/common/utils/error" + "github.com/goharbor/harbor/src/common/utils/test" ) var ( diff --git a/src/common/utils/registry/transport.go b/src/common/utils/registry/transport.go index d844f9308..bcc16df1d 100644 --- a/src/common/utils/registry/transport.go +++ b/src/common/utils/registry/transport.go @@ -17,8 +17,8 @@ package registry import ( "net/http" - "github.com/vmware/harbor/src/common/http/modifier" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/http/modifier" + "github.com/goharbor/harbor/src/common/utils/log" ) // Transport holds information about base transport and modifiers diff --git a/src/common/utils/registry/transport_test.go b/src/common/utils/registry/transport_test.go index 8cebb5571..5307f4549 100644 --- a/src/common/utils/registry/transport_test.go +++ b/src/common/utils/registry/transport_test.go @@ -19,7 +19,7 @@ import ( "net/http" "testing" - "github.com/vmware/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/common/utils/test" ) type simpleModifier struct { diff --git a/src/common/utils/test/adminserver.go b/src/common/utils/test/adminserver.go index 467791557..9d0098fa1 100644 --- a/src/common/utils/test/adminserver.go +++ b/src/common/utils/test/adminserver.go @@ -19,8 +19,8 @@ import ( "net/http" "net/http/httptest" - "github.com/vmware/harbor/src/adminserver/systeminfo/imagestorage" - "github.com/vmware/harbor/src/common" + "github.com/goharbor/harbor/src/adminserver/systeminfo/imagestorage" + "github.com/goharbor/harbor/src/common" ) var adminServerDefaultConfig = map[string]interface{}{ diff --git a/src/common/utils/test/database.go b/src/common/utils/test/database.go index 1f1b4eef3..dd374a16d 100644 --- a/src/common/utils/test/database.go +++ b/src/common/utils/test/database.go @@ -18,9 +18,9 @@ import ( "os" "strconv" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" ) // InitDatabaseFromEnv is used to initialize database for testing diff --git a/src/common/utils/test/policy_manager.go b/src/common/utils/test/policy_manager.go index 768a88087..d1078cdbb 100644 --- a/src/common/utils/test/policy_manager.go +++ b/src/common/utils/test/policy_manager.go @@ -15,8 +15,8 @@ package test import ( - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" ) type FakePolicyManager struct { diff --git a/src/common/utils/test/watch_item.go b/src/common/utils/test/watch_item.go index c801a9761..788b86330 100644 --- a/src/common/utils/test/watch_item.go +++ b/src/common/utils/test/watch_item.go @@ -15,7 +15,7 @@ package test import ( - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) // FakeWatchItemDAO is the fake implement for the dao.WatchItemDAO diff --git a/src/common/utils/uaa/client.go b/src/common/utils/uaa/client.go index 38c8d675c..f1ad462e4 100644 --- a/src/common/utils/uaa/client.go +++ b/src/common/utils/uaa/client.go @@ -25,7 +25,7 @@ import ( "os" "strings" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/log" "golang.org/x/oauth2" "golang.org/x/oauth2/clientcredentials" ) diff --git a/src/common/utils/uaa/client_test.go b/src/common/utils/uaa/client_test.go index f56440a56..487b59e3d 100644 --- a/src/common/utils/uaa/client_test.go +++ b/src/common/utils/uaa/client_test.go @@ -3,7 +3,7 @@ package uaa import ( "fmt" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/utils/uaa/test" + "github.com/goharbor/harbor/src/common/utils/uaa/test" "io/ioutil" "net/http/httptest" "os" diff --git a/src/common/utils/utils.go b/src/common/utils/utils.go index 9b660e1b6..12a75a3fc 100644 --- a/src/common/utils/utils.go +++ b/src/common/utils/utils.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/log" ) // ParseEndpoint parses endpoint to a URL diff --git a/src/jobservice/api/authenticator.go b/src/jobservice/api/authenticator.go index e1d4cb2dd..c8aa3edd3 100644 --- a/src/jobservice/api/authenticator.go +++ b/src/jobservice/api/authenticator.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - "github.com/vmware/harbor/src/jobservice/config" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/config" + "github.com/goharbor/harbor/src/jobservice/utils" ) const ( diff --git a/src/jobservice/api/handler.go b/src/jobservice/api/handler.go index 522d5ba79..318a60be1 100644 --- a/src/jobservice/api/handler.go +++ b/src/jobservice/api/handler.go @@ -12,10 +12,10 @@ import ( "github.com/gorilla/mux" - "github.com/vmware/harbor/src/jobservice/core" - "github.com/vmware/harbor/src/jobservice/errs" - "github.com/vmware/harbor/src/jobservice/models" - "github.com/vmware/harbor/src/jobservice/opm" + "github.com/goharbor/harbor/src/jobservice/core" + "github.com/goharbor/harbor/src/jobservice/errs" + "github.com/goharbor/harbor/src/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/opm" ) //Handler defines approaches to handle the http requests. diff --git a/src/jobservice/api/handler_test.go b/src/jobservice/api/handler_test.go index 49f2c9225..a50013246 100644 --- a/src/jobservice/api/handler_test.go +++ b/src/jobservice/api/handler_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/models" ) const fakeSecret = "I'mfakesecret" diff --git a/src/jobservice/api/router.go b/src/jobservice/api/router.go index b630d3577..762b84d8d 100644 --- a/src/jobservice/api/router.go +++ b/src/jobservice/api/router.go @@ -7,7 +7,7 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/vmware/harbor/src/jobservice/errs" + "github.com/goharbor/harbor/src/jobservice/errs" ) const ( diff --git a/src/jobservice/api/server.go b/src/jobservice/api/server.go index a19f797f0..4088b8ed2 100644 --- a/src/jobservice/api/server.go +++ b/src/jobservice/api/server.go @@ -9,9 +9,9 @@ import ( "net/http" "time" - "github.com/vmware/harbor/src/jobservice/config" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/jobservice/config" + "github.com/goharbor/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/logger" ) //Server serves the http requests. diff --git a/src/jobservice/config/config.go b/src/jobservice/config/config.go index 3fb5b820d..59ea8fe85 100644 --- a/src/jobservice/config/config.go +++ b/src/jobservice/config/config.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/utils" yaml "gopkg.in/yaml.v2" ) diff --git a/src/jobservice/core/controller.go b/src/jobservice/core/controller.go index 14203906c..bc9b9d5ac 100644 --- a/src/jobservice/core/controller.go +++ b/src/jobservice/core/controller.go @@ -8,12 +8,12 @@ import ( "io/ioutil" "github.com/robfig/cron" - "github.com/vmware/harbor/src/jobservice/config" - "github.com/vmware/harbor/src/jobservice/errs" - "github.com/vmware/harbor/src/jobservice/job" - "github.com/vmware/harbor/src/jobservice/models" - "github.com/vmware/harbor/src/jobservice/pool" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/config" + "github.com/goharbor/harbor/src/jobservice/errs" + "github.com/goharbor/harbor/src/jobservice/job" + "github.com/goharbor/harbor/src/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/pool" + "github.com/goharbor/harbor/src/jobservice/utils" ) const ( diff --git a/src/jobservice/core/controller_test.go b/src/jobservice/core/controller_test.go index 20157870b..2f1d9a1f7 100644 --- a/src/jobservice/core/controller_test.go +++ b/src/jobservice/core/controller_test.go @@ -5,10 +5,10 @@ import ( "errors" "testing" - "github.com/vmware/harbor/src/jobservice/errs" + "github.com/goharbor/harbor/src/jobservice/errs" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/models" ) func TestLaunchGenericJob(t *testing.T) { diff --git a/src/jobservice/core/interface.go b/src/jobservice/core/interface.go index 8fb30fc42..c9a07cbd1 100644 --- a/src/jobservice/core/interface.go +++ b/src/jobservice/core/interface.go @@ -4,7 +4,7 @@ package core import ( - "github.com/vmware/harbor/src/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/models" ) //Interface defines the related main methods of job operation. diff --git a/src/jobservice/env/job_context.go b/src/jobservice/env/job_context.go index a4a0f2d47..ae5021531 100644 --- a/src/jobservice/env/job_context.go +++ b/src/jobservice/env/job_context.go @@ -5,7 +5,7 @@ package env import ( "context" - "github.com/vmware/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/jobservice/logger" ) //JobContext is combination of BaseContext and other job specified resources. diff --git a/src/jobservice/job/impl/context.go b/src/jobservice/job/impl/context.go index da770fec0..ffe13b6d5 100644 --- a/src/jobservice/job/impl/context.go +++ b/src/jobservice/job/impl/context.go @@ -10,15 +10,15 @@ import ( "reflect" "time" - "github.com/vmware/harbor/src/adminserver/client" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/jobservice/config" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/job" - jlogger "github.com/vmware/harbor/src/jobservice/job/impl/logger" - "github.com/vmware/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/adminserver/client" + "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/jobservice/config" + "github.com/goharbor/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/job" + jlogger "github.com/goharbor/harbor/src/jobservice/job/impl/logger" + "github.com/goharbor/harbor/src/jobservice/logger" ) const ( diff --git a/src/jobservice/job/impl/demo_job.go b/src/jobservice/job/impl/demo_job.go index 510919d54..97e437f75 100644 --- a/src/jobservice/job/impl/demo_job.go +++ b/src/jobservice/job/impl/demo_job.go @@ -8,13 +8,13 @@ import ( "strings" "time" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/jobservice/opm" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/jobservice/opm" - "github.com/vmware/harbor/src/jobservice/errs" + "github.com/goharbor/harbor/src/jobservice/errs" - "github.com/vmware/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/env" ) //DemoJob is the job to demostrate the job interface. diff --git a/src/jobservice/job/impl/gc/job.go b/src/jobservice/job/impl/gc/job.go index 18585cfc4..42dfbf13a 100644 --- a/src/jobservice/job/impl/gc/job.go +++ b/src/jobservice/job/impl/gc/job.go @@ -21,14 +21,14 @@ import ( "time" "github.com/garyburd/redigo/redis" - "github.com/vmware/harbor/src/common" - common_http "github.com/vmware/harbor/src/common/http" - "github.com/vmware/harbor/src/common/http/modifier/auth" - "github.com/vmware/harbor/src/common/registryctl" - reg "github.com/vmware/harbor/src/common/utils/registry" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/logger" - "github.com/vmware/harbor/src/registryctl/client" + "github.com/goharbor/harbor/src/common" + common_http "github.com/goharbor/harbor/src/common/http" + "github.com/goharbor/harbor/src/common/http/modifier/auth" + "github.com/goharbor/harbor/src/common/registryctl" + reg "github.com/goharbor/harbor/src/common/utils/registry" + "github.com/goharbor/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/registryctl/client" ) const ( diff --git a/src/jobservice/job/impl/logger/job_logger.go b/src/jobservice/job/impl/logger/job_logger.go index 2640e4337..4b0c78a92 100644 --- a/src/jobservice/job/impl/logger/job_logger.go +++ b/src/jobservice/job/impl/logger/job_logger.go @@ -4,8 +4,8 @@ import ( "os" "strings" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/jobservice/logger" ) //JobLogger is an implementation of logger.Interface. diff --git a/src/jobservice/job/impl/logger/service_logger.go b/src/jobservice/job/impl/logger/service_logger.go index ae2130aca..27bdc57fd 100644 --- a/src/jobservice/job/impl/logger/service_logger.go +++ b/src/jobservice/job/impl/logger/service_logger.go @@ -3,7 +3,7 @@ package logger import ( "os" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/log" ) //ServiceLogger is an implementation of logger.Interface. diff --git a/src/jobservice/job/impl/replication/delete.go b/src/jobservice/job/impl/replication/delete.go index 4d91a0f23..e23b58768 100644 --- a/src/jobservice/job/impl/replication/delete.go +++ b/src/jobservice/job/impl/replication/delete.go @@ -3,10 +3,10 @@ package replication import ( "net/http" - common_http "github.com/vmware/harbor/src/common/http" - "github.com/vmware/harbor/src/common/utils/registry/auth" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/logger" + common_http "github.com/goharbor/harbor/src/common/http" + "github.com/goharbor/harbor/src/common/utils/registry/auth" + "github.com/goharbor/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/logger" ) // Deleter deletes repository or images on the destination registry diff --git a/src/jobservice/job/impl/replication/registry.go b/src/jobservice/job/impl/replication/registry.go index f9720b871..1c89e8b32 100644 --- a/src/jobservice/job/impl/replication/registry.go +++ b/src/jobservice/job/impl/replication/registry.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - common_http "github.com/vmware/harbor/src/common/http" - "github.com/vmware/harbor/src/common/models" - reg "github.com/vmware/harbor/src/common/utils/registry" + common_http "github.com/goharbor/harbor/src/common/http" + "github.com/goharbor/harbor/src/common/models" + reg "github.com/goharbor/harbor/src/common/utils/registry" ) type repository struct { diff --git a/src/jobservice/job/impl/replication/replicate.go b/src/jobservice/job/impl/replication/replicate.go index 5af4b87ab..54561a987 100644 --- a/src/jobservice/job/impl/replication/replicate.go +++ b/src/jobservice/job/impl/replication/replicate.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - common_http "github.com/vmware/harbor/src/common/http" - "github.com/vmware/harbor/src/common/http/modifier/auth" - reg "github.com/vmware/harbor/src/common/utils/registry" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/logger" + common_http "github.com/goharbor/harbor/src/common/http" + "github.com/goharbor/harbor/src/common/http/modifier/auth" + reg "github.com/goharbor/harbor/src/common/utils/registry" + "github.com/goharbor/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/logger" ) // Replicator call UI's API to start a repliation according to the policy ID diff --git a/src/jobservice/job/impl/replication/transfer.go b/src/jobservice/job/impl/replication/transfer.go index 575f0f6ec..16ae66e9e 100644 --- a/src/jobservice/job/impl/replication/transfer.go +++ b/src/jobservice/job/impl/replication/transfer.go @@ -11,15 +11,15 @@ import ( "github.com/docker/distribution" "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/manifest/schema2" - common_http "github.com/vmware/harbor/src/common/http" - "github.com/vmware/harbor/src/common/http/modifier" - httpauth "github.com/vmware/harbor/src/common/http/modifier/auth" - "github.com/vmware/harbor/src/common/utils" - reg "github.com/vmware/harbor/src/common/utils/registry" - "github.com/vmware/harbor/src/common/utils/registry/auth" - "github.com/vmware/harbor/src/jobservice/env" - job_utils "github.com/vmware/harbor/src/jobservice/job/impl/utils" - "github.com/vmware/harbor/src/jobservice/logger" + common_http "github.com/goharbor/harbor/src/common/http" + "github.com/goharbor/harbor/src/common/http/modifier" + httpauth "github.com/goharbor/harbor/src/common/http/modifier/auth" + "github.com/goharbor/harbor/src/common/utils" + reg "github.com/goharbor/harbor/src/common/utils/registry" + "github.com/goharbor/harbor/src/common/utils/registry/auth" + "github.com/goharbor/harbor/src/jobservice/env" + job_utils "github.com/goharbor/harbor/src/jobservice/job/impl/utils" + "github.com/goharbor/harbor/src/jobservice/logger" ) var ( diff --git a/src/jobservice/job/impl/scan/job.go b/src/jobservice/job/impl/scan/job.go index 9d211d396..ff8a80071 100644 --- a/src/jobservice/job/impl/scan/job.go +++ b/src/jobservice/job/impl/scan/job.go @@ -22,14 +22,14 @@ import ( "github.com/docker/distribution" "github.com/docker/distribution/manifest/schema2" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/job" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/clair" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/job/impl/utils" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/job" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/clair" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/job/impl/utils" ) // ClairJob is the struct to scan Harbor's Image with Clair diff --git a/src/jobservice/job/impl/utils/utils.go b/src/jobservice/job/impl/utils/utils.go index 05f71a4ed..6d60a2b54 100644 --- a/src/jobservice/job/impl/utils/utils.go +++ b/src/jobservice/job/impl/utils/utils.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/docker/distribution/registry/auth/token" - httpauth "github.com/vmware/harbor/src/common/http/modifier/auth" - "github.com/vmware/harbor/src/common/utils/registry" - "github.com/vmware/harbor/src/common/utils/registry/auth" + httpauth "github.com/goharbor/harbor/src/common/http/modifier/auth" + "github.com/goharbor/harbor/src/common/utils/registry" + "github.com/goharbor/harbor/src/common/utils/registry/auth" ) // NewRepositoryClient creates a repository client with standard token authorizer diff --git a/src/jobservice/job/interface.go b/src/jobservice/job/interface.go index 613bc4766..06d547603 100644 --- a/src/jobservice/job/interface.go +++ b/src/jobservice/job/interface.go @@ -2,7 +2,7 @@ package job -import "github.com/vmware/harbor/src/jobservice/env" +import "github.com/goharbor/harbor/src/jobservice/env" //CheckOPCmdFunc is the function to check if the related operation commands //like STOP or CANCEL is fired for the specified job. If yes, return the diff --git a/src/jobservice/main.go b/src/jobservice/main.go index ef5c673cc..f6efa6596 100644 --- a/src/jobservice/main.go +++ b/src/jobservice/main.go @@ -4,14 +4,14 @@ import ( "errors" "flag" - "github.com/vmware/harbor/src/adminserver/client" - "github.com/vmware/harbor/src/jobservice/config" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/job/impl" - ilogger "github.com/vmware/harbor/src/jobservice/job/impl/logger" - "github.com/vmware/harbor/src/jobservice/logger" - "github.com/vmware/harbor/src/jobservice/runtime" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/adminserver/client" + "github.com/goharbor/harbor/src/jobservice/config" + "github.com/goharbor/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/job/impl" + ilogger "github.com/goharbor/harbor/src/jobservice/job/impl/logger" + "github.com/goharbor/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/jobservice/runtime" + "github.com/goharbor/harbor/src/jobservice/utils" ) func main() { diff --git a/src/jobservice/opm/hook_client.go b/src/jobservice/opm/hook_client.go index a50fd03f2..f27256351 100644 --- a/src/jobservice/opm/hook_client.go +++ b/src/jobservice/opm/hook_client.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/vmware/harbor/src/jobservice/models" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/utils" ) const ( diff --git a/src/jobservice/opm/hook_client_test.go b/src/jobservice/opm/hook_client_test.go index 4ce633471..117757a6e 100644 --- a/src/jobservice/opm/hook_client_test.go +++ b/src/jobservice/opm/hook_client_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "github.com/vmware/harbor/src/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/models" ) func TestHookClient(t *testing.T) { diff --git a/src/jobservice/opm/hook_store.go b/src/jobservice/opm/hook_store.go index f4ed42f6d..c148e7be7 100644 --- a/src/jobservice/opm/hook_store.go +++ b/src/jobservice/opm/hook_store.go @@ -5,7 +5,7 @@ package opm import ( "sync" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/utils" ) //HookStore is used to cache the hooks in memory. diff --git a/src/jobservice/opm/job_stats_mgr.go b/src/jobservice/opm/job_stats_mgr.go index 91ff8df04..e8cf00896 100644 --- a/src/jobservice/opm/job_stats_mgr.go +++ b/src/jobservice/opm/job_stats_mgr.go @@ -2,7 +2,7 @@ package opm -import "github.com/vmware/harbor/src/jobservice/models" +import "github.com/goharbor/harbor/src/jobservice/models" //JobStatsManager defines the methods to handle stats of job. type JobStatsManager interface { diff --git a/src/jobservice/opm/op_commands.go b/src/jobservice/opm/op_commands.go index 0e2916a3b..47e08dd6a 100644 --- a/src/jobservice/opm/op_commands.go +++ b/src/jobservice/opm/op_commands.go @@ -11,9 +11,9 @@ import ( "time" "github.com/gomodule/redigo/redis" - "github.com/vmware/harbor/src/jobservice/logger" - "github.com/vmware/harbor/src/jobservice/models" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/utils" ) const ( diff --git a/src/jobservice/opm/redis_job_stats_mgr.go b/src/jobservice/opm/redis_job_stats_mgr.go index 88f45904e..f476befdc 100644 --- a/src/jobservice/opm/redis_job_stats_mgr.go +++ b/src/jobservice/opm/redis_job_stats_mgr.go @@ -13,13 +13,13 @@ import ( "sync/atomic" "time" - "github.com/vmware/harbor/src/jobservice/errs" - "github.com/vmware/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/jobservice/errs" + "github.com/goharbor/harbor/src/jobservice/logger" "github.com/gomodule/redigo/redis" - "github.com/vmware/harbor/src/jobservice/job" - "github.com/vmware/harbor/src/jobservice/models" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/job" + "github.com/goharbor/harbor/src/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/utils" ) const ( diff --git a/src/jobservice/opm/redis_job_stats_mgr_test.go b/src/jobservice/opm/redis_job_stats_mgr_test.go index cc0041067..c54e1c45a 100644 --- a/src/jobservice/opm/redis_job_stats_mgr_test.go +++ b/src/jobservice/opm/redis_job_stats_mgr_test.go @@ -13,9 +13,9 @@ import ( "time" "github.com/gomodule/redigo/redis" - "github.com/vmware/harbor/src/jobservice/job" - "github.com/vmware/harbor/src/jobservice/models" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/job" + "github.com/goharbor/harbor/src/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/utils" ) const ( diff --git a/src/jobservice/period/enqueuer.go b/src/jobservice/period/enqueuer.go index 96321b35b..1345b9573 100644 --- a/src/jobservice/period/enqueuer.go +++ b/src/jobservice/period/enqueuer.go @@ -9,9 +9,9 @@ import ( "github.com/gocraft/work" "github.com/gomodule/redigo/redis" "github.com/robfig/cron" - "github.com/vmware/harbor/src/jobservice/job" - "github.com/vmware/harbor/src/jobservice/logger" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/job" + "github.com/goharbor/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/jobservice/utils" ) const ( diff --git a/src/jobservice/period/enqueuer_test.go b/src/jobservice/period/enqueuer_test.go index d6882f9a0..c7eb46fad 100644 --- a/src/jobservice/period/enqueuer_test.go +++ b/src/jobservice/period/enqueuer_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/vmware/harbor/src/jobservice/tests" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/tests" + "github.com/goharbor/harbor/src/jobservice/utils" ) func TestPeriodicEnqueuerStartStop(t *testing.T) { diff --git a/src/jobservice/period/interface.go b/src/jobservice/period/interface.go index 487fb5697..ed7a97f8f 100644 --- a/src/jobservice/period/interface.go +++ b/src/jobservice/period/interface.go @@ -2,7 +2,7 @@ package period -import "github.com/vmware/harbor/src/jobservice/models" +import "github.com/goharbor/harbor/src/jobservice/models" //Interface defines operations the periodic scheduler should have. type Interface interface { diff --git a/src/jobservice/period/job_policy.go b/src/jobservice/period/job_policy.go index 88e844507..cd531b845 100644 --- a/src/jobservice/period/job_policy.go +++ b/src/jobservice/period/job_policy.go @@ -6,7 +6,7 @@ import ( "encoding/json" "sync" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/utils" ) const ( diff --git a/src/jobservice/period/redis_scheduler.go b/src/jobservice/period/redis_scheduler.go index 4a4a1a58d..1bec7abc3 100644 --- a/src/jobservice/period/redis_scheduler.go +++ b/src/jobservice/period/redis_scheduler.go @@ -9,15 +9,15 @@ import ( "sync" "time" - "github.com/vmware/harbor/src/jobservice/errs" + "github.com/goharbor/harbor/src/jobservice/errs" "github.com/robfig/cron" "github.com/gomodule/redigo/redis" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/logger" - "github.com/vmware/harbor/src/jobservice/models" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/utils" ) const ( diff --git a/src/jobservice/period/redis_scheduler_test.go b/src/jobservice/period/redis_scheduler_test.go index a898910a8..d3a8ea060 100644 --- a/src/jobservice/period/redis_scheduler_test.go +++ b/src/jobservice/period/redis_scheduler_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/tests" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/tests" + "github.com/goharbor/harbor/src/jobservice/utils" ) var redisPool = tests.GiveMeRedisPool() diff --git a/src/jobservice/period/sweeper.go b/src/jobservice/period/sweeper.go index c2d025c23..0ffa8c918 100644 --- a/src/jobservice/period/sweeper.go +++ b/src/jobservice/period/sweeper.go @@ -9,8 +9,8 @@ import ( "github.com/gocraft/work" "github.com/gomodule/redigo/redis" - "github.com/vmware/harbor/src/jobservice/logger" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/jobservice/utils" ) //Sweeper take charge of clearing the outdated data such as scheduled jobs etc.. diff --git a/src/jobservice/period/sweeper_test.go b/src/jobservice/period/sweeper_test.go index fb51441da..de1723955 100644 --- a/src/jobservice/period/sweeper_test.go +++ b/src/jobservice/period/sweeper_test.go @@ -8,8 +8,8 @@ import ( "github.com/gocraft/work" - "github.com/vmware/harbor/src/jobservice/tests" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/tests" + "github.com/goharbor/harbor/src/jobservice/utils" ) func TestSweeper(t *testing.T) { diff --git a/src/jobservice/pool/interface.go b/src/jobservice/pool/interface.go index b1b5061d1..521ff74cf 100644 --- a/src/jobservice/pool/interface.go +++ b/src/jobservice/pool/interface.go @@ -2,7 +2,7 @@ package pool -import "github.com/vmware/harbor/src/jobservice/models" +import "github.com/goharbor/harbor/src/jobservice/models" //Interface for worker pool. //More like a driver to transparent the lower queue. diff --git a/src/jobservice/pool/message_server.go b/src/jobservice/pool/message_server.go index 8ed4c1336..44773f2e7 100644 --- a/src/jobservice/pool/message_server.go +++ b/src/jobservice/pool/message_server.go @@ -10,13 +10,13 @@ import ( "reflect" "time" - "github.com/vmware/harbor/src/jobservice/logger" - "github.com/vmware/harbor/src/jobservice/opm" - "github.com/vmware/harbor/src/jobservice/period" + "github.com/goharbor/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/jobservice/opm" + "github.com/goharbor/harbor/src/jobservice/period" "github.com/gomodule/redigo/redis" - "github.com/vmware/harbor/src/jobservice/models" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/utils" ) const ( diff --git a/src/jobservice/pool/message_server_test.go b/src/jobservice/pool/message_server_test.go index 6ba5e38cd..1a7bcafee 100644 --- a/src/jobservice/pool/message_server_test.go +++ b/src/jobservice/pool/message_server_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - "github.com/vmware/harbor/src/jobservice/opm" + "github.com/goharbor/harbor/src/jobservice/opm" - "github.com/vmware/harbor/src/jobservice/models" - "github.com/vmware/harbor/src/jobservice/period" - "github.com/vmware/harbor/src/jobservice/utils" + "github.com/goharbor/harbor/src/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/period" + "github.com/goharbor/harbor/src/jobservice/utils" - "github.com/vmware/harbor/src/jobservice/tests" + "github.com/goharbor/harbor/src/jobservice/tests" ) var redisPool = tests.GiveMeRedisPool() diff --git a/src/jobservice/pool/redis_job_wrapper.go b/src/jobservice/pool/redis_job_wrapper.go index ed11a8c9b..e44796397 100644 --- a/src/jobservice/pool/redis_job_wrapper.go +++ b/src/jobservice/pool/redis_job_wrapper.go @@ -7,11 +7,11 @@ import ( "time" "github.com/gocraft/work" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/errs" - "github.com/vmware/harbor/src/jobservice/job" - "github.com/vmware/harbor/src/jobservice/logger" - "github.com/vmware/harbor/src/jobservice/opm" + "github.com/goharbor/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/errs" + "github.com/goharbor/harbor/src/jobservice/job" + "github.com/goharbor/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/jobservice/opm" ) //RedisJob is a job wrapper to wrap the job.Interface to the style which can be recognized by the redis pool. diff --git a/src/jobservice/pool/redis_pool.go b/src/jobservice/pool/redis_pool.go index d7807c470..c9b0bb6e9 100644 --- a/src/jobservice/pool/redis_pool.go +++ b/src/jobservice/pool/redis_pool.go @@ -11,13 +11,13 @@ import ( "github.com/gocraft/work" "github.com/gomodule/redigo/redis" "github.com/robfig/cron" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/job" - "github.com/vmware/harbor/src/jobservice/logger" - "github.com/vmware/harbor/src/jobservice/models" - "github.com/vmware/harbor/src/jobservice/opm" - "github.com/vmware/harbor/src/jobservice/period" - "github.com/vmware/harbor/src/jobservice/utils" + "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/jobservice/models" + "github.com/goharbor/harbor/src/jobservice/opm" + "github.com/goharbor/harbor/src/jobservice/period" + "github.com/goharbor/harbor/src/jobservice/utils" ) var ( diff --git a/src/jobservice/pool/redis_pool_test.go b/src/jobservice/pool/redis_pool_test.go index 71a9b9a71..683bc2231 100644 --- a/src/jobservice/pool/redis_pool_test.go +++ b/src/jobservice/pool/redis_pool_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - "github.com/vmware/harbor/src/jobservice/errs" - "github.com/vmware/harbor/src/jobservice/job" - "github.com/vmware/harbor/src/jobservice/logger" - "github.com/vmware/harbor/src/jobservice/opm" + "github.com/goharbor/harbor/src/jobservice/errs" + "github.com/goharbor/harbor/src/jobservice/job" + "github.com/goharbor/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/jobservice/opm" - "github.com/vmware/harbor/src/jobservice/tests" + "github.com/goharbor/harbor/src/jobservice/tests" - "github.com/vmware/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/env" ) var rPool = tests.GiveMeRedisPool() diff --git a/src/jobservice/pool/runner.go b/src/jobservice/pool/runner.go index aa1880f67..256003df6 100644 --- a/src/jobservice/pool/runner.go +++ b/src/jobservice/pool/runner.go @@ -5,7 +5,7 @@ package pool import ( "reflect" - "github.com/vmware/harbor/src/jobservice/job" + "github.com/goharbor/harbor/src/jobservice/job" ) //Wrap returns a new job.Interface based on the wrapped job handler reference. diff --git a/src/jobservice/runtime/bootstrap.go b/src/jobservice/runtime/bootstrap.go index 410de5ca2..17778a196 100644 --- a/src/jobservice/runtime/bootstrap.go +++ b/src/jobservice/runtime/bootstrap.go @@ -12,17 +12,17 @@ import ( "time" "github.com/gomodule/redigo/redis" - "github.com/vmware/harbor/src/common/job" - "github.com/vmware/harbor/src/jobservice/api" - "github.com/vmware/harbor/src/jobservice/config" - "github.com/vmware/harbor/src/jobservice/core" - "github.com/vmware/harbor/src/jobservice/env" - "github.com/vmware/harbor/src/jobservice/job/impl" - "github.com/vmware/harbor/src/jobservice/job/impl/gc" - "github.com/vmware/harbor/src/jobservice/job/impl/replication" - "github.com/vmware/harbor/src/jobservice/job/impl/scan" - "github.com/vmware/harbor/src/jobservice/logger" - "github.com/vmware/harbor/src/jobservice/pool" + "github.com/goharbor/harbor/src/common/job" + "github.com/goharbor/harbor/src/jobservice/api" + "github.com/goharbor/harbor/src/jobservice/config" + "github.com/goharbor/harbor/src/jobservice/core" + "github.com/goharbor/harbor/src/jobservice/env" + "github.com/goharbor/harbor/src/jobservice/job/impl" + "github.com/goharbor/harbor/src/jobservice/job/impl/gc" + "github.com/goharbor/harbor/src/jobservice/job/impl/replication" + "github.com/goharbor/harbor/src/jobservice/job/impl/scan" + "github.com/goharbor/harbor/src/jobservice/logger" + "github.com/goharbor/harbor/src/jobservice/pool" ) const ( diff --git a/src/registryctl/api/health.go b/src/registryctl/api/health.go index 262757f3c..5f174da29 100644 --- a/src/registryctl/api/health.go +++ b/src/registryctl/api/health.go @@ -17,7 +17,7 @@ package api import ( "net/http" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/log" ) // Health ... diff --git a/src/registryctl/api/registry.go b/src/registryctl/api/registry.go index 4f7395c8d..f0c39873d 100644 --- a/src/registryctl/api/registry.go +++ b/src/registryctl/api/registry.go @@ -21,7 +21,7 @@ import ( "os/exec" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/log" ) const ( diff --git a/src/registryctl/auth/secret.go b/src/registryctl/auth/secret.go index da70527f8..f3851c58b 100644 --- a/src/registryctl/auth/secret.go +++ b/src/registryctl/auth/secret.go @@ -19,7 +19,7 @@ import ( "net/http" "strings" - "github.com/vmware/harbor/src/common/secret" + "github.com/goharbor/harbor/src/common/secret" ) //HarborSecret is the prefix of the value of Authorization header. diff --git a/src/registryctl/auth/secret_test.go b/src/registryctl/auth/secret_test.go index d76e514bf..f2d9da53c 100644 --- a/src/registryctl/auth/secret_test.go +++ b/src/registryctl/auth/secret_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - commonsecret "github.com/vmware/harbor/src/common/secret" + commonsecret "github.com/goharbor/harbor/src/common/secret" ) func TestAuthorizeRequestInvalid(t *testing.T) { diff --git a/src/registryctl/client/client.go b/src/registryctl/client/client.go index c57b24747..e79ff2eb2 100644 --- a/src/registryctl/client/client.go +++ b/src/registryctl/client/client.go @@ -21,11 +21,11 @@ import ( "net/http" "strings" - common_http "github.com/vmware/harbor/src/common/http" - "github.com/vmware/harbor/src/common/http/modifier/auth" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/registryctl/api" + common_http "github.com/goharbor/harbor/src/common/http" + "github.com/goharbor/harbor/src/common/http/modifier/auth" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/registryctl/api" ) // Client defines methods that an Regsitry client should implement diff --git a/src/registryctl/client/client_test.go b/src/registryctl/client/client_test.go index e13447209..5e10b5dae 100644 --- a/src/registryctl/client/client_test.go +++ b/src/registryctl/client/client_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/common/utils/test" ) var c Client diff --git a/src/registryctl/handlers/handler.go b/src/registryctl/handlers/handler.go index 375d4af3a..5f7734dd1 100644 --- a/src/registryctl/handlers/handler.go +++ b/src/registryctl/handlers/handler.go @@ -19,8 +19,8 @@ import ( "os" gorilla_handlers "github.com/gorilla/handlers" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/registryctl/auth" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/registryctl/auth" ) // NewHandlerChain returns a gorilla router which is wrapped by authenticate handler diff --git a/src/registryctl/handlers/handler_test.go b/src/registryctl/handlers/handler_test.go index c6f6ade20..b0693b94a 100644 --- a/src/registryctl/handlers/handler_test.go +++ b/src/registryctl/handlers/handler_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/registryctl/auth" + "github.com/goharbor/harbor/src/registryctl/auth" ) type fakeAuthenticator struct { diff --git a/src/registryctl/handlers/router.go b/src/registryctl/handlers/router.go index a481c8e5a..e73a7b7e2 100644 --- a/src/registryctl/handlers/router.go +++ b/src/registryctl/handlers/router.go @@ -18,7 +18,7 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/vmware/harbor/src/registryctl/api" + "github.com/goharbor/harbor/src/registryctl/api" ) func newRouter() http.Handler { diff --git a/src/registryctl/main.go b/src/registryctl/main.go index c11818c5a..6615997f2 100644 --- a/src/registryctl/main.go +++ b/src/registryctl/main.go @@ -19,9 +19,9 @@ import ( "flag" "net/http" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/registryctl/config" - "github.com/vmware/harbor/src/registryctl/handlers" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/registryctl/config" + "github.com/goharbor/harbor/src/registryctl/handlers" ) // RegistryCtl for registry controller diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index 23d7a44dd..acc6bfe62 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -17,16 +17,16 @@ package core import ( "fmt" - common_models "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" - "github.com/vmware/harbor/src/replication/policy" - "github.com/vmware/harbor/src/replication/replicator" - "github.com/vmware/harbor/src/replication/source" - "github.com/vmware/harbor/src/replication/target" - "github.com/vmware/harbor/src/replication/trigger" - "github.com/vmware/harbor/src/ui/utils" + common_models "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/policy" + "github.com/goharbor/harbor/src/replication/replicator" + "github.com/goharbor/harbor/src/replication/source" + "github.com/goharbor/harbor/src/replication/target" + "github.com/goharbor/harbor/src/replication/trigger" + "github.com/goharbor/harbor/src/ui/utils" ) // Controller defines the methods that a replicatoin controllter should implement diff --git a/src/replication/core/controller_test.go b/src/replication/core/controller_test.go index d57cc34e2..d360004cc 100644 --- a/src/replication/core/controller_test.go +++ b/src/replication/core/controller_test.go @@ -19,12 +19,12 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" - "github.com/vmware/harbor/src/replication/source" - "github.com/vmware/harbor/src/replication/target" - "github.com/vmware/harbor/src/replication/trigger" + "github.com/goharbor/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/source" + "github.com/goharbor/harbor/src/replication/target" + "github.com/goharbor/harbor/src/replication/trigger" ) func TestMain(m *testing.M) { diff --git a/src/replication/event/init.go b/src/replication/event/init.go index 0f79739e3..8813725e2 100644 --- a/src/replication/event/init.go +++ b/src/replication/event/init.go @@ -15,9 +15,9 @@ package event import ( - "github.com/vmware/harbor/src/common/notifier" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication/event/topic" + "github.com/goharbor/harbor/src/common/notifier" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication/event/topic" ) //Subscribe related topics diff --git a/src/replication/event/on_deletion_handler.go b/src/replication/event/on_deletion_handler.go index ac7b9697b..bb7308040 100644 --- a/src/replication/event/on_deletion_handler.go +++ b/src/replication/event/on_deletion_handler.go @@ -19,8 +19,8 @@ import ( "fmt" "reflect" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/replication/event/notification" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/replication/event/notification" ) //OnDeletionHandler implements the notification handler interface to handle image on push event. diff --git a/src/replication/event/on_deletion_handler_test.go b/src/replication/event/on_deletion_handler_test.go index e34792f07..b327576e5 100644 --- a/src/replication/event/on_deletion_handler_test.go +++ b/src/replication/event/on_deletion_handler_test.go @@ -18,9 +18,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/replication/event/notification" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/replication/event/notification" ) func TestHandleOfOnDeletionHandler(t *testing.T) { diff --git a/src/replication/event/on_push_handler.go b/src/replication/event/on_push_handler.go index f00468ca2..b190ad924 100644 --- a/src/replication/event/on_push_handler.go +++ b/src/replication/event/on_push_handler.go @@ -19,15 +19,15 @@ import ( "fmt" "reflect" - common_models "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/notifier" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/event/notification" - "github.com/vmware/harbor/src/replication/event/topic" - "github.com/vmware/harbor/src/replication/models" - "github.com/vmware/harbor/src/replication/trigger" + common_models "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/notifier" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/event/notification" + "github.com/goharbor/harbor/src/replication/event/topic" + "github.com/goharbor/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/trigger" ) //OnPushHandler implements the notification handler interface to handle image on push event. diff --git a/src/replication/event/on_push_handler_test.go b/src/replication/event/on_push_handler_test.go index bcd57605c..bb94e6b06 100644 --- a/src/replication/event/on_push_handler_test.go +++ b/src/replication/event/on_push_handler_test.go @@ -18,9 +18,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/replication/event/notification" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/replication/event/notification" ) func TestHandleOfOnPushHandler(t *testing.T) { diff --git a/src/replication/event/start_replication_handler.go b/src/replication/event/start_replication_handler.go index 7e29ef542..e4ef14d3c 100644 --- a/src/replication/event/start_replication_handler.go +++ b/src/replication/event/start_replication_handler.go @@ -19,8 +19,8 @@ import ( "fmt" "reflect" - "github.com/vmware/harbor/src/replication/core" - "github.com/vmware/harbor/src/replication/event/notification" + "github.com/goharbor/harbor/src/replication/core" + "github.com/goharbor/harbor/src/replication/event/notification" ) //StartReplicationHandler implements the notification handler interface to handle start replication requests. diff --git a/src/replication/event/start_replication_handler_test.go b/src/replication/event/start_replication_handler_test.go index 88ba61fbc..6a568bda5 100644 --- a/src/replication/event/start_replication_handler_test.go +++ b/src/replication/event/start_replication_handler_test.go @@ -18,9 +18,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/replication/core" - "github.com/vmware/harbor/src/replication/event/notification" + "github.com/goharbor/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/replication/core" + "github.com/goharbor/harbor/src/replication/event/notification" ) func TestHandle(t *testing.T) { diff --git a/src/replication/models/filter.go b/src/replication/models/filter.go index e2b2a704d..5af641d38 100644 --- a/src/replication/models/filter.go +++ b/src/replication/models/filter.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/astaxie/beego/validation" - "github.com/vmware/harbor/src/replication" + "github.com/goharbor/harbor/src/replication" ) // Filter is the data model represents the filter defined by user. diff --git a/src/replication/models/filter_test.go b/src/replication/models/filter_test.go index 5be9b5dad..836ee804d 100644 --- a/src/replication/models/filter_test.go +++ b/src/replication/models/filter_test.go @@ -19,7 +19,7 @@ import ( "github.com/astaxie/beego/validation" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/replication" + "github.com/goharbor/harbor/src/replication" ) func TestValid(t *testing.T) { diff --git a/src/replication/models/trigger.go b/src/replication/models/trigger.go index 4af3e5329..3600e95c9 100644 --- a/src/replication/models/trigger.go +++ b/src/replication/models/trigger.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/astaxie/beego/validation" - "github.com/vmware/harbor/src/replication" + "github.com/goharbor/harbor/src/replication" ) //Trigger is replication launching approach definition diff --git a/src/replication/models/trigger_test.go b/src/replication/models/trigger_test.go index 2aba67a44..c9a2a4561 100644 --- a/src/replication/models/trigger_test.go +++ b/src/replication/models/trigger_test.go @@ -19,7 +19,7 @@ import ( "github.com/astaxie/beego/validation" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/replication" + "github.com/goharbor/harbor/src/replication" ) func TestValidOfTrigger(t *testing.T) { diff --git a/src/replication/policy/manager.go b/src/replication/policy/manager.go index 8f44efa93..f0f7b9886 100644 --- a/src/replication/policy/manager.go +++ b/src/replication/policy/manager.go @@ -18,11 +18,11 @@ import ( "encoding/json" "time" - "github.com/vmware/harbor/src/common/dao" - persist_models "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/dao" + persist_models "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" + "github.com/goharbor/harbor/src/ui/config" ) // Manager defines the method a policy manger should implement diff --git a/src/replication/policy/manager_test.go b/src/replication/policy/manager_test.go index 62337aff7..55e6e76c1 100644 --- a/src/replication/policy/manager_test.go +++ b/src/replication/policy/manager_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/models" ) func TestConvertToPersistModel(t *testing.T) { diff --git a/src/replication/registry/adaptor.go b/src/replication/registry/adaptor.go index 29b3cf138..f7ccbe0c1 100644 --- a/src/replication/registry/adaptor.go +++ b/src/replication/registry/adaptor.go @@ -1,7 +1,7 @@ package registry import ( - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/models" ) //Adaptor defines the unified operations for all the supported registries such as Harbor or DockerHub. diff --git a/src/replication/registry/harbor_adaptor.go b/src/replication/registry/harbor_adaptor.go index 184689ca7..626f93005 100644 --- a/src/replication/registry/harbor_adaptor.go +++ b/src/replication/registry/harbor_adaptor.go @@ -1,12 +1,12 @@ package registry import ( - "github.com/vmware/harbor/src/common/dao" - common_models "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" - "github.com/vmware/harbor/src/ui/utils" + "github.com/goharbor/harbor/src/common/dao" + common_models "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" + "github.com/goharbor/harbor/src/ui/utils" ) // TODO refacotor the methods of HarborAdaptor by caling Harbor's API diff --git a/src/replication/replicator/replicator.go b/src/replication/replicator/replicator.go index 70835ff12..59ae27e94 100644 --- a/src/replication/replicator/replicator.go +++ b/src/replication/replicator/replicator.go @@ -18,13 +18,13 @@ import ( "fmt" "strings" - "github.com/vmware/harbor/src/common/dao" - common_job "github.com/vmware/harbor/src/common/job" - job_models "github.com/vmware/harbor/src/common/job/models" - common_models "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication/models" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/dao" + common_job "github.com/goharbor/harbor/src/common/job" + job_models "github.com/goharbor/harbor/src/common/job/models" + common_models "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication/models" + "github.com/goharbor/harbor/src/ui/config" ) // Replication holds information for a replication diff --git a/src/replication/source/convertor.go b/src/replication/source/convertor.go index d07aafd35..dbe2d712c 100644 --- a/src/replication/source/convertor.go +++ b/src/replication/source/convertor.go @@ -1,7 +1,7 @@ package source import ( - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/models" ) //Convertor is designed to covert the format of output from upstream filter to the input format diff --git a/src/replication/source/default_filter_chain.go b/src/replication/source/default_filter_chain.go index 1acd29bf8..138c5e9b1 100644 --- a/src/replication/source/default_filter_chain.go +++ b/src/replication/source/default_filter_chain.go @@ -15,7 +15,7 @@ package source import ( - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/models" ) // DefaultFilterChain provides a default implement for interface FilterChain diff --git a/src/replication/source/default_filter_chain_test.go b/src/replication/source/default_filter_chain_test.go index ee1eec79a..9ff5cb345 100644 --- a/src/replication/source/default_filter_chain_test.go +++ b/src/replication/source/default_filter_chain_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" ) func TestBuild(t *testing.T) { diff --git a/src/replication/source/filter.go b/src/replication/source/filter.go index eb7b0623c..054855c01 100644 --- a/src/replication/source/filter.go +++ b/src/replication/source/filter.go @@ -1,7 +1,7 @@ package source import ( - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/models" ) //Filter define the operations of selecting the matched resources from the candidates diff --git a/src/replication/source/filter_chain.go b/src/replication/source/filter_chain.go index 156ed6fc6..195ba4e04 100644 --- a/src/replication/source/filter_chain.go +++ b/src/replication/source/filter_chain.go @@ -1,7 +1,7 @@ package source import ( - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/models" ) //FilterChain is the interface to define the operations of coordinating multiple filters diff --git a/src/replication/source/label_filter.go b/src/replication/source/label_filter.go index 4b1a1b493..76ff1c5b1 100644 --- a/src/replication/source/label_filter.go +++ b/src/replication/source/label_filter.go @@ -17,11 +17,11 @@ package source import ( "fmt" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" ) // LabelFilter filter resources according to label diff --git a/src/replication/source/label_filter_test.go b/src/replication/source/label_filter_test.go index 65914c57f..dc1a7542d 100644 --- a/src/replication/source/label_filter_test.go +++ b/src/replication/source/label_filter_test.go @@ -17,11 +17,11 @@ package source import ( "testing" - "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/replication" + "github.com/goharbor/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/replication" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/models" ) func TestInitOfLabelFilter(t *testing.T) { diff --git a/src/replication/source/pattern_filter.go b/src/replication/source/pattern_filter.go index 6c895d0eb..ec25f8a65 100644 --- a/src/replication/source/pattern_filter.go +++ b/src/replication/source/pattern_filter.go @@ -17,8 +17,8 @@ package source import ( "regexp" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication/models" ) // PatternFilter implements Filter interface for pattern filter diff --git a/src/replication/source/pattern_filter_test.go b/src/replication/source/pattern_filter_test.go index 2f1ea372e..593620c39 100644 --- a/src/replication/source/pattern_filter_test.go +++ b/src/replication/source/pattern_filter_test.go @@ -16,8 +16,8 @@ package source import ( "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" "testing" ) diff --git a/src/replication/source/repository_convertor.go b/src/replication/source/repository_convertor.go index c3a8ea0b8..565ac1b2c 100644 --- a/src/replication/source/repository_convertor.go +++ b/src/replication/source/repository_convertor.go @@ -15,9 +15,9 @@ package source import ( - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" - "github.com/vmware/harbor/src/replication/registry" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/registry" ) // RepositoryConvertor implement Convertor interface, convert projects to repositories diff --git a/src/replication/source/repository_convertor_test.go b/src/replication/source/repository_convertor_test.go index 2ee1f5183..ee63387ea 100644 --- a/src/replication/source/repository_convertor_test.go +++ b/src/replication/source/repository_convertor_test.go @@ -18,8 +18,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" ) func TestRepositoryConvert(t *testing.T) { diff --git a/src/replication/source/repository_filter.go b/src/replication/source/repository_filter.go index 85bdc5a21..afc7cb7f5 100644 --- a/src/replication/source/repository_filter.go +++ b/src/replication/source/repository_filter.go @@ -17,11 +17,11 @@ package source import ( "strings" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" - "github.com/vmware/harbor/src/replication/registry" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/registry" ) // RepositoryFilter implement Filter interface to filter repository diff --git a/src/replication/source/repository_filter_test.go b/src/replication/source/repository_filter_test.go index aab5d9462..b2562a736 100644 --- a/src/replication/source/repository_filter_test.go +++ b/src/replication/source/repository_filter_test.go @@ -18,9 +18,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" - "github.com/vmware/harbor/src/replication/registry" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/registry" ) func TestInitOfRepositoryFilter(t *testing.T) { diff --git a/src/replication/source/sourcer.go b/src/replication/source/sourcer.go index 9322bb50e..a8f548ed1 100644 --- a/src/replication/source/sourcer.go +++ b/src/replication/source/sourcer.go @@ -1,8 +1,8 @@ package source import ( - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/registry" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/registry" ) //Sourcer is used to manage and/or handle all the artifacts and information related with source registry. diff --git a/src/replication/source/sourcer_test.go b/src/replication/source/sourcer_test.go index 1cf9b0a90..fd9f11b5f 100644 --- a/src/replication/source/sourcer_test.go +++ b/src/replication/source/sourcer_test.go @@ -3,7 +3,7 @@ package source import ( "testing" - "github.com/vmware/harbor/src/replication" + "github.com/goharbor/harbor/src/replication" ) func TestReplicationSourcer(t *testing.T) { diff --git a/src/replication/source/tag_combination_filter.go b/src/replication/source/tag_combination_filter.go index 8bdddadd6..dbad8da85 100644 --- a/src/replication/source/tag_combination_filter.go +++ b/src/replication/source/tag_combination_filter.go @@ -17,9 +17,9 @@ package source import ( "strings" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" ) // TagCombinationFilter implements Filter interface for merging tag filter items diff --git a/src/replication/source/tag_combination_filter_test.go b/src/replication/source/tag_combination_filter_test.go index 8a84218b6..77ced3256 100644 --- a/src/replication/source/tag_combination_filter_test.go +++ b/src/replication/source/tag_combination_filter_test.go @@ -16,8 +16,8 @@ package source import ( "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" "testing" ) diff --git a/src/replication/source/tag_convertor.go b/src/replication/source/tag_convertor.go index 80e7f29f7..8070d164e 100644 --- a/src/replication/source/tag_convertor.go +++ b/src/replication/source/tag_convertor.go @@ -15,9 +15,9 @@ package source import ( - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" - "github.com/vmware/harbor/src/replication/registry" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/registry" ) // TagConvertor implement Convertor interface, convert repositories to tags diff --git a/src/replication/source/tag_convertor_test.go b/src/replication/source/tag_convertor_test.go index 17c244c1d..e23250158 100644 --- a/src/replication/source/tag_convertor_test.go +++ b/src/replication/source/tag_convertor_test.go @@ -18,8 +18,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" ) func TestTagConvert(t *testing.T) { diff --git a/src/replication/source/tag_filter.go b/src/replication/source/tag_filter.go index 0da4e0dab..f793fec9b 100644 --- a/src/replication/source/tag_filter.go +++ b/src/replication/source/tag_filter.go @@ -17,10 +17,10 @@ package source import ( "strings" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" - "github.com/vmware/harbor/src/replication/registry" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/registry" ) // TagFilter implements Filter interface to filter tag diff --git a/src/replication/source/tag_filter_test.go b/src/replication/source/tag_filter_test.go index 8114852ce..31fce28a1 100644 --- a/src/replication/source/tag_filter_test.go +++ b/src/replication/source/tag_filter_test.go @@ -18,9 +18,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" - "github.com/vmware/harbor/src/replication/registry" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" + "github.com/goharbor/harbor/src/replication/registry" ) func TestInitOfTagFilter(t *testing.T) { diff --git a/src/replication/target/target.go b/src/replication/target/target.go index ede441de1..5b0d8d2bf 100644 --- a/src/replication/target/target.go +++ b/src/replication/target/target.go @@ -17,10 +17,10 @@ package target import ( "fmt" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/ui/config" ) // Manager defines the methods that a target manager should implement diff --git a/src/replication/trigger/immediate.go b/src/replication/trigger/immediate.go index f10753a95..c35eeaa4f 100644 --- a/src/replication/trigger/immediate.go +++ b/src/replication/trigger/immediate.go @@ -1,7 +1,7 @@ package trigger import ( - "github.com/vmware/harbor/src/replication" + "github.com/goharbor/harbor/src/replication" ) //ImmediateTrigger will setup watcher at the image pushing action to fire diff --git a/src/replication/trigger/immediate_test.go b/src/replication/trigger/immediate_test.go index a14dfe252..ef0efa019 100644 --- a/src/replication/trigger/immediate_test.go +++ b/src/replication/trigger/immediate_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/replication" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/replication" ) func TestKindOfImmediateTrigger(t *testing.T) { diff --git a/src/replication/trigger/manager.go b/src/replication/trigger/manager.go index 10f6eaf83..65cbb5d7e 100644 --- a/src/replication/trigger/manager.go +++ b/src/replication/trigger/manager.go @@ -3,9 +3,9 @@ package trigger import ( "fmt" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" ) //Manager provides unified methods to manage the triggers of policies; diff --git a/src/replication/trigger/manager_test.go b/src/replication/trigger/manager_test.go index 02500e9a2..836337e0b 100644 --- a/src/replication/trigger/manager_test.go +++ b/src/replication/trigger/manager_test.go @@ -19,10 +19,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/models" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/models" ) func TestCreateTrigger(t *testing.T) { diff --git a/src/replication/trigger/schedule.go b/src/replication/trigger/schedule.go index f7b4de3ff..419eb21d5 100644 --- a/src/replication/trigger/schedule.go +++ b/src/replication/trigger/schedule.go @@ -4,16 +4,16 @@ import ( "fmt" "net/http" - "github.com/vmware/harbor/src/common/dao" - common_http "github.com/vmware/harbor/src/common/http" - "github.com/vmware/harbor/src/common/job" - job_models "github.com/vmware/harbor/src/common/job/models" - "github.com/vmware/harbor/src/common/models" - common_utils "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/ui/config" - "github.com/vmware/harbor/src/ui/utils" + "github.com/goharbor/harbor/src/common/dao" + common_http "github.com/goharbor/harbor/src/common/http" + "github.com/goharbor/harbor/src/common/job" + job_models "github.com/goharbor/harbor/src/common/job/models" + "github.com/goharbor/harbor/src/common/models" + common_utils "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/utils" ) //ScheduleTrigger will schedule a alternate policy to provide 'daily' and 'weekly' trigger ways. diff --git a/src/replication/trigger/schedule_test.go b/src/replication/trigger/schedule_test.go index f898160ac..13402dc91 100644 --- a/src/replication/trigger/schedule_test.go +++ b/src/replication/trigger/schedule_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/replication" + "github.com/goharbor/harbor/src/replication" ) func TestKindOfScheduleTrigger(t *testing.T) { diff --git a/src/replication/trigger/watch_list.go b/src/replication/trigger/watch_list.go index 95f902179..4b8e1931d 100644 --- a/src/replication/trigger/watch_list.go +++ b/src/replication/trigger/watch_list.go @@ -1,8 +1,8 @@ package trigger import ( - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" ) //DefaultWatchList is the default instance of WatchList diff --git a/src/replication/trigger/watch_list_test.go b/src/replication/trigger/watch_list_test.go index e8f1b9aed..298274ec7 100644 --- a/src/replication/trigger/watch_list_test.go +++ b/src/replication/trigger/watch_list_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/utils/test" ) func TestMethodsOfWatchList(t *testing.T) { diff --git a/src/ui/api/api_test.go b/src/ui/api/api_test.go index e2a956b6f..166d7be73 100644 --- a/src/ui/api/api_test.go +++ b/src/ui/api/api_test.go @@ -24,16 +24,16 @@ import ( "strings" "testing" - "github.com/vmware/harbor/src/common" + "github.com/goharbor/harbor/src/common" "github.com/astaxie/beego" "github.com/dghubble/sling" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/dao/project" - common_http "github.com/vmware/harbor/src/common/http" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/dao/project" + common_http "github.com/goharbor/harbor/src/common/http" + "github.com/goharbor/harbor/src/common/models" ) var ( diff --git a/src/ui/api/base.go b/src/ui/api/base.go index a2eb45554..271348a5f 100644 --- a/src/ui/api/base.go +++ b/src/ui/api/base.go @@ -17,12 +17,12 @@ package api import ( "net/http" - "github.com/vmware/harbor/src/common/api" - "github.com/vmware/harbor/src/common/security" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/config" - "github.com/vmware/harbor/src/ui/filter" - "github.com/vmware/harbor/src/ui/promgr" + "github.com/goharbor/harbor/src/common/api" + "github.com/goharbor/harbor/src/common/security" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/filter" + "github.com/goharbor/harbor/src/ui/promgr" ) // BaseController ... diff --git a/src/ui/api/chart_repository.go b/src/ui/api/chart_repository.go index 39abdbd5b..b748aaae7 100644 --- a/src/ui/api/chart_repository.go +++ b/src/ui/api/chart_repository.go @@ -12,9 +12,9 @@ import ( "net/url" "strings" - "github.com/vmware/harbor/src/chartserver" - hlog "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/chartserver" + hlog "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/config" ) const ( diff --git a/src/ui/api/chart_repository_test.go b/src/ui/api/chart_repository_test.go index ea58bff7d..e53297d81 100644 --- a/src/ui/api/chart_repository_test.go +++ b/src/ui/api/chart_repository_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/ui/promgr/metamgr" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/ui/promgr/metamgr" ) //Test the URL rewrite function diff --git a/src/ui/api/config.go b/src/ui/api/config.go index f1b32d372..1f4654f23 100644 --- a/src/ui/api/config.go +++ b/src/ui/api/config.go @@ -19,11 +19,11 @@ import ( "net/http" "reflect" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/config" + "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/common/utils/log" + "github.com/goharbor/harbor/src/ui/config" ) // ConfigAPI ... diff --git a/src/ui/api/config_test.go b/src/ui/api/config_test.go index 167662123..1cdfedde6 100644 --- a/src/ui/api/config_test.go +++ b/src/ui/api/config_test.go @@ -19,8 +19,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/ui/config" ) func TestGetConfig(t *testing.T) { diff --git a/src/ui/api/dataprepare_test.go b/src/ui/api/dataprepare_test.go index 711a74bed..5a04e8fb8 100644 --- a/src/ui/api/dataprepare_test.go +++ b/src/ui/api/dataprepare_test.go @@ -31,8 +31,8 @@ package api import ( "os" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" ) const ( diff --git a/src/ui/api/email.go b/src/ui/api/email.go index 66a666a46..037e2602f 100644 --- a/src/ui/api/email.go +++ b/src/ui/api/email.go @@ -19,9 +19,9 @@ import ( "net/http" "strconv" - "github.com/vmware/harbor/src/common/utils/email" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/utils/email" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/config" ) const ( diff --git a/src/ui/api/harborapi_test.go b/src/ui/api/harborapi_test.go index c1b3db2dd..a9834fe9d 100644 --- a/src/ui/api/harborapi_test.go +++ b/src/ui/api/harborapi_test.go @@ -27,14 +27,14 @@ import ( "runtime" "strconv" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/job/test" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - ldapUtils "github.com/vmware/harbor/src/common/utils/ldap" - "github.com/vmware/harbor/src/ui/config" - "github.com/vmware/harbor/src/ui/filter" - "github.com/vmware/harbor/tests/apitests/apilib" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/job/test" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" + ldapUtils "github.com/goharbor/harbor/src/common/utils/ldap" + "github.com/goharbor/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/filter" + "github.com/goharbor/harbor/tests/apitests/apilib" // "strconv" // "strings" @@ -42,10 +42,10 @@ import ( "github.com/dghubble/sling" //for test env prepare - "github.com/vmware/harbor/src/replication/core" - _ "github.com/vmware/harbor/src/replication/event" - _ "github.com/vmware/harbor/src/ui/auth/db" - _ "github.com/vmware/harbor/src/ui/auth/ldap" + "github.com/goharbor/harbor/src/replication/core" + _ "github.com/goharbor/harbor/src/replication/event" + _ "github.com/goharbor/harbor/src/ui/auth/db" + _ "github.com/goharbor/harbor/src/ui/auth/ldap" ) const ( diff --git a/src/ui/api/internal.go b/src/ui/api/internal.go index f59180758..ca9ca1f89 100644 --- a/src/ui/api/internal.go +++ b/src/ui/api/internal.go @@ -17,10 +17,10 @@ package api import ( "net/http" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "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/common/utils/log" ) // InternalAPI handles request of harbor admin... diff --git a/src/ui/api/label.go b/src/ui/api/label.go index a314650de..0d1a68488 100644 --- a/src/ui/api/label.go +++ b/src/ui/api/label.go @@ -19,12 +19,12 @@ import ( "net/http" "strconv" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/core" - rep_models "github.com/vmware/harbor/src/replication/models" + "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/replication" + "github.com/goharbor/harbor/src/replication/core" + rep_models "github.com/goharbor/harbor/src/replication/models" ) // LabelAPI handles requests for label management diff --git a/src/ui/api/label_test.go b/src/ui/api/label_test.go index 84a31a72a..571d99fa4 100644 --- a/src/ui/api/label_test.go +++ b/src/ui/api/label_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/replication" - rep_models "github.com/vmware/harbor/src/replication/models" + "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/replication" + rep_models "github.com/goharbor/harbor/src/replication/models" ) var ( diff --git a/src/ui/api/ldap.go b/src/ui/api/ldap.go index cd35feca1..8320ab198 100644 --- a/src/ui/api/ldap.go +++ b/src/ui/api/ldap.go @@ -17,10 +17,10 @@ package api import ( "fmt" - "github.com/vmware/harbor/src/common/models" - ldapUtils "github.com/vmware/harbor/src/common/utils/ldap" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/auth" + "github.com/goharbor/harbor/src/common/models" + ldapUtils "github.com/goharbor/harbor/src/common/utils/ldap" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/auth" goldap "gopkg.in/ldap.v2" ) diff --git a/src/ui/api/ldap_test.go b/src/ui/api/ldap_test.go index b9dd6b6cd..6f4f943f8 100644 --- a/src/ui/api/ldap_test.go +++ b/src/ui/api/ldap_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) func TestLDAPPing(t *testing.T) { diff --git a/src/ui/api/log.go b/src/ui/api/log.go index 5e3833f0b..9d4527eb4 100644 --- a/src/ui/api/log.go +++ b/src/ui/api/log.go @@ -17,9 +17,9 @@ package api import ( "fmt" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" ) //LogAPI handles request api/logs diff --git a/src/ui/api/log_test.go b/src/ui/api/log_test.go index 891cff3a1..6e24123f8 100644 --- a/src/ui/api/log_test.go +++ b/src/ui/api/log_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" ) func TestLogGet(t *testing.T) { diff --git a/src/ui/api/metadata.go b/src/ui/api/metadata.go index c88fe587d..d1242f612 100644 --- a/src/ui/api/metadata.go +++ b/src/ui/api/metadata.go @@ -21,9 +21,9 @@ import ( "strconv" "strings" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/promgr/metamgr" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/promgr/metamgr" ) // MetadataAPI ... diff --git a/src/ui/api/metadata_test.go b/src/ui/api/metadata_test.go index e71a29527..4b19449c1 100644 --- a/src/ui/api/metadata_test.go +++ b/src/ui/api/metadata_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) func TestValidateProjectMetadata(t *testing.T) { diff --git a/src/ui/api/models/reg_gc.go b/src/ui/api/models/reg_gc.go index df568cc60..ce7c1650a 100644 --- a/src/ui/api/models/reg_gc.go +++ b/src/ui/api/models/reg_gc.go @@ -19,11 +19,11 @@ import ( "fmt" "github.com/astaxie/beego/validation" - "github.com/vmware/harbor/src/common/job" - "github.com/vmware/harbor/src/common/job/models" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/job" + "github.com/goharbor/harbor/src/common/job/models" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/config" ) const ( diff --git a/src/ui/api/models/reg_gc_test.go b/src/ui/api/models/reg_gc_test.go index 8c9e0aeeb..0eb6c2a5c 100644 --- a/src/ui/api/models/reg_gc_test.go +++ b/src/ui/api/models/reg_gc_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common" - common_job "github.com/vmware/harbor/src/common/job" - "github.com/vmware/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/common" + common_job "github.com/goharbor/harbor/src/common/job" + "github.com/goharbor/harbor/src/common/utils/test" ) var adminServerTestConfig = map[string]interface{}{ diff --git a/src/ui/api/models/replication_policy.go b/src/ui/api/models/replication_policy.go index b30e279f9..19a7c7c4e 100644 --- a/src/ui/api/models/replication_policy.go +++ b/src/ui/api/models/replication_policy.go @@ -18,8 +18,8 @@ import ( "time" "github.com/astaxie/beego/validation" - common_models "github.com/vmware/harbor/src/common/models" - rep_models "github.com/vmware/harbor/src/replication/models" + common_models "github.com/goharbor/harbor/src/common/models" + rep_models "github.com/goharbor/harbor/src/replication/models" ) // ReplicationPolicy defines the data model used in API level diff --git a/src/ui/api/project.go b/src/ui/api/project.go index 006f70a84..f77289592 100644 --- a/src/ui/api/project.go +++ b/src/ui/api/project.go @@ -19,13 +19,13 @@ import ( "net/http" "regexp" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - errutil "github.com/vmware/harbor/src/common/utils/error" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/config" + "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/common/utils" + errutil "github.com/goharbor/harbor/src/common/utils/error" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/config" "strconv" "time" diff --git a/src/ui/api/project_test.go b/src/ui/api/project_test.go index 4a10e7394..4e101d696 100644 --- a/src/ui/api/project_test.go +++ b/src/ui/api/project_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/vmware/harbor/src/chartserver" + "github.com/goharbor/harbor/src/chartserver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/tests/apitests/apilib" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/tests/apitests/apilib" ) var addProject *apilib.ProjectReq diff --git a/src/ui/api/projectmember.go b/src/ui/api/projectmember.go index 861e1264d..3fbfe40c0 100644 --- a/src/ui/api/projectmember.go +++ b/src/ui/api/projectmember.go @@ -21,11 +21,11 @@ import ( "strconv" "strings" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao/project" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/auth" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/dao/project" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/auth" ) // ProjectMemberAPI handles request to /api/projects/{}/members/{} diff --git a/src/ui/api/projectmember_test.go b/src/ui/api/projectmember_test.go index 93d782d65..58fc6cf73 100644 --- a/src/ui/api/projectmember_test.go +++ b/src/ui/api/projectmember_test.go @@ -19,9 +19,9 @@ import ( "net/http" "testing" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/dao/project" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/dao/project" + "github.com/goharbor/harbor/src/common/models" ) func TestProjectMemberAPI_Get(t *testing.T) { diff --git a/src/ui/api/reg_gc.go b/src/ui/api/reg_gc.go index 3f09d52ba..d6265673c 100644 --- a/src/ui/api/reg_gc.go +++ b/src/ui/api/reg_gc.go @@ -20,13 +20,13 @@ import ( "os" "strconv" - "github.com/vmware/harbor/src/common/dao" - common_http "github.com/vmware/harbor/src/common/http" - common_job "github.com/vmware/harbor/src/common/job" - common_models "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/api/models" - utils_ui "github.com/vmware/harbor/src/ui/utils" + "github.com/goharbor/harbor/src/common/dao" + common_http "github.com/goharbor/harbor/src/common/http" + common_job "github.com/goharbor/harbor/src/common/job" + common_models "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/api/models" + utils_ui "github.com/goharbor/harbor/src/ui/utils" ) // GCAPI handles request of harbor admin... diff --git a/src/ui/api/reg_gc_test.go b/src/ui/api/reg_gc_test.go index 0c8e2c446..e36acfb80 100644 --- a/src/ui/api/reg_gc_test.go +++ b/src/ui/api/reg_gc_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/tests/apitests/apilib" + "github.com/goharbor/harbor/tests/apitests/apilib" ) var adminJob001 apilib.GCReq diff --git a/src/ui/api/replication.go b/src/ui/api/replication.go index 87234807a..8c1fcec69 100644 --- a/src/ui/api/replication.go +++ b/src/ui/api/replication.go @@ -18,14 +18,14 @@ import ( "fmt" "net/http" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/notifier" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication/core" - "github.com/vmware/harbor/src/replication/event/notification" - "github.com/vmware/harbor/src/replication/event/topic" - api_models "github.com/vmware/harbor/src/ui/api/models" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/notifier" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication/core" + "github.com/goharbor/harbor/src/replication/event/notification" + "github.com/goharbor/harbor/src/replication/event/topic" + api_models "github.com/goharbor/harbor/src/ui/api/models" ) // ReplicationAPI handles API calls for replication diff --git a/src/ui/api/replication_job.go b/src/ui/api/replication_job.go index ee664b4fa..e89fd7f45 100644 --- a/src/ui/api/replication_job.go +++ b/src/ui/api/replication_job.go @@ -20,14 +20,14 @@ import ( "strconv" "time" - "github.com/vmware/harbor/src/common/dao" - common_http "github.com/vmware/harbor/src/common/http" - common_job "github.com/vmware/harbor/src/common/job" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication/core" - api_models "github.com/vmware/harbor/src/ui/api/models" - "github.com/vmware/harbor/src/ui/utils" + "github.com/goharbor/harbor/src/common/dao" + common_http "github.com/goharbor/harbor/src/common/http" + common_job "github.com/goharbor/harbor/src/common/job" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication/core" + api_models "github.com/goharbor/harbor/src/ui/api/models" + "github.com/goharbor/harbor/src/ui/utils" ) // RepJobAPI handles request to /api/replicationJobs /api/replicationJobs/:id/log diff --git a/src/ui/api/replication_policy.go b/src/ui/api/replication_policy.go index a7f1d5096..42c58844b 100644 --- a/src/ui/api/replication_policy.go +++ b/src/ui/api/replication_policy.go @@ -20,14 +20,14 @@ import ( "net/http" "strconv" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/core" - rep_models "github.com/vmware/harbor/src/replication/models" - api_models "github.com/vmware/harbor/src/ui/api/models" - "github.com/vmware/harbor/src/ui/promgr" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/replication" + "github.com/goharbor/harbor/src/replication/core" + rep_models "github.com/goharbor/harbor/src/replication/models" + api_models "github.com/goharbor/harbor/src/ui/api/models" + "github.com/goharbor/harbor/src/ui/promgr" ) // RepPolicyAPI handles /api/replicationPolicies /api/replicationPolicies/:id/enablement diff --git a/src/ui/api/replication_policy_test.go b/src/ui/api/replication_policy_test.go index 8911416da..d902e4098 100644 --- a/src/ui/api/replication_policy_test.go +++ b/src/ui/api/replication_policy_test.go @@ -19,16 +19,16 @@ import ( "net/http/httptest" "testing" - "github.com/vmware/harbor/src/common/dao/project" + "github.com/goharbor/harbor/src/common/dao/project" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/replication" - rep_models "github.com/vmware/harbor/src/replication/models" - api_models "github.com/vmware/harbor/src/ui/api/models" + "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/replication" + rep_models "github.com/goharbor/harbor/src/replication/models" + api_models "github.com/goharbor/harbor/src/ui/api/models" ) var ( diff --git a/src/ui/api/replication_test.go b/src/ui/api/replication_test.go index ce9330f44..97447d61f 100644 --- a/src/ui/api/replication_test.go +++ b/src/ui/api/replication_test.go @@ -19,10 +19,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/replication" - api_models "github.com/vmware/harbor/src/ui/api/models" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/replication" + api_models "github.com/goharbor/harbor/src/ui/api/models" ) const ( diff --git a/src/ui/api/repository.go b/src/ui/api/repository.go index 2f35d7f68..b6fed739c 100644 --- a/src/ui/api/repository.go +++ b/src/ui/api/repository.go @@ -25,20 +25,20 @@ import ( "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/manifest/schema2" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/notifier" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/clair" - registry_error "github.com/vmware/harbor/src/common/utils/error" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/common/utils/notary" - "github.com/vmware/harbor/src/common/utils/registry" - "github.com/vmware/harbor/src/replication/event/notification" - "github.com/vmware/harbor/src/replication/event/topic" - "github.com/vmware/harbor/src/ui/config" - uiutils "github.com/vmware/harbor/src/ui/utils" + "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/common/notifier" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/clair" + registry_error "github.com/goharbor/harbor/src/common/utils/error" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/notary" + "github.com/goharbor/harbor/src/common/utils/registry" + "github.com/goharbor/harbor/src/replication/event/notification" + "github.com/goharbor/harbor/src/replication/event/topic" + "github.com/goharbor/harbor/src/ui/config" + uiutils "github.com/goharbor/harbor/src/ui/utils" ) // RepositoryAPI handles request to /api/repositories /api/repositories/tags /api/repositories/manifests, the parm has to be put diff --git a/src/ui/api/repository_label.go b/src/ui/api/repository_label.go index 756c78d9d..fd2510c37 100644 --- a/src/ui/api/repository_label.go +++ b/src/ui/api/repository_label.go @@ -19,11 +19,11 @@ import ( "net/http" "strconv" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - uiutils "github.com/vmware/harbor/src/ui/utils" + "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/common/utils" + uiutils "github.com/goharbor/harbor/src/ui/utils" ) // RepositoryLabelAPI handles requests for adding/removing label to/from repositories and images diff --git a/src/ui/api/repository_label_test.go b/src/ui/api/repository_label_test.go index 30604d6fc..2a89dfd34 100644 --- a/src/ui/api/repository_label_test.go +++ b/src/ui/api/repository_label_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" ) var ( diff --git a/src/ui/api/repository_test.go b/src/ui/api/repository_test.go index b04a7e476..7a9a77679 100644 --- a/src/ui/api/repository_test.go +++ b/src/ui/api/repository_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/dao/project" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/dao/project" + "github.com/goharbor/harbor/src/common/models" ) func TestGetRepos(t *testing.T) { diff --git a/src/ui/api/scan_job.go b/src/ui/api/scan_job.go index 894f0459c..58bfccfef 100644 --- a/src/ui/api/scan_job.go +++ b/src/ui/api/scan_job.go @@ -15,10 +15,10 @@ package api import ( - "github.com/vmware/harbor/src/common/dao" - common_http "github.com/vmware/harbor/src/common/http" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/utils" + "github.com/goharbor/harbor/src/common/dao" + common_http "github.com/goharbor/harbor/src/common/http" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/utils" "fmt" "net/http" diff --git a/src/ui/api/search.go b/src/ui/api/search.go index 94180cc69..9e2b887b1 100644 --- a/src/ui/api/search.go +++ b/src/ui/api/search.go @@ -19,12 +19,12 @@ import ( "net/http" "strings" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" - uiutils "github.com/vmware/harbor/src/ui/utils" + "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/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" + uiutils "github.com/goharbor/harbor/src/ui/utils" ) // SearchAPI handles requesst to /api/search diff --git a/src/ui/api/search_test.go b/src/ui/api/search_test.go index f754825e3..4a20f3ba6 100644 --- a/src/ui/api/search_test.go +++ b/src/ui/api/search_test.go @@ -18,13 +18,13 @@ import ( "net/http" "testing" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/dao" - member "github.com/vmware/harbor/src/common/dao/project" + "github.com/goharbor/harbor/src/common/dao" + member "github.com/goharbor/harbor/src/common/dao/project" ) func TestSearch(t *testing.T) { diff --git a/src/ui/api/statistic.go b/src/ui/api/statistic.go index 71d4ce77e..049cef3e6 100644 --- a/src/ui/api/statistic.go +++ b/src/ui/api/statistic.go @@ -18,9 +18,9 @@ import ( "fmt" "net/http" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" ) const ( diff --git a/src/ui/api/statistic_test.go b/src/ui/api/statistic_test.go index 708cf691d..792496af3 100644 --- a/src/ui/api/statistic_test.go +++ b/src/ui/api/statistic_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - //"github.com/vmware/harbor/tests/apitests/apilib" + //"github.com/goharbor/harbor/tests/apitests/apilib" ) func TestStatisticGet(t *testing.T) { diff --git a/src/ui/api/systeminfo.go b/src/ui/api/systeminfo.go index e19115acb..5f51c8d5f 100644 --- a/src/ui/api/systeminfo.go +++ b/src/ui/api/systeminfo.go @@ -21,14 +21,14 @@ import ( "strings" "sync" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - clairdao "github.com/vmware/harbor/src/common/dao/clair" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/clair" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/dao" + clairdao "github.com/goharbor/harbor/src/common/dao/clair" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/clair" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/config" ) //SystemInfoAPI handle requests for getting system info /api/systeminfo diff --git a/src/ui/api/target.go b/src/ui/api/target.go index 3dbe340cb..fec136080 100644 --- a/src/ui/api/target.go +++ b/src/ui/api/target.go @@ -19,13 +19,13 @@ import ( "net/http" "strconv" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/common/utils/registry" - "github.com/vmware/harbor/src/common/utils/registry/auth" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/registry" + "github.com/goharbor/harbor/src/common/utils/registry/auth" + "github.com/goharbor/harbor/src/ui/config" ) // TargetAPI handles request to /api/targets/ping /api/targets/{} diff --git a/src/ui/api/target_test.go b/src/ui/api/target_test.go index a16889d36..8c505ad55 100644 --- a/src/ui/api/target_test.go +++ b/src/ui/api/target_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/tests/apitests/apilib" + "github.com/goharbor/harbor/tests/apitests/apilib" ) const ( diff --git a/src/ui/api/user.go b/src/ui/api/user.go index 60feda6fa..771e39240 100644 --- a/src/ui/api/user.go +++ b/src/ui/api/user.go @@ -21,12 +21,12 @@ import ( "strconv" "strings" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/config" + "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/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/config" ) // UserAPI handles request to /api/users/{} diff --git a/src/ui/api/user_test.go b/src/ui/api/user_test.go index 687bc0fd6..6fb4cf227 100644 --- a/src/ui/api/user_test.go +++ b/src/ui/api/user_test.go @@ -19,12 +19,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/dao" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/api" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/tests/apitests/apilib" + "github.com/goharbor/harbor/src/common/api" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/tests/apitests/apilib" "github.com/astaxie/beego" ) diff --git a/src/ui/api/usergroup.go b/src/ui/api/usergroup.go index d3c6e3a86..59ee20416 100644 --- a/src/ui/api/usergroup.go +++ b/src/ui/api/usergroup.go @@ -20,12 +20,12 @@ import ( "strconv" "strings" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao/group" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/ldap" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/auth" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/dao/group" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/ldap" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/auth" ) // UserGroupAPI ... diff --git a/src/ui/api/usergroup_test.go b/src/ui/api/usergroup_test.go index d160a0977..aa5b3aa99 100644 --- a/src/ui/api/usergroup_test.go +++ b/src/ui/api/usergroup_test.go @@ -19,11 +19,11 @@ import ( "net/http" "testing" - "github.com/vmware/harbor/src/common" + "github.com/goharbor/harbor/src/common" - "github.com/vmware/harbor/src/common/dao/group" + "github.com/goharbor/harbor/src/common/dao/group" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) const ( diff --git a/src/ui/api/utils.go b/src/ui/api/utils.go index 94b1a54a3..d65cf7c4a 100644 --- a/src/ui/api/utils.go +++ b/src/ui/api/utils.go @@ -20,19 +20,19 @@ import ( "sort" "strings" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/notifier" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/clair" - registry_error "github.com/vmware/harbor/src/common/utils/error" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/common/utils/registry" - "github.com/vmware/harbor/src/common/utils/registry/auth" - "github.com/vmware/harbor/src/ui/config" - "github.com/vmware/harbor/src/ui/promgr" - "github.com/vmware/harbor/src/ui/service/token" - uiutils "github.com/vmware/harbor/src/ui/utils" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/notifier" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/clair" + registry_error "github.com/goharbor/harbor/src/common/utils/error" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/registry" + "github.com/goharbor/harbor/src/common/utils/registry/auth" + "github.com/goharbor/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/promgr" + "github.com/goharbor/harbor/src/ui/service/token" + uiutils "github.com/goharbor/harbor/src/ui/utils" ) // SyncRegistry syncs the repositories of registry with database. diff --git a/src/ui/auth/auth_test.go b/src/ui/auth/auth_test.go index d278118b2..e1273d48b 100644 --- a/src/ui/auth/auth_test.go +++ b/src/ui/auth/auth_test.go @@ -18,8 +18,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/models" ) var l = NewUserLock(2 * time.Second) diff --git a/src/ui/auth/authenticator.go b/src/ui/auth/authenticator.go index 5bbd1058f..bde884ae0 100644 --- a/src/ui/auth/authenticator.go +++ b/src/ui/auth/authenticator.go @@ -19,11 +19,11 @@ import ( "fmt" "time" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/config" + "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/common/utils/log" + "github.com/goharbor/harbor/src/ui/config" ) // 1.5 seconds diff --git a/src/ui/auth/db/db.go b/src/ui/auth/db/db.go index 8000cb8be..e7ecb6c8f 100644 --- a/src/ui/auth/db/db.go +++ b/src/ui/auth/db/db.go @@ -15,9 +15,9 @@ package db import ( - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/ui/auth" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/ui/auth" ) // Auth implements Authenticator interface to authenticate user against DB. diff --git a/src/ui/auth/db/db_test.go b/src/ui/auth/db/db_test.go index 78420ac7a..95e32bd88 100644 --- a/src/ui/auth/db/db_test.go +++ b/src/ui/auth/db/db_test.go @@ -18,14 +18,14 @@ import ( "os" "testing" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/ldap" - "github.com/vmware/harbor/src/ui/auth" - uiConfig "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/ldap" + "github.com/goharbor/harbor/src/ui/auth" + uiConfig "github.com/goharbor/harbor/src/ui/config" ) var adminServerTestConfig = map[string]interface{}{ diff --git a/src/ui/auth/ldap/ldap.go b/src/ui/auth/ldap/ldap.go index 3d81a16f8..5f193aabb 100644 --- a/src/ui/auth/ldap/ldap.go +++ b/src/ui/auth/ldap/ldap.go @@ -19,16 +19,16 @@ import ( "regexp" "strings" - "github.com/vmware/harbor/src/common" + "github.com/goharbor/harbor/src/common" goldap "gopkg.in/ldap.v2" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/dao/group" - "github.com/vmware/harbor/src/common/models" - ldapUtils "github.com/vmware/harbor/src/common/utils/ldap" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/auth" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/dao/group" + "github.com/goharbor/harbor/src/common/models" + ldapUtils "github.com/goharbor/harbor/src/common/utils/ldap" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/auth" + "github.com/goharbor/harbor/src/ui/config" ) // Auth implements AuthenticateHelper interface to authenticate against LDAP diff --git a/src/ui/auth/ldap/ldap_test.go b/src/ui/auth/ldap/ldap_test.go index ead439757..3ade416f5 100644 --- a/src/ui/auth/ldap/ldap_test.go +++ b/src/ui/auth/ldap/ldap_test.go @@ -20,16 +20,16 @@ import ( "os" "testing" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/dao/project" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/ui/api" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/dao/project" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/ui/api" - "github.com/vmware/harbor/src/ui/auth" - uiConfig "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/auth" + uiConfig "github.com/goharbor/harbor/src/ui/config" ) var adminServerLdapTestConfig = map[string]interface{}{ diff --git a/src/ui/auth/uaa/uaa.go b/src/ui/auth/uaa/uaa.go index 8e520ec20..d9c1b6bf3 100644 --- a/src/ui/auth/uaa/uaa.go +++ b/src/ui/auth/uaa/uaa.go @@ -20,13 +20,13 @@ import ( "strings" "sync" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/common/utils/uaa" - "github.com/vmware/harbor/src/ui/auth" - "github.com/vmware/harbor/src/ui/config" + "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/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/uaa" + "github.com/goharbor/harbor/src/ui/auth" + "github.com/goharbor/harbor/src/ui/config" ) // Auth is the implementation of AuthenticateHelper to access uaa for authentication. diff --git a/src/ui/auth/uaa/uaa_test.go b/src/ui/auth/uaa/uaa_test.go index 7ce07dc34..65601df3f 100644 --- a/src/ui/auth/uaa/uaa_test.go +++ b/src/ui/auth/uaa/uaa_test.go @@ -19,12 +19,12 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/test" - utilstest "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/common/utils/uaa" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/test" + utilstest "github.com/goharbor/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/common/utils/uaa" + "github.com/goharbor/harbor/src/ui/config" ) func TestMain(m *testing.M) { diff --git a/src/ui/config/config.go b/src/ui/config/config.go index 95da3a096..698cf4c34 100644 --- a/src/ui/config/config.go +++ b/src/ui/config/config.go @@ -26,17 +26,17 @@ import ( "strconv" "strings" - "github.com/vmware/harbor/src/adminserver/client" - "github.com/vmware/harbor/src/common" - comcfg "github.com/vmware/harbor/src/common/config" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/secret" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/promgr" - "github.com/vmware/harbor/src/ui/promgr/pmsdriver" - "github.com/vmware/harbor/src/ui/promgr/pmsdriver/admiral" - "github.com/vmware/harbor/src/ui/promgr/pmsdriver/local" + "github.com/goharbor/harbor/src/adminserver/client" + "github.com/goharbor/harbor/src/common" + comcfg "github.com/goharbor/harbor/src/common/config" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/secret" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/promgr" + "github.com/goharbor/harbor/src/ui/promgr/pmsdriver" + "github.com/goharbor/harbor/src/ui/promgr/pmsdriver/admiral" + "github.com/goharbor/harbor/src/ui/promgr/pmsdriver/local" ) const ( diff --git a/src/ui/config/config_test.go b/src/ui/config/config_test.go index b66e76cf4..495aeb499 100644 --- a/src/ui/config/config_test.go +++ b/src/ui/config/config_test.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/utils/test" ) // test functions under package ui/config diff --git a/src/ui/controllers/base.go b/src/ui/controllers/base.go index 8cdad8463..65d503c23 100644 --- a/src/ui/controllers/base.go +++ b/src/ui/controllers/base.go @@ -25,14 +25,14 @@ import ( "github.com/astaxie/beego" "github.com/beego/i18n" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - email_util "github.com/vmware/harbor/src/common/utils/email" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/auth" - "github.com/vmware/harbor/src/ui/config" + "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/common/utils" + email_util "github.com/goharbor/harbor/src/common/utils/email" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/auth" + "github.com/goharbor/harbor/src/ui/config" ) // CommonController handles request from UI that doesn't expect a page, such as /SwitchLanguage /logout ... diff --git a/src/ui/controllers/controllers_test.go b/src/ui/controllers/controllers_test.go index a36d32029..c8079853a 100644 --- a/src/ui/controllers/controllers_test.go +++ b/src/ui/controllers/controllers_test.go @@ -27,12 +27,12 @@ import ( "github.com/astaxie/beego" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/ui/config" - "github.com/vmware/harbor/src/ui/proxy" + "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/common/utils/test" + "github.com/goharbor/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/proxy" ) //const ( diff --git a/src/ui/controllers/index.go b/src/ui/controllers/index.go index 22cbd4a9b..32ecaf7ff 100644 --- a/src/ui/controllers/index.go +++ b/src/ui/controllers/index.go @@ -16,7 +16,7 @@ package controllers import ( "github.com/astaxie/beego" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/config" ) // IndexController handles request to / diff --git a/src/ui/controllers/proxy.go b/src/ui/controllers/proxy.go index 607cc72de..11fb93f8e 100644 --- a/src/ui/controllers/proxy.go +++ b/src/ui/controllers/proxy.go @@ -2,7 +2,7 @@ package controllers import ( "github.com/astaxie/beego" - "github.com/vmware/harbor/src/ui/proxy" + "github.com/goharbor/harbor/src/ui/proxy" ) // RegistryProxy is the endpoint on UI for a reverse proxy pointing to registry diff --git a/src/ui/filter/mediatype.go b/src/ui/filter/mediatype.go index 6874856f8..f01613471 100644 --- a/src/ui/filter/mediatype.go +++ b/src/ui/filter/mediatype.go @@ -20,7 +20,7 @@ import ( beegoctx "github.com/astaxie/beego/context" - hlog "github.com/vmware/harbor/src/common/utils/log" + hlog "github.com/goharbor/harbor/src/common/utils/log" ) //MediaTypeFilter filters the POST request, it returns 415 if the content type of the request diff --git a/src/ui/filter/readonly.go b/src/ui/filter/readonly.go index 3764b5554..5d63a93fd 100644 --- a/src/ui/filter/readonly.go +++ b/src/ui/filter/readonly.go @@ -19,8 +19,8 @@ import ( "regexp" "github.com/astaxie/beego/context" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/config" ) const ( diff --git a/src/ui/filter/readonly_test.go b/src/ui/filter/readonly_test.go index 6e769eb42..856a4afe4 100644 --- a/src/ui/filter/readonly_test.go +++ b/src/ui/filter/readonly_test.go @@ -21,9 +21,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common" - utilstest "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common" + utilstest "github.com/goharbor/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/ui/config" ) func TestReadonlyFilter(t *testing.T) { diff --git a/src/ui/filter/security.go b/src/ui/filter/security.go index c9255e4c7..83780c9ba 100644 --- a/src/ui/filter/security.go +++ b/src/ui/filter/security.go @@ -22,18 +22,18 @@ import ( beegoctx "github.com/astaxie/beego/context" "github.com/docker/distribution/reference" - "github.com/vmware/harbor/src/common/models" - secstore "github.com/vmware/harbor/src/common/secret" - "github.com/vmware/harbor/src/common/security" - admr "github.com/vmware/harbor/src/common/security/admiral" - "github.com/vmware/harbor/src/common/security/admiral/authcontext" - "github.com/vmware/harbor/src/common/security/local" - "github.com/vmware/harbor/src/common/security/secret" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/auth" - "github.com/vmware/harbor/src/ui/config" - "github.com/vmware/harbor/src/ui/promgr" - "github.com/vmware/harbor/src/ui/promgr/pmsdriver/admiral" + "github.com/goharbor/harbor/src/common/models" + secstore "github.com/goharbor/harbor/src/common/secret" + "github.com/goharbor/harbor/src/common/security" + admr "github.com/goharbor/harbor/src/common/security/admiral" + "github.com/goharbor/harbor/src/common/security/admiral/authcontext" + "github.com/goharbor/harbor/src/common/security/local" + "github.com/goharbor/harbor/src/common/security/secret" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/auth" + "github.com/goharbor/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/promgr" + "github.com/goharbor/harbor/src/ui/promgr/pmsdriver/admiral" ) //ContextValueKey for content value diff --git a/src/ui/filter/security_test.go b/src/ui/filter/security_test.go index 948330e27..4c9110409 100644 --- a/src/ui/filter/security_test.go +++ b/src/ui/filter/security_test.go @@ -29,17 +29,17 @@ import ( beegoctx "github.com/astaxie/beego/context" "github.com/astaxie/beego/session" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - commonsecret "github.com/vmware/harbor/src/common/secret" - "github.com/vmware/harbor/src/common/security" - "github.com/vmware/harbor/src/common/security/local" - "github.com/vmware/harbor/src/common/security/secret" - _ "github.com/vmware/harbor/src/ui/auth/db" - _ "github.com/vmware/harbor/src/ui/auth/ldap" - "github.com/vmware/harbor/src/ui/config" - "github.com/vmware/harbor/src/ui/promgr" - driver_local "github.com/vmware/harbor/src/ui/promgr/pmsdriver/local" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + commonsecret "github.com/goharbor/harbor/src/common/secret" + "github.com/goharbor/harbor/src/common/security" + "github.com/goharbor/harbor/src/common/security/local" + "github.com/goharbor/harbor/src/common/security/secret" + _ "github.com/goharbor/harbor/src/ui/auth/db" + _ "github.com/goharbor/harbor/src/ui/auth/ldap" + "github.com/goharbor/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/promgr" + driver_local "github.com/goharbor/harbor/src/ui/promgr/pmsdriver/local" ) func TestMain(m *testing.M) { diff --git a/src/ui/main.go b/src/ui/main.go index 19e96665b..5a565ba71 100644 --- a/src/ui/main.go +++ b/src/ui/main.go @@ -21,26 +21,26 @@ import ( "reflect" "strconv" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" "github.com/astaxie/beego" _ "github.com/astaxie/beego/session/redis" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/notifier" - "github.com/vmware/harbor/src/common/scheduler" - "github.com/vmware/harbor/src/replication/core" - _ "github.com/vmware/harbor/src/replication/event" - "github.com/vmware/harbor/src/ui/api" - _ "github.com/vmware/harbor/src/ui/auth/db" - _ "github.com/vmware/harbor/src/ui/auth/ldap" - _ "github.com/vmware/harbor/src/ui/auth/uaa" - "github.com/vmware/harbor/src/ui/config" - "github.com/vmware/harbor/src/ui/filter" - "github.com/vmware/harbor/src/ui/proxy" - "github.com/vmware/harbor/src/ui/service/token" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/notifier" + "github.com/goharbor/harbor/src/common/scheduler" + "github.com/goharbor/harbor/src/replication/core" + _ "github.com/goharbor/harbor/src/replication/event" + "github.com/goharbor/harbor/src/ui/api" + _ "github.com/goharbor/harbor/src/ui/auth/db" + _ "github.com/goharbor/harbor/src/ui/auth/ldap" + _ "github.com/goharbor/harbor/src/ui/auth/uaa" + "github.com/goharbor/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/filter" + "github.com/goharbor/harbor/src/ui/proxy" + "github.com/goharbor/harbor/src/ui/service/token" ) const ( diff --git a/src/ui/promgr/metamgr/metamgr.go b/src/ui/promgr/metamgr/metamgr.go index bfd54aa7c..7613cda68 100644 --- a/src/ui/promgr/metamgr/metamgr.go +++ b/src/ui/promgr/metamgr/metamgr.go @@ -15,8 +15,8 @@ package metamgr import ( - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" ) // ProjectMetadataManager defines the operations that a project metadata manager should diff --git a/src/ui/promgr/metamgr/metamgr_test.go b/src/ui/promgr/metamgr/metamgr_test.go index a197a79a9..32f1fa823 100644 --- a/src/ui/promgr/metamgr/metamgr_test.go +++ b/src/ui/promgr/metamgr/metamgr_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/utils/test" ) var mgr = NewDefaultProjectMetadataManager() diff --git a/src/ui/promgr/pmsdriver/admiral/admiral.go b/src/ui/promgr/pmsdriver/admiral/admiral.go index f41e9adaf..12367e7b8 100644 --- a/src/ui/promgr/pmsdriver/admiral/admiral.go +++ b/src/ui/promgr/pmsdriver/admiral/admiral.go @@ -26,11 +26,11 @@ import ( "strconv" "strings" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - er "github.com/vmware/harbor/src/common/utils/error" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/promgr/pmsdriver" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" + er "github.com/goharbor/harbor/src/common/utils/error" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/promgr/pmsdriver" ) const dupProjectPattern = `Project name '\w+' is already used` diff --git a/src/ui/promgr/pmsdriver/admiral/admiral_test.go b/src/ui/promgr/pmsdriver/admiral/admiral_test.go index 22efaccfb..c4aadfc14 100644 --- a/src/ui/promgr/pmsdriver/admiral/admiral_test.go +++ b/src/ui/promgr/pmsdriver/admiral/admiral_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/models" - errutil "github.com/vmware/harbor/src/common/utils/error" + "github.com/goharbor/harbor/src/common/models" + errutil "github.com/goharbor/harbor/src/common/utils/error" ) var ( diff --git a/src/ui/promgr/pmsdriver/driver.go b/src/ui/promgr/pmsdriver/driver.go index d5b2ae757..45b198a30 100644 --- a/src/ui/promgr/pmsdriver/driver.go +++ b/src/ui/promgr/pmsdriver/driver.go @@ -15,7 +15,7 @@ package pmsdriver import ( - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) // PMSDriver defines the operations that a project management service driver diff --git a/src/ui/promgr/pmsdriver/local/local.go b/src/ui/promgr/pmsdriver/local/local.go index 826b62b4b..e023b8c08 100644 --- a/src/ui/promgr/pmsdriver/local/local.go +++ b/src/ui/promgr/pmsdriver/local/local.go @@ -19,13 +19,13 @@ import ( "regexp" "time" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/dao/group" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - errutil "github.com/vmware/harbor/src/common/utils/error" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/promgr/pmsdriver" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/dao/group" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" + errutil "github.com/goharbor/harbor/src/common/utils/error" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/promgr/pmsdriver" ) const dupProjectPattern = `duplicate key value violates unique constraint \"project_name_key\"` diff --git a/src/ui/promgr/pmsdriver/local/local_test.go b/src/ui/promgr/pmsdriver/local/local_test.go index a0287444e..b30b48ed3 100644 --- a/src/ui/promgr/pmsdriver/local/local_test.go +++ b/src/ui/promgr/pmsdriver/local/local_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/common/models" - errutil "github.com/vmware/harbor/src/common/utils/error" - "github.com/vmware/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/common/models" + errutil "github.com/goharbor/harbor/src/common/utils/error" + "github.com/goharbor/harbor/src/common/utils/test" ) func TestMain(m *testing.M) { diff --git a/src/ui/promgr/promgr.go b/src/ui/promgr/promgr.go index 2d3b8322e..460f1f2c5 100644 --- a/src/ui/promgr/promgr.go +++ b/src/ui/promgr/promgr.go @@ -18,10 +18,10 @@ import ( "fmt" "strconv" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/promgr/metamgr" - "github.com/vmware/harbor/src/ui/promgr/pmsdriver" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/promgr/metamgr" + "github.com/goharbor/harbor/src/ui/promgr/pmsdriver" ) // ProjectManager is the project mamager which abstracts the operations related diff --git a/src/ui/promgr/promgr_test.go b/src/ui/promgr/promgr_test.go index 061200316..51ed38afb 100644 --- a/src/ui/promgr/promgr_test.go +++ b/src/ui/promgr/promgr_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/ui/promgr/pmsdriver" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/ui/promgr/pmsdriver" ) type fakePMSDriver struct { diff --git a/src/ui/proxy/interceptor_test.go b/src/ui/proxy/interceptor_test.go index 7f6bdd303..f81e61f23 100644 --- a/src/ui/proxy/interceptor_test.go +++ b/src/ui/proxy/interceptor_test.go @@ -3,13 +3,13 @@ package proxy import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware/harbor/src/adminserver/client" - "github.com/vmware/harbor/src/common" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - notarytest "github.com/vmware/harbor/src/common/utils/notary/test" - utilstest "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/adminserver/client" + "github.com/goharbor/harbor/src/common" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + notarytest "github.com/goharbor/harbor/src/common/utils/notary/test" + utilstest "github.com/goharbor/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/ui/config" "net/http" "net/http/httptest" diff --git a/src/ui/proxy/interceptors.go b/src/ui/proxy/interceptors.go index 75fc737c3..6aa896837 100644 --- a/src/ui/proxy/interceptors.go +++ b/src/ui/proxy/interceptors.go @@ -3,14 +3,14 @@ package proxy import ( "encoding/json" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/clair" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/common/utils/notary" - "github.com/vmware/harbor/src/ui/config" - "github.com/vmware/harbor/src/ui/promgr" - uiutils "github.com/vmware/harbor/src/ui/utils" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/clair" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/notary" + "github.com/goharbor/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/promgr" + uiutils "github.com/goharbor/harbor/src/ui/utils" "context" "fmt" diff --git a/src/ui/proxy/proxy.go b/src/ui/proxy/proxy.go index ad47e653e..25b3b74d6 100644 --- a/src/ui/proxy/proxy.go +++ b/src/ui/proxy/proxy.go @@ -1,7 +1,7 @@ package proxy import ( - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/config" "fmt" "net/http" diff --git a/src/ui/router.go b/src/ui/router.go index e9e31ada8..f6027f9fb 100644 --- a/src/ui/router.go +++ b/src/ui/router.go @@ -15,14 +15,14 @@ package main import ( - "github.com/vmware/harbor/src/ui/api" - "github.com/vmware/harbor/src/ui/config" - "github.com/vmware/harbor/src/ui/controllers" - "github.com/vmware/harbor/src/ui/service/notifications/admin" - "github.com/vmware/harbor/src/ui/service/notifications/clair" - "github.com/vmware/harbor/src/ui/service/notifications/jobs" - "github.com/vmware/harbor/src/ui/service/notifications/registry" - "github.com/vmware/harbor/src/ui/service/token" + "github.com/goharbor/harbor/src/ui/api" + "github.com/goharbor/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/controllers" + "github.com/goharbor/harbor/src/ui/service/notifications/admin" + "github.com/goharbor/harbor/src/ui/service/notifications/clair" + "github.com/goharbor/harbor/src/ui/service/notifications/jobs" + "github.com/goharbor/harbor/src/ui/service/notifications/registry" + "github.com/goharbor/harbor/src/ui/service/token" "github.com/astaxie/beego" ) diff --git a/src/ui/service/notifications/admin/handler.go b/src/ui/service/notifications/admin/handler.go index b37db9ea8..426f0a691 100644 --- a/src/ui/service/notifications/admin/handler.go +++ b/src/ui/service/notifications/admin/handler.go @@ -17,12 +17,12 @@ package admin import ( "encoding/json" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/job" - job_model "github.com/vmware/harbor/src/common/job/models" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/api" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/job" + job_model "github.com/goharbor/harbor/src/common/job/models" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/api" ) var statusMap = map[string]string{ diff --git a/src/ui/service/notifications/clair/handler.go b/src/ui/service/notifications/clair/handler.go index 0dcd852b0..d00e2c0c0 100644 --- a/src/ui/service/notifications/clair/handler.go +++ b/src/ui/service/notifications/clair/handler.go @@ -18,13 +18,13 @@ import ( "encoding/json" "time" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/clair" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/api" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/clair" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/api" + "github.com/goharbor/harbor/src/ui/config" ) const ( diff --git a/src/ui/service/notifications/jobs/handler.go b/src/ui/service/notifications/jobs/handler.go index ad2cb682a..4aeb442c9 100644 --- a/src/ui/service/notifications/jobs/handler.go +++ b/src/ui/service/notifications/jobs/handler.go @@ -17,12 +17,12 @@ package jobs import ( "encoding/json" - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/job" - jobmodels "github.com/vmware/harbor/src/common/job/models" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/api" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/job" + jobmodels "github.com/goharbor/harbor/src/common/job/models" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/api" ) var statusMap = map[string]string{ diff --git a/src/ui/service/notifications/registry/handler.go b/src/ui/service/notifications/registry/handler.go index 750bbf47b..ca7a0c736 100644 --- a/src/ui/service/notifications/registry/handler.go +++ b/src/ui/service/notifications/registry/handler.go @@ -20,17 +20,17 @@ import ( "strings" "time" - "github.com/vmware/harbor/src/common/dao" - clairdao "github.com/vmware/harbor/src/common/dao/clair" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/notifier" - "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/common/utils/log" - rep_notification "github.com/vmware/harbor/src/replication/event/notification" - "github.com/vmware/harbor/src/replication/event/topic" - "github.com/vmware/harbor/src/ui/api" - "github.com/vmware/harbor/src/ui/config" - uiutils "github.com/vmware/harbor/src/ui/utils" + "github.com/goharbor/harbor/src/common/dao" + clairdao "github.com/goharbor/harbor/src/common/dao/clair" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/notifier" + "github.com/goharbor/harbor/src/common/utils" + "github.com/goharbor/harbor/src/common/utils/log" + rep_notification "github.com/goharbor/harbor/src/replication/event/notification" + "github.com/goharbor/harbor/src/replication/event/topic" + "github.com/goharbor/harbor/src/ui/api" + "github.com/goharbor/harbor/src/ui/config" + uiutils "github.com/goharbor/harbor/src/ui/utils" ) // NotificationHandler handles request on /service/notifications/, which listens to registry's events. diff --git a/src/ui/service/token/authutils.go b/src/ui/service/token/authutils.go index 79b5140a9..b324c7766 100644 --- a/src/ui/service/token/authutils.go +++ b/src/ui/service/token/authutils.go @@ -25,11 +25,11 @@ import ( "github.com/docker/distribution/registry/auth/token" "github.com/docker/libtrust" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/security" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/config" - "github.com/vmware/harbor/src/ui/promgr" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/security" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/promgr" ) const ( diff --git a/src/ui/service/token/creator.go b/src/ui/service/token/creator.go index df3b14e3d..fe6ea395f 100644 --- a/src/ui/service/token/creator.go +++ b/src/ui/service/token/creator.go @@ -21,12 +21,12 @@ import ( "strings" "github.com/docker/distribution/registry/auth/token" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/security" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/ui/config" - "github.com/vmware/harbor/src/ui/filter" - "github.com/vmware/harbor/src/ui/promgr" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/security" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/filter" + "github.com/goharbor/harbor/src/ui/promgr" ) var creatorMap map[string]Creator diff --git a/src/ui/service/token/token.go b/src/ui/service/token/token.go index fe1518aef..8546b201e 100644 --- a/src/ui/service/token/token.go +++ b/src/ui/service/token/token.go @@ -19,7 +19,7 @@ import ( "net/http" "github.com/astaxie/beego" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/log" ) // Handler handles request on /service/token, which is the auth provider for registry. diff --git a/src/ui/service/token/token_test.go b/src/ui/service/token/token_test.go index 2ef32dbe9..1fc78a338 100644 --- a/src/ui/service/token/token_test.go +++ b/src/ui/service/token/token_test.go @@ -29,9 +29,9 @@ import ( "runtime" "testing" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/test" + "github.com/goharbor/harbor/src/ui/config" ) func TestMain(m *testing.M) { diff --git a/src/ui/utils/job.go b/src/ui/utils/job.go index caa6df318..13b49f8c5 100644 --- a/src/ui/utils/job.go +++ b/src/ui/utils/job.go @@ -16,13 +16,13 @@ package utils import ( - "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/job" - jobmodels "github.com/vmware/harbor/src/common/job/models" - "github.com/vmware/harbor/src/common/models" - "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/common/utils/registry" - "github.com/vmware/harbor/src/ui/config" + "github.com/goharbor/harbor/src/common/dao" + "github.com/goharbor/harbor/src/common/job" + jobmodels "github.com/goharbor/harbor/src/common/job/models" + "github.com/goharbor/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/utils/registry" + "github.com/goharbor/harbor/src/ui/config" "encoding/json" "fmt" diff --git a/src/ui/utils/response_handlers.go b/src/ui/utils/response_handlers.go index 7a4f76c13..64761601d 100644 --- a/src/ui/utils/response_handlers.go +++ b/src/ui/utils/response_handlers.go @@ -20,8 +20,8 @@ import ( "io/ioutil" "net/http" - "github.com/vmware/harbor/src/common/api" - "github.com/vmware/harbor/src/common/utils/log" + "github.com/goharbor/harbor/src/common/api" + "github.com/goharbor/harbor/src/common/utils/log" ) //ResponseHandler provides utility to handle http response. diff --git a/src/ui/utils/utils.go b/src/ui/utils/utils.go index 7557f2fb1..3d7f9cc0d 100644 --- a/src/ui/utils/utils.go +++ b/src/ui/utils/utils.go @@ -16,10 +16,10 @@ package utils import ( - "github.com/vmware/harbor/src/common/utils/registry" - "github.com/vmware/harbor/src/common/utils/registry/auth" - "github.com/vmware/harbor/src/ui/config" - "github.com/vmware/harbor/src/ui/service/token" + "github.com/goharbor/harbor/src/common/utils/registry" + "github.com/goharbor/harbor/src/common/utils/registry/auth" + "github.com/goharbor/harbor/src/ui/config" + "github.com/goharbor/harbor/src/ui/service/token" "net/http" ) diff --git a/tests/apitests/api-testing/envs/environment.go b/tests/apitests/api-testing/envs/environment.go index 3b8ab8061..8e86f5807 100644 --- a/tests/apitests/api-testing/envs/environment.go +++ b/tests/apitests/api-testing/envs/environment.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/vmware/harbor/tests/apitests/api-testing/client" + "github.com/goharbor/harbor/tests/apitests/api-testing/client" ) //Environment keeps the testing env info diff --git a/tests/apitests/api-testing/lib/image.go b/tests/apitests/api-testing/lib/image.go index 6775d7478..231d64ff3 100644 --- a/tests/apitests/api-testing/lib/image.go +++ b/tests/apitests/api-testing/lib/image.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/vmware/harbor/tests/apitests/api-testing/client" - "github.com/vmware/harbor/tests/apitests/api-testing/models" + "github.com/goharbor/harbor/tests/apitests/api-testing/client" + "github.com/goharbor/harbor/tests/apitests/api-testing/models" ) //ImageUtil : For repository and tag functions diff --git a/tests/apitests/api-testing/lib/project.go b/tests/apitests/api-testing/lib/project.go index e9cdbb9a1..2d0264338 100644 --- a/tests/apitests/api-testing/lib/project.go +++ b/tests/apitests/api-testing/lib/project.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/vmware/harbor/tests/apitests/api-testing/client" - "github.com/vmware/harbor/tests/apitests/api-testing/models" + "github.com/goharbor/harbor/tests/apitests/api-testing/client" + "github.com/goharbor/harbor/tests/apitests/api-testing/models" ) //ProjectUtil : Util methods for project related diff --git a/tests/apitests/api-testing/lib/system.go b/tests/apitests/api-testing/lib/system.go index c7cc77d3d..456de073e 100644 --- a/tests/apitests/api-testing/lib/system.go +++ b/tests/apitests/api-testing/lib/system.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/vmware/harbor/tests/apitests/api-testing/client" - "github.com/vmware/harbor/tests/apitests/api-testing/models" + "github.com/goharbor/harbor/tests/apitests/api-testing/client" + "github.com/goharbor/harbor/tests/apitests/api-testing/models" ) //SystemUtil : For getting system info diff --git a/tests/apitests/api-testing/lib/user.go b/tests/apitests/api-testing/lib/user.go index 5bb639e56..ab820dbd8 100644 --- a/tests/apitests/api-testing/lib/user.go +++ b/tests/apitests/api-testing/lib/user.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/vmware/harbor/tests/apitests/api-testing/client" - "github.com/vmware/harbor/tests/apitests/api-testing/models" + "github.com/goharbor/harbor/tests/apitests/api-testing/client" + "github.com/goharbor/harbor/tests/apitests/api-testing/models" ) //UserUtil : For user related diff --git a/tests/apitests/api-testing/tests/suites/base/suite.go b/tests/apitests/api-testing/tests/suites/base/suite.go index f10b9ca65..31a11cfd2 100644 --- a/tests/apitests/api-testing/tests/suites/base/suite.go +++ b/tests/apitests/api-testing/tests/suites/base/suite.go @@ -3,8 +3,8 @@ package base import ( "fmt" - "github.com/vmware/harbor/tests/apitests/api-testing/envs" - "github.com/vmware/harbor/tests/apitests/api-testing/lib" + "github.com/goharbor/harbor/tests/apitests/api-testing/envs" + "github.com/goharbor/harbor/tests/apitests/api-testing/lib" ) //ConcourseCiSuite : Provides some base cases diff --git a/tests/apitests/api-testing/tests/suites/suite.go b/tests/apitests/api-testing/tests/suites/suite.go index c95add3d1..49fa78f29 100644 --- a/tests/apitests/api-testing/tests/suites/suite.go +++ b/tests/apitests/api-testing/tests/suites/suite.go @@ -1,8 +1,8 @@ package suites import ( - "github.com/vmware/harbor/tests/apitests/api-testing/envs" - "github.com/vmware/harbor/tests/apitests/api-testing/lib" + "github.com/goharbor/harbor/tests/apitests/api-testing/envs" + "github.com/goharbor/harbor/tests/apitests/api-testing/lib" ) //Suite : Run a group of test cases diff --git a/tests/apitests/api-testing/tests/suites/suite01/run_test.go b/tests/apitests/api-testing/tests/suites/suite01/run_test.go index c86166f48..c8b3f746a 100644 --- a/tests/apitests/api-testing/tests/suites/suite01/run_test.go +++ b/tests/apitests/api-testing/tests/suites/suite01/run_test.go @@ -3,7 +3,7 @@ package suite01 import ( "testing" - "github.com/vmware/harbor/tests/apitests/api-testing/envs" + "github.com/goharbor/harbor/tests/apitests/api-testing/envs" ) //TestRun : Start to run the case diff --git a/tests/apitests/api-testing/tests/suites/suite01/suite.go b/tests/apitests/api-testing/tests/suites/suite01/suite.go index 8f5ce1f0a..b23221fb6 100644 --- a/tests/apitests/api-testing/tests/suites/suite01/suite.go +++ b/tests/apitests/api-testing/tests/suites/suite01/suite.go @@ -3,9 +3,9 @@ package suite01 import ( "fmt" - "github.com/vmware/harbor/tests/apitests/api-testing/envs" - "github.com/vmware/harbor/tests/apitests/api-testing/lib" - "github.com/vmware/harbor/tests/apitests/api-testing/tests/suites/base" + "github.com/goharbor/harbor/tests/apitests/api-testing/envs" + "github.com/goharbor/harbor/tests/apitests/api-testing/lib" + "github.com/goharbor/harbor/tests/apitests/api-testing/tests/suites/base" ) //Steps of suite01: diff --git a/tests/apitests/api-testing/tests/suites/suite02/run_test.go b/tests/apitests/api-testing/tests/suites/suite02/run_test.go index beb3af96a..352e3cb72 100644 --- a/tests/apitests/api-testing/tests/suites/suite02/run_test.go +++ b/tests/apitests/api-testing/tests/suites/suite02/run_test.go @@ -3,7 +3,7 @@ package suite02 import ( "testing" - "github.com/vmware/harbor/tests/apitests/api-testing/envs" + "github.com/goharbor/harbor/tests/apitests/api-testing/envs" ) //TestRun : Start to run the case diff --git a/tests/apitests/api-testing/tests/suites/suite02/suite.go b/tests/apitests/api-testing/tests/suites/suite02/suite.go index 454ea9de9..46270aeee 100644 --- a/tests/apitests/api-testing/tests/suites/suite02/suite.go +++ b/tests/apitests/api-testing/tests/suites/suite02/suite.go @@ -3,9 +3,9 @@ package suite02 import ( "fmt" - "github.com/vmware/harbor/tests/apitests/api-testing/envs" - "github.com/vmware/harbor/tests/apitests/api-testing/lib" - "github.com/vmware/harbor/tests/apitests/api-testing/tests/suites/base" + "github.com/goharbor/harbor/tests/apitests/api-testing/envs" + "github.com/goharbor/harbor/tests/apitests/api-testing/lib" + "github.com/goharbor/harbor/tests/apitests/api-testing/tests/suites/base" ) //Steps of suite01: diff --git a/tests/apitests/apilib/search.go b/tests/apitests/apilib/search.go index 447763d9b..e25ba0847 100644 --- a/tests/apitests/apilib/search.go +++ b/tests/apitests/apilib/search.go @@ -23,7 +23,7 @@ package apilib import ( - "github.com/vmware/harbor/src/common/models" + "github.com/goharbor/harbor/src/common/models" ) type Search struct { diff --git a/tests/coverage4gotest.sh b/tests/coverage4gotest.sh index 24f5c43ed..6684342f9 100755 --- a/tests/coverage4gotest.sh +++ b/tests/coverage4gotest.sh @@ -13,7 +13,7 @@ function listDeps(){ ds=$(echo $(go list -f '{{.Imports}}' $pkg) | sed 's/[][]//g') for d in $ds do - if echo $d | grep -q "github.com/vmware/harbor" && echo $d | grep -qv "vendor" + if echo $d | grep -q "github.com/goharbor/harbor" && echo $d | grep -qv "vendor" then deps="$deps,$d" fi