refactor(quota): move pkg/types to pkg/quota/types

Closes #9664

Signed-off-by: He Weiwei <hweiwei@vmware.com>

src/common/models/project.go

@@ -18,7 +18,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 const (

src/controller/quota/controller.go

@@ -27,7 +27,7 @@ import (
 	"github.com/goharbor/harbor/src/lib/q"
 	"github.com/goharbor/harbor/src/pkg/quota"
 	"github.com/goharbor/harbor/src/pkg/quota/driver"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 
 	// quota driver
 	_ "github.com/goharbor/harbor/src/controller/quota/driver"

src/controller/quota/controller_test.go

@@ -24,7 +24,7 @@ import (
 	"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"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	ormtesting "github.com/goharbor/harbor/src/testing/lib/orm"
 	"github.com/goharbor/harbor/src/testing/mock"
 	quotatesting "github.com/goharbor/harbor/src/testing/pkg/quota"

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

@@ -25,7 +25,7 @@ import (
 	"github.com/goharbor/harbor/src/controller/blob"
 	"github.com/goharbor/harbor/src/lib/log"
 	dr "github.com/goharbor/harbor/src/pkg/quota/driver"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	"github.com/graph-gophers/dataloader"
 )
 

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

@@ -18,7 +18,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	artifacttesting "github.com/goharbor/harbor/src/testing/controller/artifact"
 	blobtesting "github.com/goharbor/harbor/src/testing/controller/blob"
 	"github.com/goharbor/harbor/src/testing/mock"

src/controller/quota/util_test.go

@@ -25,7 +25,7 @@ import (
 	"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"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	projecttesting "github.com/goharbor/harbor/src/testing/controller/project"
 	ormtesting "github.com/goharbor/harbor/src/testing/lib/orm"
 	"github.com/goharbor/harbor/src/testing/mock"

src/core/api/project.go

@@ -17,7 +17,6 @@ package api
 import (
 	"context"
 	"fmt"
-	"github.com/goharbor/harbor/src/replication"
 	"net/http"
 	"regexp"
 	"strconv"
@@ -38,8 +37,9 @@ import (
 	"github.com/goharbor/harbor/src/lib/errors"
 	"github.com/goharbor/harbor/src/lib/log"
 	evt "github.com/goharbor/harbor/src/pkg/notifier/event"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	"github.com/goharbor/harbor/src/pkg/scan/vuln"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/replication"
 )
 
 type deletableResp struct {

src/core/api/quota.go

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

src/core/api/quota_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/goharbor/harbor/src/controller/quota"
 	"github.com/goharbor/harbor/src/lib/orm"
 	"github.com/goharbor/harbor/src/pkg/quota/driver"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	"github.com/goharbor/harbor/src/testing/apitests/apilib"
 	"github.com/goharbor/harbor/src/testing/mock"
 	drivertesting "github.com/goharbor/harbor/src/testing/pkg/quota/driver"

src/pkg/quota/dao/dao.go

@@ -24,7 +24,7 @@ import (
 	"github.com/goharbor/harbor/src/lib/q"
 	"github.com/goharbor/harbor/src/pkg/quota/driver"
 	"github.com/goharbor/harbor/src/pkg/quota/models"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 // DAO the dao for Quota and QuotaUsage

src/pkg/quota/dao/dao_test.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/goharbor/harbor/src/lib/orm"
 	"github.com/goharbor/harbor/src/lib/q"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	htesting "github.com/goharbor/harbor/src/testing"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/suite"

src/pkg/quota/dao/util.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/goharbor/harbor/src/lib/orm"
 	"github.com/goharbor/harbor/src/lib/q"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 var (

src/pkg/quota/driver/driver.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 var (

src/pkg/quota/errors.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 // Errors contains all happened errors

src/pkg/quota/manager.go

@@ -21,7 +21,7 @@ import (
 	"github.com/goharbor/harbor/src/lib/q"
 	"github.com/goharbor/harbor/src/pkg/quota/dao"
 	"github.com/goharbor/harbor/src/pkg/quota/models"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 // Quota alias `models.Quota` to make it natural to use the Manager

src/pkg/quota/manager_test.go

@@ -17,7 +17,7 @@ package quota
 import (
 	"testing"
 
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	htesting "github.com/goharbor/harbor/src/testing"
 	"github.com/stretchr/testify/suite"
 )

src/pkg/quota/models/quota.go

@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/goharbor/harbor/src/pkg/quota/driver"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 // Quota quota model for manager

src/pkg/quota/models/quota_test.go

@@ -17,7 +17,7 @@ package models
 import (
 	"testing"
 
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	"github.com/stretchr/testify/assert"
 )
 

src/pkg/quota/util.go

@@ -18,7 +18,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 // IsSafe check new used is safe under the hard limits

src/pkg/quota/util_test.go

@@ -17,7 +17,7 @@ package quota
 import (
 	"testing"
 
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 func TestIsSafe(t *testing.T) {

src/pkg/scan/dao/scanner/registration.go

@@ -21,8 +21,8 @@ import (
 	"github.com/astaxie/beego/orm"
 	"github.com/goharbor/harbor/src/common/dao"
 	"github.com/goharbor/harbor/src/lib/errors"
+	liborm "github.com/goharbor/harbor/src/lib/orm"
 	"github.com/goharbor/harbor/src/lib/q"
-	"github.com/goharbor/harbor/src/pkg/types"
 )
 
 func init() {
@@ -35,10 +35,7 @@ func AddRegistration(r *Registration) (int64, error) {
 
 	id, err := o.Insert(r)
 	if err != nil {
-		if strings.Contains(err.Error(), "duplicate key value violates unique constraint") {
-			return 0, types.ErrDupRows
-		}
-		return 0, err
+		return 0, liborm.WrapConflictError(err, "registration name or url already exists")
 	}
 
 	return id, nil

src/pkg/types/error.go

@@ -1,24 +0,0 @@
-// Copyright Project Harbor Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"errors"
-)
-
-var (
-	// ErrDupRows is returned by DAO when inserting failed with error "duplicate key value violates unique constraint"
-	ErrDupRows = errors.New("sql: duplicate row in DB")
-)

src/server/middleware/quota/copy_artifact.go

@@ -42,7 +42,7 @@ import (
 	"github.com/goharbor/harbor/src/pkg/blob"
 	"github.com/goharbor/harbor/src/pkg/distribution"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 // CopyArtifactMiddleware middleware to request count and storage resources for copy artifact API

src/server/middleware/quota/copy_artifact_test.go

@@ -37,7 +37,7 @@ import (
 	"github.com/goharbor/harbor/src/controller/artifact"
 	"github.com/goharbor/harbor/src/pkg/notification"
 	"github.com/goharbor/harbor/src/pkg/quota"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	"github.com/goharbor/harbor/src/testing/mock"
 	"github.com/stretchr/testify/suite"
 )

src/server/middleware/quota/post_initiate_blob_upload.go

@@ -21,7 +21,7 @@ import (
 	"github.com/goharbor/harbor/src/controller/blob"
 	"github.com/goharbor/harbor/src/lib/errors"
 	"github.com/goharbor/harbor/src/lib/log"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 // PostInitiateBlobUploadMiddleware middleware to add blob to project after mount blob success

src/server/middleware/quota/post_initiate_blob_upload_test.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/goharbor/harbor/src/pkg/blob"
 	"github.com/goharbor/harbor/src/pkg/quota"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	"github.com/goharbor/harbor/src/testing/mock"
 	"github.com/stretchr/testify/suite"
 )

src/server/middleware/quota/put_blob_upload.go

@@ -21,7 +21,7 @@ import (
 	"github.com/goharbor/harbor/src/controller/blob"
 	"github.com/goharbor/harbor/src/lib/log"
 	"github.com/goharbor/harbor/src/pkg/distribution"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 // PutBlobUploadMiddleware middleware to request storage resource for the project

src/server/middleware/quota/put_blob_upload_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/goharbor/harbor/src/lib/errors"
 	"github.com/goharbor/harbor/src/pkg/notification"
 	"github.com/goharbor/harbor/src/pkg/quota"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	"github.com/goharbor/harbor/src/testing/mock"
 	"github.com/stretchr/testify/suite"
 )

src/server/middleware/quota/put_manifest.go

@@ -22,7 +22,7 @@ import (
 	"github.com/goharbor/harbor/src/lib/errors"
 	"github.com/goharbor/harbor/src/lib/log"
 	"github.com/goharbor/harbor/src/pkg/blob/models"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 // PutManifestMiddleware middleware to request count and storage resources for the project

src/server/middleware/quota/put_manifest_test.go

@@ -29,7 +29,7 @@ import (
 	"github.com/goharbor/harbor/src/pkg/distribution"
 	"github.com/goharbor/harbor/src/pkg/notification"
 	"github.com/goharbor/harbor/src/pkg/quota"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	"github.com/goharbor/harbor/src/testing/mock"
 	distributiontesting "github.com/goharbor/harbor/src/testing/pkg/distribution"
 	"github.com/stretchr/testify/suite"

src/server/middleware/quota/quota.go

@@ -27,7 +27,7 @@ import (
 	"github.com/goharbor/harbor/src/pkg/notification"
 	"github.com/goharbor/harbor/src/pkg/notifier/event"
 	"github.com/goharbor/harbor/src/pkg/quota"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	"github.com/goharbor/harbor/src/server/middleware"
 )
 

src/server/middleware/quota/quota_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/goharbor/harbor/src/controller/project"
 	"github.com/goharbor/harbor/src/controller/quota"
 	pquota "github.com/goharbor/harbor/src/pkg/quota"
-	"github.com/goharbor/harbor/src/pkg/types"
+	"github.com/goharbor/harbor/src/pkg/quota/types"
 	artifacttesting "github.com/goharbor/harbor/src/testing/controller/artifact"
 	blobtesting "github.com/goharbor/harbor/src/testing/controller/blob"
 	projecttesting "github.com/goharbor/harbor/src/testing/controller/project"

src/testing/controller/quota/controller.go

@@ -12,7 +12,7 @@ import (
 
 	quota "github.com/goharbor/harbor/src/controller/quota"
 
-	types "github.com/goharbor/harbor/src/pkg/types"
+	types "github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 // Controller is an autogenerated mock type for the Controller type

src/testing/pkg/quota/driver/driver.go

@@ -8,7 +8,7 @@ import (
 	driver "github.com/goharbor/harbor/src/pkg/quota/driver"
 	mock "github.com/stretchr/testify/mock"
 
-	types "github.com/goharbor/harbor/src/pkg/types"
+	types "github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 // Driver is an autogenerated mock type for the Driver type

src/testing/pkg/quota/manager.go

@@ -10,7 +10,7 @@ import (
 
 	q "github.com/goharbor/harbor/src/lib/q"
 
-	types "github.com/goharbor/harbor/src/pkg/types"
+	types "github.com/goharbor/harbor/src/pkg/quota/types"
 )
 
 // Manager is an autogenerated mock type for the Manager type