Remove ValidResource method

Signed-off-by: cd1989 <chende@caicloud.io>

src/replication/ng/adapter/adapter.go

@@ -39,9 +39,6 @@ type Adapter interface {
 	// PrepareForPush does the prepare work that needed for pushing/uploading the resource
 	// eg: create the namespace or repository
 	PrepareForPush(*model.Resource) error
-	// ValidResource checks whether a resource is valid for the registry. For example, DockerHub don't support
-	// multiple parts repo name like 'a/b/c'.
-	ValidResource(*model.Resource) bool
 	// Get the namespace specified by the name, the returning value should
 	// contain the metadata about the namespace if it has
 	// TODO remove this method?

src/replication/ng/adapter/dockerhub/adapter.go

@@ -73,19 +73,6 @@ func (a *adapter) Info() (*model.RegistryInfo, error) {
 	}, nil
 }
 
-// ValidResource checks whether a resource is valid, in DockerHub, multi-parts repo name like 'a/b/c' is not supported.
-func (a *adapter) ValidResource(resource *model.Resource) bool {
-	if resource == nil || resource.Metadata == nil || resource.Metadata.Repository == nil {
-		return false
-	}
-
-	if len(strings.Split(resource.Metadata.Repository.Name, "/")) != 1 {
-		return false
-	}
-
-	return true
-}
-
 // ConvertResourceMetadata converts the namespace and repository part of the resource metadata
 // to the one that the adapter can handle
 func (a *adapter) ConvertResourceMetadata(meta *model.ResourceMetadata, namespace *model.Namespace) (*model.ResourceMetadata, error) {

src/replication/ng/adapter/huawei/huawei_adapter.go

@@ -118,11 +118,6 @@ func (adapter Adapter) ConvertResourceMetadata(resourceMetadata *model.ResourceM
 	return metadata, nil
 }
 
-// ValidResource ...
-func (adapter Adapter) ValidResource(*model.Resource) bool {
-	return true
-}
-
 // PrepareForPush prepare for push to Huawei SWR
 func (adapter Adapter) PrepareForPush(resource *model.Resource) error {
 

src/replication/ng/adapter/image_registry.go

@@ -276,11 +276,6 @@ func (d *DefaultImageRegistry) PushBlob(repository, digest string, size int64, b
 	return client.PushBlob(digest, size, blob)
 }
 
-// ValidResource ...
-func (d *DefaultImageRegistry) ValidResource(*model.Resource) bool {
-	return true
-}
-
 func isDigest(str string) bool {
 	return strings.Contains(str, ":")
 }

src/replication/ng/model/resource.go

@@ -69,6 +69,4 @@ type Resource struct {
 	Deleted bool `json:"deleted"`
 	// indicate whether the resource can be overridden
 	Override bool `json:"override"`
-	// Invalid indicates the resource is invalid for the registry
-	Invalid bool `json:"invalid"`
 }

src/replication/ng/operation/controller_test.go

@@ -149,9 +149,6 @@ func (f *fakedAdapter) PrepareForPush(*model.Resource) error {
 func (f *fakedAdapter) HealthCheck() (model.HealthStatus, error) {
 	return model.Healthy, nil
 }
-func (f *fakedAdapter) ValidResource(*model.Resource) bool {
-	return true
-}
 func (f *fakedAdapter) GetNamespace(ns string) (*model.Namespace, error) {
 	var namespace *model.Namespace
 	if ns == "library" {

src/replication/ng/operation/flow/copy.go

@@ -62,12 +62,6 @@ func (c *copyFlow) Run(interface{}) (int, error) {
 		return 0, err
 	}
 
-	for i := range dstResources {
-		if !dstAdapter.ValidResource(dstResources[i]) {
-			dstResources[i].Invalid = true
-		}
-	}
-
 	if err = prepareForPush(dstAdapter, dstResources); err != nil {
 		return 0, err
 	}
@@ -79,13 +73,7 @@ func (c *copyFlow) Run(interface{}) (int, error) {
 		return 0, err
 	}
 
-	var filtered []*scheduler.ScheduleItem
-	for _, item := range items {
-		if !item.DstResource.Invalid {
-			filtered = append(filtered, item)
-		}
-	}
-	return schedule(c.scheduler, c.executionMgr, filtered)
+	return schedule(c.scheduler, c.executionMgr, items)
 }
 
 // mark the execution as success in database

src/replication/ng/operation/flow/deletion.go

@@ -65,12 +65,6 @@ func (d *deletionFlow) Run(interface{}) (int, error) {
 		return 0, err
 	}
 
-	for i := range dstResources {
-		if !dstAdapter.ValidResource(dstResources[i]) {
-			dstResources[i].Invalid = true
-		}
-	}
-
 	items, err := preprocess(d.scheduler, srcResources, dstResources)
 	if err != nil {
 		return 0, err
@@ -79,12 +73,5 @@ func (d *deletionFlow) Run(interface{}) (int, error) {
 		return 0, err
 	}
 
-	var filtered []*scheduler.ScheduleItem
-	for _, item := range items {
-		if !item.DstResource.Invalid {
-			filtered = append(filtered, item)
-		}
-	}
-
-	return schedule(d.scheduler, d.executionMgr, filtered)
+	return schedule(d.scheduler, d.executionMgr, items)
 }

src/replication/ng/operation/flow/stage.go

@@ -251,11 +251,6 @@ func createTasks(mgr execution.Manager, executionID int64, items []*scheduler.Sc
 			Operation:    operation,
 		}
 
-		if item.DstResource.Invalid {
-			task.Status = models.TaskStatusFailed
-			task.EndTime = time.Now()
-		}
-
 		id, err := mgr.CreateTask(task)
 		if err != nil {
 			// if failed to create the task for one of the items,

src/replication/ng/operation/flow/stage_test.go

@@ -62,9 +62,6 @@ func (f *fakedAdapter) PrepareForPush(*model.Resource) error {
 func (f *fakedAdapter) HealthCheck() (model.HealthStatus, error) {
 	return model.Healthy, nil
 }
-func (f *fakedAdapter) ValidResource(*model.Resource) bool {
-	return true
-}
 func (f *fakedAdapter) GetNamespace(ns string) (*model.Namespace, error) {
 	var namespace *model.Namespace
 	if ns == "library" {