Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-10-27 13:49:34 +01:00
Code Issues Projects Releases Wiki Activity

Adjust the file structure of replication package

Browse Source 
Move the scheduler, execution, hook and flow package into operation

Signed-off-by: Wenkai Yin <yinw@vmware.com>
This commit is contained in:
Wenkai Yin 2019-03-26 14:59:58 +08:00
parent 690f868d15
commit de4eb0369a
18 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/service/notifications/jobs/handler.go
View File

@ -24,7 +24,7 @@ import (
"github.com/goharbor/harbor/src/common/utils/log" "github.com/goharbor/harbor/src/common/utils/log"
"github.com/goharbor/harbor/src/core/api" "github.com/goharbor/harbor/src/core/api"
"github.com/goharbor/harbor/src/replication/ng" "github.com/goharbor/harbor/src/replication/ng"
"github.com/goharbor/harbor/src/replication/ng/hook" "github.com/goharbor/harbor/src/replication/ng/operation/hook"
) )
var statusMap = map[string]string{ var statusMap = map[string]string{

6
src/replication/ng/operation/controller.go
View File

@ -20,11 +20,11 @@ import (
"github.com/goharbor/harbor/src/common/utils/log" "github.com/goharbor/harbor/src/common/utils/log"
"github.com/goharbor/harbor/src/replication/ng/dao/models" "github.com/goharbor/harbor/src/replication/ng/dao/models"
"github.com/goharbor/harbor/src/replication/ng/execution"
"github.com/goharbor/harbor/src/replication/ng/flow"
"github.com/goharbor/harbor/src/replication/ng/model" "github.com/goharbor/harbor/src/replication/ng/model"
"github.com/goharbor/harbor/src/replication/ng/operation/execution"
"github.com/goharbor/harbor/src/replication/ng/operation/flow"
"github.com/goharbor/harbor/src/replication/ng/operation/scheduler"
"github.com/goharbor/harbor/src/replication/ng/registry" "github.com/goharbor/harbor/src/replication/ng/registry"
"github.com/goharbor/harbor/src/replication/ng/scheduler"
) )
// Controller handles the replication-related operations: start, // Controller handles the replication-related operations: start,

2
src/replication/ng/operation/controller_test.go
View File

@ -20,7 +20,7 @@ import (
"github.com/goharbor/harbor/src/replication/ng/config" "github.com/goharbor/harbor/src/replication/ng/config"
"github.com/goharbor/harbor/src/replication/ng/dao/models" "github.com/goharbor/harbor/src/replication/ng/dao/models"
"github.com/goharbor/harbor/src/replication/ng/model" "github.com/goharbor/harbor/src/replication/ng/model"
"github.com/goharbor/harbor/src/replication/ng/scheduler" "github.com/goharbor/harbor/src/replication/ng/operation/scheduler"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

0
src/replication/ng/execution/execution.go → src/replication/ng/operation/execution/execution.go
View File

0
src/replication/ng/execution/execution_test.go → src/replication/ng/operation/execution/execution_test.go
View File

0
src/replication/ng/flow/controller.go → src/replication/ng/operation/flow/controller.go
View File

0
src/replication/ng/flow/controller_test.go → src/replication/ng/operation/flow/controller_test.go
View File

4
src/replication/ng/flow/copy.go → src/replication/ng/operation/flow/copy.go
View File

@ -19,10 +19,10 @@ import (
"github.com/goharbor/harbor/src/common/utils/log" "github.com/goharbor/harbor/src/common/utils/log"
"github.com/goharbor/harbor/src/replication/ng/dao/models" "github.com/goharbor/harbor/src/replication/ng/dao/models"
"github.com/goharbor/harbor/src/replication/ng/execution"
"github.com/goharbor/harbor/src/replication/ng/model" "github.com/goharbor/harbor/src/replication/ng/model"
"github.com/goharbor/harbor/src/replication/ng/operation/execution"
"github.com/goharbor/harbor/src/replication/ng/operation/scheduler"
"github.com/goharbor/harbor/src/replication/ng/registry" "github.com/goharbor/harbor/src/replication/ng/registry"
"github.com/goharbor/harbor/src/replication/ng/scheduler"
) )
type copyFlow struct { type copyFlow struct {

0
src/replication/ng/flow/copy_test.go → src/replication/ng/operation/flow/copy_test.go
View File

4
src/replication/ng/flow/deletion.go → src/replication/ng/operation/flow/deletion.go
View File

@ -16,10 +16,10 @@ package flow
import ( import (
"github.com/goharbor/harbor/src/common/utils/log" "github.com/goharbor/harbor/src/common/utils/log"
"github.com/goharbor/harbor/src/replication/ng/execution"
"github.com/goharbor/harbor/src/replication/ng/model" "github.com/goharbor/harbor/src/replication/ng/model"
"github.com/goharbor/harbor/src/replication/ng/operation/execution"
"github.com/goharbor/harbor/src/replication/ng/operation/scheduler"
"github.com/goharbor/harbor/src/replication/ng/registry" "github.com/goharbor/harbor/src/replication/ng/registry"
"github.com/goharbor/harbor/src/replication/ng/scheduler"
) )
type deletionFlow struct { type deletionFlow struct {

0
src/replication/ng/flow/deletion_test.go → src/replication/ng/operation/flow/deletion_test.go
View File

4
src/replication/ng/flow/stage.go → src/replication/ng/operation/flow/stage.go
View File

@ -24,10 +24,10 @@ import (
adp "github.com/goharbor/harbor/src/replication/ng/adapter" adp "github.com/goharbor/harbor/src/replication/ng/adapter"
"github.com/goharbor/harbor/src/replication/ng/config" "github.com/goharbor/harbor/src/replication/ng/config"
"github.com/goharbor/harbor/src/replication/ng/dao/models" "github.com/goharbor/harbor/src/replication/ng/dao/models"
"github.com/goharbor/harbor/src/replication/ng/execution"
"github.com/goharbor/harbor/src/replication/ng/model" "github.com/goharbor/harbor/src/replication/ng/model"
"github.com/goharbor/harbor/src/replication/ng/operation/execution"
"github.com/goharbor/harbor/src/replication/ng/operation/scheduler"
"github.com/goharbor/harbor/src/replication/ng/registry" "github.com/goharbor/harbor/src/replication/ng/registry"
"github.com/goharbor/harbor/src/replication/ng/scheduler"
"github.com/goharbor/harbor/src/replication/ng/util" "github.com/goharbor/harbor/src/replication/ng/util"
) )

2
src/replication/ng/flow/stage_test.go → src/replication/ng/operation/flow/stage_test.go
View File

@ -25,7 +25,7 @@ import (
"github.com/goharbor/harbor/src/replication/ng/config" "github.com/goharbor/harbor/src/replication/ng/config"
"github.com/goharbor/harbor/src/replication/ng/dao/models" "github.com/goharbor/harbor/src/replication/ng/dao/models"
"github.com/goharbor/harbor/src/replication/ng/model" "github.com/goharbor/harbor/src/replication/ng/model"
"github.com/goharbor/harbor/src/replication/ng/scheduler" "github.com/goharbor/harbor/src/replication/ng/operation/scheduler"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

0
src/replication/ng/hook/task.go → src/replication/ng/operation/hook/task.go
View File

0
src/replication/ng/hook/task_test.go → src/replication/ng/operation/hook/task_test.go
View File

0
src/replication/ng/scheduler/scheduler.go → src/replication/ng/operation/scheduler/scheduler.go
View File

0
src/replication/ng/scheduler/scheduler_test.go → src/replication/ng/operation/scheduler/scheduler_test.go
View File

5
src/replication/ng/replication.go
View File

@ -20,11 +20,12 @@ import (
"github.com/goharbor/harbor/src/common/utils/log" "github.com/goharbor/harbor/src/common/utils/log"
cfg "github.com/goharbor/harbor/src/core/config" cfg "github.com/goharbor/harbor/src/core/config"
"github.com/goharbor/harbor/src/replication/ng/config" "github.com/goharbor/harbor/src/replication/ng/config"
"github.com/goharbor/harbor/src/replication/ng/execution"
"github.com/goharbor/harbor/src/replication/ng/operation" "github.com/goharbor/harbor/src/replication/ng/operation"
"github.com/goharbor/harbor/src/replication/ng/operation/execution"
"github.com/goharbor/harbor/src/replication/ng/operation/scheduler"
"github.com/goharbor/harbor/src/replication/ng/policy" "github.com/goharbor/harbor/src/replication/ng/policy"
"github.com/goharbor/harbor/src/replication/ng/registry" "github.com/goharbor/harbor/src/replication/ng/registry"
"github.com/goharbor/harbor/src/replication/ng/scheduler"
// register the Harbor adapter // register the Harbor adapter
_ "github.com/goharbor/harbor/src/replication/ng/adapter/harbor" _ "github.com/goharbor/harbor/src/replication/ng/adapter/harbor"
) )