Remove config item labels support from local client (#1900)

Due to limitations of cn-infra library config labels were never
working properly for local client. User should use remote client
for this functionality.

Signed-off-by: Peter Motičák <[email protected]>

Signed-off-by: Peter Motičák <[email protected]>

Author: pemoticak

client/local_client.go

@@ -146,84 +146,13 @@ func (c *client) GetItems(ctx context.Context) ([]*ConfigItem, error) {
 }
 
 func (c *client) UpdateItems(ctx context.Context, items []UpdateItem, resync bool) ([]*UpdateResult, error) {
-	txn := c.txnFactory.NewTxn(resync)
-	for _, ui := range items {
-		key, err := models.GetKey(ui.Message)
-		if err != nil {
-			return nil, err
-		}
-		txn.Put(key, ui.Message)
-		_, withDataSrc := contextdecorator.DataSrcFromContext(ctx)
-		if !withDataSrc {
-			ctx = contextdecorator.DataSrcContext(ctx, "localclient")
-		}
-		ctx = contextdecorator.LabelsContext(ctx, ui.Labels)
-	}
-	if err := txn.Commit(ctx); err != nil {
-		return nil, err
-	}
-	var updateResults []*UpdateResult
-	r, _ := contextdecorator.PushDataResultFromContext(ctx)
-	resWrapper, ok := r.(orchestrator.ResultWrapper)
-	if !ok {
-		return nil, fmt.Errorf("cannot retrieve update results!")
-	}
-	for _, res := range resWrapper.Results {
-		var msg string
-		if details := res.Status.GetDetails(); len(details) > 0 {
-			msg = strings.Join(res.Status.GetDetails(), ", ")
-		} else {
-			msg = res.Status.GetError()
-		}
-		updateResults = append(updateResults, &UpdateResult{
-			Key: res.Key,
-			Status: &generic.ItemStatus{
-				Status:  res.Status.State.String(),
-				Message: msg,
-			},
-		})
-	}
-	return updateResults, nil
+	// TODO: use grpc client to update items with labels
+	return nil, nil
 }
 
 func (c *client) DeleteItems(ctx context.Context, items []UpdateItem) ([]*UpdateResult, error) {
-	txn := c.txnFactory.NewTxn(false)
-	for _, ui := range items {
-		key, err := models.GetKey(ui.Message)
-		if err != nil {
-			return nil, err
-		}
-		txn.Delete(key)
-		_, withDataSrc := contextdecorator.DataSrcFromContext(ctx)
-		if !withDataSrc {
-			ctx = contextdecorator.DataSrcContext(ctx, "localclient")
-		}
-	}
-	if err := txn.Commit(ctx); err != nil {
-		return nil, err
-	}
-	var updateResults []*UpdateResult
-	r, _ := contextdecorator.PushDataResultFromContext(ctx)
-	resWrapper, ok := r.(orchestrator.ResultWrapper)
-	if !ok {
-		return nil, fmt.Errorf("cannot retrieve update results!")
-	}
-	for _, res := range resWrapper.Results {
-		var msg string
-		if details := res.Status.GetDetails(); len(details) > 0 {
-			msg = strings.Join(res.Status.GetDetails(), ", ")
-		} else {
-			msg = res.Status.GetError()
-		}
-		updateResults = append(updateResults, &UpdateResult{
-			Key: res.Key,
-			Status: &generic.ItemStatus{
-				Status:  res.Status.State.String(),
-				Message: msg,
-			},
-		})
-	}
-	return updateResults, nil
+	// TODO: use grpc client to delete items with labels
+	return nil, nil
 }
 
 func (c *client) DumpState() ([]*generic.StateItem, error) {

plugins/orchestrator/contextdecorator/context.go

@@ -29,36 +29,3 @@ func DataSrcFromContext(ctx context.Context) (dataSrc string, ok bool) {
 	dataSrc, ok = ctx.Value(dataSrcKey).(string)
 	return
 }
-
-type labelsKeyT string
-
-var labelsKey = labelsKeyT("labels")
-
-func LabelsContext(ctx context.Context, labels map[string]string) context.Context {
-	return context.WithValue(ctx, labelsKey, labels)
-}
-
-func LabelsFromContext(ctx context.Context) (labels map[string]string, ok bool) {
-	labels, ok = ctx.Value(labelsKey).(map[string]string)
-	return
-}
-
-// TODO: This is hack to avoid import cycle between orchestrator and contextdecorator package.
-// Figure out a way to pass result into local client without using interface implemented by
-// a wrapper type defined inside orchestrator package.
-type resulter interface {
-	IsPushDataResult()
-}
-
-type pushDataResultKeyT string
-
-var pushDataResultKey = pushDataResultKeyT("pushDataResult")
-
-func PushDataResultContext(ctx context.Context, pushDataResult resulter) context.Context {
-	return context.WithValue(ctx, pushDataResultKey, pushDataResult)
-}
-
-func PushDataResultFromContext(ctx context.Context) (pushDataResult resulter, ok bool) {
-	pushDataResult, ok = ctx.Value(pushDataResultKey).(resulter)
-	return
-}

plugins/orchestrator/orchestrator.go

@@ -184,21 +184,10 @@ func (p *Plugin) watchEvents() {
 
 			var err error
 			var kvPairs []KeyVal
-			keyLabels := make(map[string]Labels)
-
-			ctx := e.GetContext()
-			if ctx == nil {
-				ctx = context.Background()
-			}
-			labels, ok := contextdecorator.LabelsFromContext(ctx)
-			if !ok {
-				labels = Labels{}
-			}
 
 			for _, x := range e.GetChanges() {
-				key := x.GetKey()
 				kv := KeyVal{
-					Key: key,
+					Key: x.GetKey(),
 				}
 				if x.GetChangeType() != datasync.Delete {
 					kv.Val, err = UnmarshalLazyValue(kv.Key, x)
@@ -208,7 +197,6 @@ func (p *Plugin) watchEvents() {
 					}
 				}
 				kvPairs = append(kvPairs, kv)
-				keyLabels[key] = labels
 			}
 
 			if len(kvPairs) == 0 {
@@ -219,15 +207,16 @@ func (p *Plugin) watchEvents() {
 
 			p.log.Debugf("Change with %d items", len(kvPairs))
 
+			ctx := e.GetContext()
+			if ctx == nil {
+				ctx = context.Background()
+			}
 			_, withDataSrc := contextdecorator.DataSrcFromContext(ctx)
 			if !withDataSrc {
 				ctx = contextdecorator.DataSrcContext(ctx, "datasync")
 			}
 			ctx = kvs.WithRetryDefault(ctx)
-			res, err := p.PushData(ctx, kvPairs, keyLabels)
-			if err == nil {
-				ctx = contextdecorator.PushDataResultContext(ctx, ResultWrapper{Results: res})
-			}
+			_, err = p.PushData(ctx, kvPairs, nil)
 			e.Done(err)
 
 		case e := <-p.resyncChan:
@@ -274,10 +263,7 @@ func (p *Plugin) watchEvents() {
 			ctx = kvs.WithResync(ctx, kvs.FullResync, true)
 			ctx = kvs.WithRetryDefault(ctx)
 
-			res, err := p.PushData(ctx, kvPairs, nil)
-			if err == nil {
-				ctx = contextdecorator.PushDataResultContext(ctx, ResultWrapper{Results: res})
-			}
+			_, err := p.PushData(ctx, kvPairs, nil)
 			e.Done(err)
 
 		case <-p.quit:
@@ -386,13 +372,3 @@ func ContainsItemID(want []*generic.Item_ID, have *generic.Item_ID) bool {
 	}
 	return false
 }
-
-// TODO: This is hack to avoid import cycle between orchestrator and contextdecorator package.
-// Figure out a way to pass result into local client without using wrapper type that implements
-// a dummy interface defined inside contextdecorator package.
-type ResultWrapper struct {
-	Results []Result
-}
-
-// implement the dummy interface (see comment above ResultWrapper struct definition)
-func (r ResultWrapper) IsPushDataResult() {}