Relocate/rename some packages (#11183)

Fixes #11016
1. src/pkg/q->src/internal/q
2. src/internal->src/lib (internal is a reserved package name of golang)
3. src/api->src/controller

Signed-off-by: Wenkai Yin <yinw@vmware.com>

src/chartserver/reverse_proxy.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/goharbor/harbor/src/api/event/metadata"
+	"github.com/goharbor/harbor/src/controller/event/metadata"
 	"io/ioutil"
 	"log"
 	"net/http"

src/common/http/client.go

@@ -25,7 +25,7 @@ import (
 	"reflect"
 
 	"github.com/goharbor/harbor/src/common/http/modifier"
-	"github.com/goharbor/harbor/src/internal"
+	"github.com/goharbor/harbor/src/lib"
 )
 
 const (
@@ -264,7 +264,7 @@ func (c *Client) GetAndIteratePagination(endpoint string, v interface{}) error {
 		resources = reflect.AppendSlice(resources, reflect.Indirect(res))
 
 		endpoint = ""
-		links := internal.ParseLinks(resp.Header.Get("Link"))
+		links := lib.ParseLinks(resp.Header.Get("Link"))
 		for _, link := range links {
 			if link.Rel == "next" {
 				endpoint = url.Scheme + "://" + url.Host + link.URL

src/controller/artifact/abstractor.go

@@ -21,7 +21,7 @@ import (
 	"github.com/docker/distribution/manifest/manifestlist"
 	"github.com/docker/distribution/manifest/schema1"
 	"github.com/docker/distribution/manifest/schema2"
-	"github.com/goharbor/harbor/src/api/artifact/processor"
+	"github.com/goharbor/harbor/src/controller/artifact/processor"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/pkg/registry"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"

src/controller/artifact/abstractor_test.go

@@ -18,7 +18,7 @@ import (
 	"github.com/docker/distribution"
 	"github.com/docker/distribution/manifest/schema1"
 	"github.com/docker/distribution/manifest/schema2"
-	"github.com/goharbor/harbor/src/api/artifact/processor"
+	"github.com/goharbor/harbor/src/controller/artifact/processor"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	tart "github.com/goharbor/harbor/src/testing/pkg/artifact"
 	"github.com/goharbor/harbor/src/testing/pkg/registry"

src/controller/artifact/controller.go

@@ -19,11 +19,25 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/goharbor/harbor/src/api/artifact/processor"
-	"github.com/goharbor/harbor/src/api/event/metadata"
-	"github.com/goharbor/harbor/src/api/tag"
-	"github.com/goharbor/harbor/src/internal"
-	"github.com/goharbor/harbor/src/internal/orm"
+	"strings"
+	"time"
+
+	// registry image resolvers
+	_ "github.com/goharbor/harbor/src/controller/artifact/processor/image"
+	// register chart resolver
+	_ "github.com/goharbor/harbor/src/controller/artifact/processor/chart"
+	// register CNAB resolver
+	_ "github.com/goharbor/harbor/src/controller/artifact/processor/cnab"
+
+	"github.com/goharbor/harbor/src/common/utils/log"
+	"github.com/goharbor/harbor/src/controller/artifact/processor"
+	"github.com/goharbor/harbor/src/controller/event/metadata"
+	"github.com/goharbor/harbor/src/controller/tag"
+	"github.com/goharbor/harbor/src/lib"
+	ierror "github.com/goharbor/harbor/src/lib/error"
+	"github.com/goharbor/harbor/src/lib/orm"
+	"github.com/goharbor/harbor/src/lib/q"
+	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/pkg/artifactrash"
 	"github.com/goharbor/harbor/src/pkg/artifactrash/model"
 	"github.com/goharbor/harbor/src/pkg/blob"
@@ -32,23 +46,10 @@ import (
 	"github.com/goharbor/harbor/src/pkg/label"
 	"github.com/goharbor/harbor/src/pkg/notification"
 	"github.com/goharbor/harbor/src/pkg/registry"
+	"github.com/goharbor/harbor/src/pkg/repository"
 	"github.com/goharbor/harbor/src/pkg/signature"
 	model_tag "github.com/goharbor/harbor/src/pkg/tag/model/tag"
 	"github.com/opencontainers/go-digest"
-	"strings"
-	"time"
-
-	// registry image resolvers
-	_ "github.com/goharbor/harbor/src/api/artifact/processor/image"
-	// register chart resolver
-	_ "github.com/goharbor/harbor/src/api/artifact/processor/chart"
-	// register CNAB resolver
-	_ "github.com/goharbor/harbor/src/api/artifact/processor/cnab"
-	"github.com/goharbor/harbor/src/common/utils/log"
-	ierror "github.com/goharbor/harbor/src/internal/error"
-	"github.com/goharbor/harbor/src/pkg/artifact"
-	"github.com/goharbor/harbor/src/pkg/q"
-	"github.com/goharbor/harbor/src/pkg/repository"
 )
 
 var (
@@ -583,7 +584,7 @@ func (c *controller) populateLabels(ctx context.Context, art *Artifact) {
 func (c *controller) populateAdditionLinks(ctx context.Context, artifact *Artifact) {
 	types := processor.Get(artifact.MediaType).ListAdditionTypes()
 	if len(types) > 0 {
-		version := internal.GetAPIVersion(ctx)
+		version := lib.GetAPIVersion(ctx)
 		for _, t := range types {
 			artifact.SetAdditionLink(strings.ToLower(t), version)
 		}

src/controller/artifact/controller_test.go

@@ -19,13 +19,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/goharbor/harbor/src/api/tag"
 	"github.com/goharbor/harbor/src/common/models"
-	"github.com/goharbor/harbor/src/internal"
-	ierror "github.com/goharbor/harbor/src/internal/error"
-	"github.com/goharbor/harbor/src/internal/orm"
+	"github.com/goharbor/harbor/src/controller/tag"
+	"github.com/goharbor/harbor/src/lib"
+	ierror "github.com/goharbor/harbor/src/lib/error"
+	"github.com/goharbor/harbor/src/lib/orm"
+	"github.com/goharbor/harbor/src/lib/q"
 	"github.com/goharbor/harbor/src/pkg/artifact"
-	"github.com/goharbor/harbor/src/pkg/q"
 	model_tag "github.com/goharbor/harbor/src/pkg/tag/model/tag"
 	tagtesting "github.com/goharbor/harbor/src/testing/api/tag"
 	ormtesting "github.com/goharbor/harbor/src/testing/lib/orm"
@@ -113,7 +113,7 @@ func (c *controllerTestSuite) TestAssembleArtifact() {
 		},
 	}
 	c.tagCtl.On("List").Return([]*tag.Tag{tg}, nil)
-	ctx := internal.WithAPIVersion(nil, "2.0")
+	ctx := lib.WithAPIVersion(nil, "2.0")
 	lb := &models.Label{
 		ID:   1,
 		Name: "label",

src/controller/artifact/model.go

@@ -18,9 +18,9 @@ import (
 	"fmt"
 	"github.com/goharbor/harbor/src/server/v2.0/models"
 
-	"github.com/goharbor/harbor/src/api/tag"
 	cmodels "github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/common/utils"
+	"github.com/goharbor/harbor/src/controller/tag"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 )
 

src/controller/artifact/processor/base/index.go

@@ -16,8 +16,8 @@ package base
 
 import (
 	"context"
-	"github.com/goharbor/harbor/src/api/artifact/processor"
-	ierror "github.com/goharbor/harbor/src/internal/error"
+	"github.com/goharbor/harbor/src/controller/artifact/processor"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/pkg/registry"
 )

src/controller/artifact/processor/base/manifest.go

@@ -17,8 +17,8 @@ package base
 import (
 	"context"
 	"encoding/json"
-	"github.com/goharbor/harbor/src/api/artifact/processor"
-	ierror "github.com/goharbor/harbor/src/internal/error"
+	"github.com/goharbor/harbor/src/controller/artifact/processor"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/pkg/registry"
 	"github.com/opencontainers/image-spec/specs-go/v1"

src/controller/artifact/processor/chart/chart.go

@@ -19,10 +19,10 @@ import (
 	"encoding/json"
 	"io/ioutil"
 
-	ps "github.com/goharbor/harbor/src/api/artifact/processor"
-	"github.com/goharbor/harbor/src/api/artifact/processor/base"
 	"github.com/goharbor/harbor/src/common/utils/log"
-	ierror "github.com/goharbor/harbor/src/internal/error"
+	ps "github.com/goharbor/harbor/src/controller/artifact/processor"
+	"github.com/goharbor/harbor/src/controller/artifact/processor/base"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/pkg/chart"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"

src/controller/artifact/processor/chart/chart_test.go

@@ -16,8 +16,8 @@ package chart
 
 import (
 	"github.com/docker/distribution"
-	"github.com/goharbor/harbor/src/api/artifact/processor/base"
-	ierror "github.com/goharbor/harbor/src/internal/error"
+	"github.com/goharbor/harbor/src/controller/artifact/processor/base"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	chartserver "github.com/goharbor/harbor/src/pkg/chart"
 	"github.com/goharbor/harbor/src/testing/pkg/chart"

src/controller/artifact/processor/cnab/cnab.go

@@ -17,9 +17,9 @@ package cnab
 import (
 	"context"
 
-	ps "github.com/goharbor/harbor/src/api/artifact/processor"
-	"github.com/goharbor/harbor/src/api/artifact/processor/base"
 	"github.com/goharbor/harbor/src/common/utils/log"
+	ps "github.com/goharbor/harbor/src/controller/artifact/processor"
+	"github.com/goharbor/harbor/src/controller/artifact/processor/base"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 )
 

src/controller/artifact/processor/cnab/cnab_test.go

@@ -16,7 +16,7 @@ package cnab
 
 import (
 	"github.com/docker/distribution"
-	"github.com/goharbor/harbor/src/api/artifact/processor/base"
+	"github.com/goharbor/harbor/src/controller/artifact/processor/base"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/testing/pkg/registry"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"

src/controller/artifact/processor/default.go

@@ -16,7 +16,7 @@ package processor
 
 import (
 	"context"
-	ierror "github.com/goharbor/harbor/src/internal/error"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"regexp"
 	"strings"

src/controller/artifact/processor/image/index.go

@@ -16,9 +16,9 @@ package image
 
 import (
 	"github.com/docker/distribution/manifest/manifestlist"
-	"github.com/goharbor/harbor/src/api/artifact/processor"
-	"github.com/goharbor/harbor/src/api/artifact/processor/base"
 	"github.com/goharbor/harbor/src/common/utils/log"
+	"github.com/goharbor/harbor/src/controller/artifact/processor"
+	"github.com/goharbor/harbor/src/controller/artifact/processor/base"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 )
 

src/controller/artifact/processor/image/manifest_v1.go

@@ -18,9 +18,9 @@ import (
 	"context"
 	"encoding/json"
 	"github.com/docker/distribution/manifest/schema1"
-	"github.com/goharbor/harbor/src/api/artifact/processor"
 	"github.com/goharbor/harbor/src/common/utils/log"
-	ierror "github.com/goharbor/harbor/src/internal/error"
+	"github.com/goharbor/harbor/src/controller/artifact/processor"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 )
 

src/controller/artifact/processor/image/manifest_v1_test.go

@@ -15,7 +15,7 @@
 package image
 
 import (
-	ierror "github.com/goharbor/harbor/src/internal/error"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/stretchr/testify/suite"
 	"testing"

src/controller/artifact/processor/image/manifest_v2.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"encoding/json"
 	"github.com/docker/distribution/manifest/schema2"
-	"github.com/goharbor/harbor/src/api/artifact/processor"
-	"github.com/goharbor/harbor/src/api/artifact/processor/base"
 	"github.com/goharbor/harbor/src/common/utils/log"
-	ierror "github.com/goharbor/harbor/src/internal/error"
+	"github.com/goharbor/harbor/src/controller/artifact/processor"
+	"github.com/goharbor/harbor/src/controller/artifact/processor/base"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/opencontainers/image-spec/specs-go/v1"
 )

src/controller/artifact/processor/image/manifest_v2_test.go

@@ -17,8 +17,8 @@ package image
 import (
 	"github.com/docker/distribution"
 	"github.com/docker/distribution/manifest/schema2"
-	"github.com/goharbor/harbor/src/api/artifact/processor/base"
-	ierror "github.com/goharbor/harbor/src/internal/error"
+	"github.com/goharbor/harbor/src/controller/artifact/processor/base"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/testing/pkg/registry"
 	"github.com/stretchr/testify/suite"

src/controller/blob/controller.go

@@ -23,8 +23,8 @@ import (
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/common/utils/log"
 	util "github.com/goharbor/harbor/src/common/utils/redis"
-	ierror "github.com/goharbor/harbor/src/internal/error"
-	"github.com/goharbor/harbor/src/internal/orm"
+	ierror "github.com/goharbor/harbor/src/lib/error"
+	"github.com/goharbor/harbor/src/lib/orm"
 	"github.com/goharbor/harbor/src/pkg/blob"
 )
 

src/controller/chartmuseum/controller.go

@@ -22,11 +22,11 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/goharbor/harbor/src/api/project"
 	"github.com/goharbor/harbor/src/chartserver"
 	"github.com/goharbor/harbor/src/common"
 	"github.com/goharbor/harbor/src/common/config"
 	commonhttp "github.com/goharbor/harbor/src/common/http"
+	"github.com/goharbor/harbor/src/controller/project"
 )
 
 var (

src/controller/event/handler/auditlog/auditlog.go

@@ -17,9 +17,9 @@ package auditlog
 import (
 	"context"
 	beegorm "github.com/astaxie/beego/orm"
-	"github.com/goharbor/harbor/src/api/event"
 	"github.com/goharbor/harbor/src/common/utils/log"
-	"github.com/goharbor/harbor/src/internal/orm"
+	"github.com/goharbor/harbor/src/controller/event"
+	"github.com/goharbor/harbor/src/lib/orm"
 	"github.com/goharbor/harbor/src/pkg/audit"
 	am "github.com/goharbor/harbor/src/pkg/audit/model"
 )

src/controller/event/handler/auditlog/auditlog_test.go

@@ -18,13 +18,13 @@ import (
 	"context"
 	"testing"
 
-	"github.com/goharbor/harbor/src/api/event"
-	"github.com/goharbor/harbor/src/api/event/metadata"
 	common_dao "github.com/goharbor/harbor/src/common/dao"
+	"github.com/goharbor/harbor/src/controller/event"
+	"github.com/goharbor/harbor/src/controller/event/metadata"
+	"github.com/goharbor/harbor/src/lib/q"
 	"github.com/goharbor/harbor/src/pkg/audit/model"
 	"github.com/goharbor/harbor/src/pkg/notifier"
 	ne "github.com/goharbor/harbor/src/pkg/notifier/event"
-	"github.com/goharbor/harbor/src/pkg/q"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 )

src/controller/event/handler/init.go

@@ -1,14 +1,14 @@
 package handler
 
 import (
-	"github.com/goharbor/harbor/src/api/event"
-	"github.com/goharbor/harbor/src/api/event/handler/auditlog"
-	"github.com/goharbor/harbor/src/api/event/handler/internal"
-	"github.com/goharbor/harbor/src/api/event/handler/replication"
-	"github.com/goharbor/harbor/src/api/event/handler/webhook/artifact"
-	"github.com/goharbor/harbor/src/api/event/handler/webhook/chart"
-	"github.com/goharbor/harbor/src/api/event/handler/webhook/quota"
-	"github.com/goharbor/harbor/src/api/event/handler/webhook/scan"
+	"github.com/goharbor/harbor/src/controller/event"
+	"github.com/goharbor/harbor/src/controller/event/handler/auditlog"
+	"github.com/goharbor/harbor/src/controller/event/handler/internal"
+	"github.com/goharbor/harbor/src/controller/event/handler/replication"
+	"github.com/goharbor/harbor/src/controller/event/handler/webhook/artifact"
+	"github.com/goharbor/harbor/src/controller/event/handler/webhook/chart"
+	"github.com/goharbor/harbor/src/controller/event/handler/webhook/quota"
+	"github.com/goharbor/harbor/src/controller/event/handler/webhook/scan"
 	"github.com/goharbor/harbor/src/pkg/notifier"
 )
 

src/controller/event/handler/internal/artifact.go

@@ -17,13 +17,13 @@ package internal
 import (
 	"context"
 	beegorm "github.com/astaxie/beego/orm"
-	"github.com/goharbor/harbor/src/api/artifact"
-	"github.com/goharbor/harbor/src/api/event"
-	"github.com/goharbor/harbor/src/api/repository"
-	"github.com/goharbor/harbor/src/api/tag"
 	"github.com/goharbor/harbor/src/common/utils/log"
-	"github.com/goharbor/harbor/src/internal/orm"
-	"github.com/goharbor/harbor/src/pkg/q"
+	"github.com/goharbor/harbor/src/controller/artifact"
+	"github.com/goharbor/harbor/src/controller/event"
+	"github.com/goharbor/harbor/src/controller/repository"
+	"github.com/goharbor/harbor/src/controller/tag"
+	"github.com/goharbor/harbor/src/lib/orm"
+	"github.com/goharbor/harbor/src/lib/q"
 	"time"
 )
 

src/controller/event/handler/replication/replication.go

@@ -15,8 +15,8 @@
 package replication
 
 import (
-	"github.com/goharbor/harbor/src/api/event"
 	"github.com/goharbor/harbor/src/common/utils/log"
+	"github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/project"
 	"github.com/goharbor/harbor/src/replication"
 	repevent "github.com/goharbor/harbor/src/replication/event"

src/controller/event/handler/webhook/artifact/artifact.go

@@ -18,11 +18,11 @@ import (
 	"context"
 	"fmt"
 	beegorm "github.com/astaxie/beego/orm"
-	"github.com/goharbor/harbor/src/api/event"
-	"github.com/goharbor/harbor/src/api/event/handler/util"
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/common/utils/log"
-	"github.com/goharbor/harbor/src/internal/orm"
+	"github.com/goharbor/harbor/src/controller/event"
+	"github.com/goharbor/harbor/src/controller/event/handler/util"
+	"github.com/goharbor/harbor/src/lib/orm"
 	"github.com/goharbor/harbor/src/pkg/notification"
 	"github.com/goharbor/harbor/src/pkg/notifier/model"
 	notifyModel "github.com/goharbor/harbor/src/pkg/notifier/model"

src/controller/event/handler/webhook/artifact/replication.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/goharbor/harbor/src/api/event"
-	"github.com/goharbor/harbor/src/api/event/handler/util"
 	commonModels "github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/common/utils/log"
+	"github.com/goharbor/harbor/src/controller/event"
+	"github.com/goharbor/harbor/src/controller/event/handler/util"
 	"github.com/goharbor/harbor/src/core/config"
 	"github.com/goharbor/harbor/src/jobservice/job"
 	"github.com/goharbor/harbor/src/pkg/notification"

src/controller/event/handler/webhook/artifact/replication_test.go

@@ -1,8 +1,8 @@
 package artifact
 
 import (
-	"github.com/goharbor/harbor/src/api/event"
 	"github.com/goharbor/harbor/src/common/models"
+	"github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/core/config"
 	"github.com/goharbor/harbor/src/core/promgr/metamgr"
 	"github.com/goharbor/harbor/src/pkg/notification"

src/controller/event/handler/webhook/chart/chart.go

@@ -17,10 +17,10 @@ package chart
 import (
 	"errors"
 	"fmt"
-	"github.com/goharbor/harbor/src/api/event"
-	"github.com/goharbor/harbor/src/api/event/handler/util"
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/common/utils/log"
+	"github.com/goharbor/harbor/src/controller/event"
+	"github.com/goharbor/harbor/src/controller/event/handler/util"
 	"github.com/goharbor/harbor/src/core/config"
 	"github.com/goharbor/harbor/src/pkg/notification"
 	"github.com/goharbor/harbor/src/pkg/notifier/model"

src/controller/event/handler/webhook/chart/chart_test.go

@@ -15,8 +15,8 @@
 package chart
 
 import (
-	"github.com/goharbor/harbor/src/api/event"
 	common_dao "github.com/goharbor/harbor/src/common/dao"
+	"github.com/goharbor/harbor/src/controller/event"
 	"testing"
 
 	"github.com/goharbor/harbor/src/common/models"

src/controller/event/handler/webhook/quota/quota.go

@@ -17,10 +17,10 @@ package quota
 import (
 	"errors"
 	"fmt"
-	"github.com/goharbor/harbor/src/api/event"
-	"github.com/goharbor/harbor/src/api/event/handler/util"
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/common/utils/log"
+	"github.com/goharbor/harbor/src/controller/event"
+	"github.com/goharbor/harbor/src/controller/event/handler/util"
 	"github.com/goharbor/harbor/src/pkg/notification"
 	"github.com/goharbor/harbor/src/pkg/notifier/model"
 	notifyModel "github.com/goharbor/harbor/src/pkg/notifier/model"

src/controller/event/handler/webhook/quota/quota_test.go

@@ -15,8 +15,8 @@
 package quota
 
 import (
-	"github.com/goharbor/harbor/src/api/event"
 	common_dao "github.com/goharbor/harbor/src/common/dao"
+	"github.com/goharbor/harbor/src/controller/event"
 	"testing"
 	"time"
 

src/controller/event/handler/webhook/scan/delete.go

@@ -17,12 +17,12 @@ package scan
 import (
 	"context"
 	bo "github.com/astaxie/beego/orm"
-	"github.com/goharbor/harbor/src/api/artifact"
-	"github.com/goharbor/harbor/src/api/event"
-	"github.com/goharbor/harbor/src/api/scan"
 	"github.com/goharbor/harbor/src/common/utils/log"
-	"github.com/goharbor/harbor/src/internal/orm"
-	"github.com/goharbor/harbor/src/pkg/q"
+	"github.com/goharbor/harbor/src/controller/artifact"
+	"github.com/goharbor/harbor/src/controller/event"
+	"github.com/goharbor/harbor/src/controller/scan"
+	"github.com/goharbor/harbor/src/lib/orm"
+	"github.com/goharbor/harbor/src/lib/q"
 	"github.com/pkg/errors"
 )
 

src/controller/event/handler/webhook/scan/scan.go

@@ -17,16 +17,16 @@ package scan
 import (
 	"context"
 	o "github.com/astaxie/beego/orm"
-	"github.com/goharbor/harbor/src/api/artifact"
-	"github.com/goharbor/harbor/src/api/event"
-	"github.com/goharbor/harbor/src/api/event/handler/util"
-	"github.com/goharbor/harbor/src/internal/orm"
+	"github.com/goharbor/harbor/src/controller/artifact"
+	"github.com/goharbor/harbor/src/controller/event"
+	"github.com/goharbor/harbor/src/controller/event/handler/util"
+	"github.com/goharbor/harbor/src/lib/orm"
 	"github.com/goharbor/harbor/src/pkg/notifier/model"
 	"time"
 
-	"github.com/goharbor/harbor/src/api/scan"
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/common/utils/log"
+	"github.com/goharbor/harbor/src/controller/scan"
 	"github.com/goharbor/harbor/src/pkg/notification"
 	"github.com/goharbor/harbor/src/pkg/project"
 	v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"

src/controller/event/handler/webhook/scan/scan_test.go

@@ -15,14 +15,14 @@
 package scan
 
 import (
-	"github.com/goharbor/harbor/src/api/event"
 	common_dao "github.com/goharbor/harbor/src/common/dao"
+	"github.com/goharbor/harbor/src/controller/event"
 	"testing"
 	"time"
 
-	"github.com/goharbor/harbor/src/api/artifact"
-	sc "github.com/goharbor/harbor/src/api/scan"
 	"github.com/goharbor/harbor/src/common"
+	"github.com/goharbor/harbor/src/controller/artifact"
+	sc "github.com/goharbor/harbor/src/controller/scan"
 	"github.com/goharbor/harbor/src/core/config"
 	"github.com/goharbor/harbor/src/pkg/notification"
 	"github.com/goharbor/harbor/src/pkg/notification/policy"

src/controller/event/metadata/artifact.go

@@ -16,8 +16,8 @@ package metadata
 
 import (
 	"context"
-	event2 "github.com/goharbor/harbor/src/api/event"
 	"github.com/goharbor/harbor/src/common/security"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	"time"

src/controller/event/metadata/artifact_test.go

@@ -16,7 +16,7 @@ package metadata
 
 import (
 	"context"
-	event2 "github.com/goharbor/harbor/src/api/event"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	"github.com/stretchr/testify/suite"

src/controller/event/metadata/chart.go

@@ -1,7 +1,7 @@
 package metadata
 
 import (
-	event2 "github.com/goharbor/harbor/src/api/event"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	"time"
 )

src/controller/event/metadata/chart_test.go

@@ -15,7 +15,7 @@
 package metadata
 
 import (
-	event2 "github.com/goharbor/harbor/src/api/event"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	"github.com/stretchr/testify/suite"
 	"testing"

src/controller/event/metadata/project.go

@@ -15,7 +15,7 @@
 package metadata
 
 import (
-	event2 "github.com/goharbor/harbor/src/api/event"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	"time"
 )

src/controller/event/metadata/project_test.go

@@ -15,7 +15,7 @@
 package metadata
 
 import (
-	event2 "github.com/goharbor/harbor/src/api/event"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	"github.com/stretchr/testify/suite"
 	"testing"

src/controller/event/metadata/quota.go

@@ -3,8 +3,8 @@ package metadata
 import (
 	"time"
 
-	event2 "github.com/goharbor/harbor/src/api/event"
 	"github.com/goharbor/harbor/src/common/models"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	"github.com/pkg/errors"
 )

src/controller/event/metadata/quota_test.go

@@ -15,7 +15,7 @@
 package metadata
 
 import (
-	event2 "github.com/goharbor/harbor/src/api/event"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	"github.com/stretchr/testify/suite"
 	"testing"

src/controller/event/metadata/replication.go

@@ -3,7 +3,7 @@ package metadata
 import (
 	"time"
 
-	event2 "github.com/goharbor/harbor/src/api/event"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 )
 

src/controller/event/metadata/repository.go

@@ -16,8 +16,8 @@ package metadata
 
 import (
 	"context"
-	event2 "github.com/goharbor/harbor/src/api/event"
 	"github.com/goharbor/harbor/src/common/security"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	"time"
 )

src/controller/event/metadata/repository_test.go

@@ -16,7 +16,7 @@ package metadata
 
 import (
 	"context"
-	event2 "github.com/goharbor/harbor/src/api/event"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	"github.com/stretchr/testify/suite"
 	"testing"

src/controller/event/metadata/scan.go

@@ -1,8 +1,8 @@
 package metadata
 
 import (
-	event2 "github.com/goharbor/harbor/src/api/event"
 	"github.com/goharbor/harbor/src/common/models"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
 	"github.com/pkg/errors"

src/controller/event/metadata/scan_test.go

@@ -15,7 +15,7 @@
 package metadata
 
 import (
-	event2 "github.com/goharbor/harbor/src/api/event"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
 	"github.com/stretchr/testify/suite"

src/controller/event/metadata/tag.go

@@ -16,8 +16,8 @@ package metadata
 
 import (
 	"context"
-	event2 "github.com/goharbor/harbor/src/api/event"
 	"github.com/goharbor/harbor/src/common/security"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	"time"

src/controller/event/metadata/tag_test.go

@@ -16,7 +16,7 @@ package metadata
 
 import (
 	"context"
-	event2 "github.com/goharbor/harbor/src/api/event"
+	event2 "github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	"github.com/stretchr/testify/suite"

src/controller/project/controller.go

@@ -20,7 +20,7 @@ import (
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/common/utils/log"
 	"github.com/goharbor/harbor/src/core/promgr/metamgr"
-	ierror "github.com/goharbor/harbor/src/internal/error"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/project"
 	"github.com/goharbor/harbor/src/pkg/scan/whitelist"
 )

src/controller/project/controller_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/goharbor/harbor/src/common/models"
-	ierror "github.com/goharbor/harbor/src/internal/error"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/testing/pkg/project"
 	"github.com/stretchr/testify/suite"
 )

src/controller/quota/controller.go

@@ -22,14 +22,14 @@ import (
 	"github.com/garyburd/redigo/redis"
 	"github.com/goharbor/harbor/src/common/utils/log"
 	util "github.com/goharbor/harbor/src/common/utils/redis"
-	ierror "github.com/goharbor/harbor/src/internal/error"
-	"github.com/goharbor/harbor/src/internal/orm"
+	ierror "github.com/goharbor/harbor/src/lib/error"
+	"github.com/goharbor/harbor/src/lib/orm"
 	"github.com/goharbor/harbor/src/pkg/quota"
 	"github.com/goharbor/harbor/src/pkg/quota/driver"
 	"github.com/goharbor/harbor/src/pkg/types"
 
 	// quota driver
-	_ "github.com/goharbor/harbor/src/api/quota/driver"
+	_ "github.com/goharbor/harbor/src/controller/quota/driver"
 )
 
 var (

src/controller/quota/controller_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/goharbor/harbor/src/internal/orm"
+	"github.com/goharbor/harbor/src/lib/orm"
 	"github.com/goharbor/harbor/src/pkg/quota"
 	"github.com/goharbor/harbor/src/pkg/quota/driver"
 	"github.com/goharbor/harbor/src/pkg/types"

src/controller/quota/driver/driver.go

@@ -16,5 +16,5 @@ package driver
 
 import (
 	// project quota driver
-	_ "github.com/goharbor/harbor/src/api/quota/driver/project"
+	_ "github.com/goharbor/harbor/src/controller/quota/driver/project"
 )

src/controller/quota/driver/project/project.go

@@ -19,14 +19,14 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/goharbor/harbor/src/api/artifact"
-	"github.com/goharbor/harbor/src/api/blob"
-	"github.com/goharbor/harbor/src/api/chartmuseum"
 	"github.com/goharbor/harbor/src/common"
 	"github.com/goharbor/harbor/src/common/config"
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/common/utils/log"
-	"github.com/goharbor/harbor/src/pkg/q"
+	"github.com/goharbor/harbor/src/controller/artifact"
+	"github.com/goharbor/harbor/src/controller/blob"
+	"github.com/goharbor/harbor/src/controller/chartmuseum"
+	"github.com/goharbor/harbor/src/lib/q"
 	dr "github.com/goharbor/harbor/src/pkg/quota/driver"
 	"github.com/goharbor/harbor/src/pkg/types"
 	"github.com/graph-gophers/dataloader"

src/controller/quota/driver/project/util.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/goharbor/harbor/src/common/dao"
 	"github.com/goharbor/harbor/src/common/models"
-	ierror "github.com/goharbor/harbor/src/internal/error"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/project"
 	"github.com/graph-gophers/dataloader"
 )

src/controller/quota/util.go

@@ -19,10 +19,10 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/goharbor/harbor/src/api/project"
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/common/utils/log"
-	ierror "github.com/goharbor/harbor/src/internal/error"
+	"github.com/goharbor/harbor/src/controller/project"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 )
 
 const (

src/controller/quota/util_test.go

@@ -20,9 +20,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/goharbor/harbor/src/api/project"
 	"github.com/goharbor/harbor/src/common/models"
-	"github.com/goharbor/harbor/src/internal/orm"
+	"github.com/goharbor/harbor/src/controller/project"
+	"github.com/goharbor/harbor/src/lib/orm"
 	"github.com/goharbor/harbor/src/pkg/quota"
 	"github.com/goharbor/harbor/src/pkg/quota/driver"
 	"github.com/goharbor/harbor/src/pkg/types"

src/controller/repository/controller.go

@@ -17,15 +17,15 @@ package repository
 import (
 	"context"
 
-	"github.com/goharbor/harbor/src/api/artifact"
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/common/utils"
 	"github.com/goharbor/harbor/src/common/utils/log"
-	ierror "github.com/goharbor/harbor/src/internal/error"
-	"github.com/goharbor/harbor/src/internal/orm"
+	"github.com/goharbor/harbor/src/controller/artifact"
+	ierror "github.com/goharbor/harbor/src/lib/error"
+	"github.com/goharbor/harbor/src/lib/orm"
+	"github.com/goharbor/harbor/src/lib/q"
 	art "github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/pkg/project"
-	"github.com/goharbor/harbor/src/pkg/q"
 	"github.com/goharbor/harbor/src/pkg/repository"
 )
 

src/controller/repository/controller_test.go

@@ -15,10 +15,10 @@
 package repository
 
 import (
-	"github.com/goharbor/harbor/src/api/artifact"
 	"github.com/goharbor/harbor/src/common/models"
-	ierror "github.com/goharbor/harbor/src/internal/error"
-	"github.com/goharbor/harbor/src/internal/orm"
+	"github.com/goharbor/harbor/src/controller/artifact"
+	ierror "github.com/goharbor/harbor/src/lib/error"
+	"github.com/goharbor/harbor/src/lib/orm"
 	artifacttesting "github.com/goharbor/harbor/src/testing/api/artifact"
 	ormtesting "github.com/goharbor/harbor/src/testing/lib/orm"
 	"github.com/goharbor/harbor/src/testing/mock"

src/controller/scan/all_handler.go

@@ -17,11 +17,11 @@ package scan
 import (
 	"context"
 
-	"github.com/goharbor/harbor/src/api/artifact"
-	"github.com/goharbor/harbor/src/api/repository"
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/common/utils/log"
-	"github.com/goharbor/harbor/src/pkg/q"
+	"github.com/goharbor/harbor/src/controller/artifact"
+	"github.com/goharbor/harbor/src/controller/repository"
+	"github.com/goharbor/harbor/src/lib/q"
 	"github.com/pkg/errors"
 )
 

src/controller/scan/base_controller.go

@@ -20,16 +20,16 @@ import (
 	"fmt"
 	"sync"
 
-	ar "github.com/goharbor/harbor/src/api/artifact"
-	sc "github.com/goharbor/harbor/src/api/scanner"
 	cj "github.com/goharbor/harbor/src/common/job"
 	jm "github.com/goharbor/harbor/src/common/job/models"
 	"github.com/goharbor/harbor/src/common/rbac"
 	"github.com/goharbor/harbor/src/common/utils/log"
+	ar "github.com/goharbor/harbor/src/controller/artifact"
+	sc "github.com/goharbor/harbor/src/controller/scanner"
 	"github.com/goharbor/harbor/src/core/config"
-	ierror "github.com/goharbor/harbor/src/internal/error"
 	"github.com/goharbor/harbor/src/jobservice/job"
 	"github.com/goharbor/harbor/src/jobservice/logger"
+	ierror "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/permission/types"
 	"github.com/goharbor/harbor/src/pkg/robot"
 	"github.com/goharbor/harbor/src/pkg/robot/model"

src/controller/scan/base_controller_test.go

@@ -22,14 +22,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/goharbor/harbor/src/api/artifact"
 	"github.com/goharbor/harbor/src/common"
 	cj "github.com/goharbor/harbor/src/common/job"
 	jm "github.com/goharbor/harbor/src/common/job/models"
 	"github.com/goharbor/harbor/src/common/rbac"
+	"github.com/goharbor/harbor/src/controller/artifact"
 	"github.com/goharbor/harbor/src/jobservice/job"
+	"github.com/goharbor/harbor/src/lib/q"
 	"github.com/goharbor/harbor/src/pkg/permission/types"
-	"github.com/goharbor/harbor/src/pkg/q"
 	"github.com/goharbor/harbor/src/pkg/robot/model"
 	sca "github.com/goharbor/harbor/src/pkg/scan"
 	"github.com/goharbor/harbor/src/pkg/scan/dao/scan"

src/controller/scan/checker.go

@@ -17,8 +17,8 @@ package scan
 import (
 	"context"
 
-	"github.com/goharbor/harbor/src/api/artifact"
-	"github.com/goharbor/harbor/src/api/scanner"
+	"github.com/goharbor/harbor/src/controller/artifact"
+	"github.com/goharbor/harbor/src/controller/scanner"
 	models "github.com/goharbor/harbor/src/pkg/scan/dao/scanner"
 )
 

src/controller/scan/checker_test.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/goharbor/harbor/src/api/artifact"
+	"github.com/goharbor/harbor/src/controller/artifact"
 	"github.com/goharbor/harbor/src/pkg/scan/dao/scanner"
 	v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
 	artifacttesting "github.com/goharbor/harbor/src/testing/api/artifact"

src/controller/scan/controller.go

@@ -17,7 +17,7 @@ package scan
 import (
 	"context"
 
-	"github.com/goharbor/harbor/src/api/artifact"
+	"github.com/goharbor/harbor/src/controller/artifact"
 	"github.com/goharbor/harbor/src/jobservice/job"
 	"github.com/goharbor/harbor/src/pkg/scan/all"
 	"github.com/goharbor/harbor/src/pkg/scan/dao/scan"

src/controller/scanner/base_controller.go

@@ -18,7 +18,7 @@ import (
 	"github.com/goharbor/harbor/src/common/utils/log"
 	"github.com/goharbor/harbor/src/core/promgr/metamgr"
 	"github.com/goharbor/harbor/src/jobservice/logger"
-	"github.com/goharbor/harbor/src/pkg/q"
+	"github.com/goharbor/harbor/src/lib/q"
 	"github.com/goharbor/harbor/src/pkg/scan/dao/scanner"
 	v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
 	rscanner "github.com/goharbor/harbor/src/pkg/scan/scanner"

src/controller/scanner/base_controller_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/goharbor/harbor/src/common/models"
-	"github.com/goharbor/harbor/src/pkg/q"
+	"github.com/goharbor/harbor/src/lib/q"
 	"github.com/goharbor/harbor/src/pkg/scan/dao/scanner"
 	v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
 	mocktesting "github.com/goharbor/harbor/src/testing/mock"

src/controller/scanner/controller.go

@@ -15,7 +15,7 @@
 package scanner
 
 import (
-	"github.com/goharbor/harbor/src/pkg/q"
+	"github.com/goharbor/harbor/src/lib/q"
 	"github.com/goharbor/harbor/src/pkg/scan/dao/scanner"
 	v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
 )

src/controller/tag/controller.go

@@ -4,13 +4,13 @@ import (
 	"context"
 	"github.com/goharbor/harbor/src/common/utils"
 	"github.com/goharbor/harbor/src/common/utils/log"
-	ierror "github.com/goharbor/harbor/src/internal/error"
-	"github.com/goharbor/harbor/src/internal/orm"
-	"github.com/goharbor/harbor/src/internal/selector"
+	ierror "github.com/goharbor/harbor/src/lib/error"
+	"github.com/goharbor/harbor/src/lib/orm"
+	"github.com/goharbor/harbor/src/lib/q"
+	"github.com/goharbor/harbor/src/lib/selector"
 	"github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/pkg/immutabletag/match"
 	"github.com/goharbor/harbor/src/pkg/immutabletag/match/rule"
-	"github.com/goharbor/harbor/src/pkg/q"
 	"github.com/goharbor/harbor/src/pkg/signature"
 	"github.com/goharbor/harbor/src/pkg/tag"
 	model_tag "github.com/goharbor/harbor/src/pkg/tag/model/tag"

src/controller/tag/controller_test.go

@@ -3,8 +3,8 @@ package tag
 import (
 	"github.com/goharbor/harbor/src/common"
 	coreConfig "github.com/goharbor/harbor/src/core/config"
-	ierror "github.com/goharbor/harbor/src/internal/error"
-	"github.com/goharbor/harbor/src/internal/orm"
+	ierror "github.com/goharbor/harbor/src/lib/error"
+	"github.com/goharbor/harbor/src/lib/orm"
 	pkg_artifact "github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/pkg/tag/model/tag"
 	ormtesting "github.com/goharbor/harbor/src/testing/lib/orm"

src/core/api/admin_job.go

@@ -21,12 +21,12 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/goharbor/harbor/src/api/scan"
 	"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/controller/scan"
 	"github.com/goharbor/harbor/src/core/api/models"
 	utils_core "github.com/goharbor/harbor/src/core/utils"
 	"github.com/pkg/errors"

src/core/api/base.go

@@ -29,7 +29,7 @@ import (
 	"github.com/goharbor/harbor/src/common/utils/log"
 	"github.com/goharbor/harbor/src/core/config"
 	"github.com/goharbor/harbor/src/core/promgr"
-	internal_errors "github.com/goharbor/harbor/src/internal/error"
+	internal_errors "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/project"
 	"github.com/goharbor/harbor/src/pkg/repository"
 	"github.com/goharbor/harbor/src/pkg/retention"

src/core/api/chart_repository.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/goharbor/harbor/src/api/event/metadata"
+	"github.com/goharbor/harbor/src/controller/event/metadata"
 	"io"
 	"io/ioutil"
 	"mime/multipart"

src/core/api/immutabletagrule.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/goharbor/harbor/src/common/rbac"
-	internal_errors "github.com/goharbor/harbor/src/internal/error"
+	internal_errors "github.com/goharbor/harbor/src/lib/error"
 	"github.com/goharbor/harbor/src/pkg/immutabletag"
 	"github.com/goharbor/harbor/src/pkg/immutabletag/model"
 )

src/core/api/internal.go

@@ -18,14 +18,14 @@ import (
 	"context"
 
 	o "github.com/astaxie/beego/orm"
-	"github.com/goharbor/harbor/src/api/quota"
 	"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/controller/quota"
 	"github.com/goharbor/harbor/src/core/config"
-	ierror "github.com/goharbor/harbor/src/internal/error"
-	"github.com/goharbor/harbor/src/internal/orm"
+	ierror "github.com/goharbor/harbor/src/lib/error"
+	"github.com/goharbor/harbor/src/lib/orm"
 	"github.com/pkg/errors"
 )
 

src/core/api/notification_job_test.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"github.com/goharbor/harbor/src/api/event"
+	"github.com/goharbor/harbor/src/controller/event"
 	"net/http"
 	"testing"
 	"time"

src/core/api/notification_policy.go

@@ -7,11 +7,11 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/goharbor/harbor/src/api/event"
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/common/rbac"
 	"github.com/goharbor/harbor/src/common/utils"
 	"github.com/goharbor/harbor/src/common/utils/log"
+	"github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/pkg/notification"
 )
 

src/core/api/notification_policy_test.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"github.com/goharbor/harbor/src/api/event"
+	"github.com/goharbor/harbor/src/controller/event"
 	"net/http"
 	"testing"
 

src/core/api/pro_scanner.go

@@ -15,9 +15,9 @@
 package api
 
 import (
-	"github.com/goharbor/harbor/src/api/scanner"
 	"github.com/goharbor/harbor/src/common/rbac"
-	"github.com/goharbor/harbor/src/pkg/q"
+	"github.com/goharbor/harbor/src/controller/scanner"
+	"github.com/goharbor/harbor/src/lib/q"
 	"github.com/pkg/errors"
 )