Minor Code Fixes (#1361)

* fix panic if model is registered without name * fix key variable shadowed
ligato · May 29, 2019 · 19b0af2 · 19b0af2
1 parent 37867b1
commit 19b0af2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/models/encoding.go b/pkg/models/encoding.go
@@ -113,7 +113,7 @@ func getItemID(pb proto.Message) (*api.Item_ID, error) {
 		return nil, fmt.Errorf("message %s is not registered as model", protoName)
 	}
 
-	name, err := model.nameFunc(pb)
+	name, err := model.name(pb)
 	if err != nil {
 		return nil, err
 	}

diff --git a/plugins/orchestrator/genericmanager.go b/plugins/orchestrator/genericmanager.go
@@ -80,7 +80,7 @@ func (s *genericManagerSvc) SetConfig(ctx context.Context, req *api.SetConfigReq
 			if err != nil {
 				return nil, status.Error(codes.InvalidArgument, err.Error())
 			}
-			key := model.KeyPrefix() + item.Id.Name
+			key = model.KeyPrefix() + item.Id.Name
 			ops[key] = api.UpdateResult_DELETE
 		} else {
 			return nil, status.Error(codes.InvalidArgument, "ProtoItem has no key or val defined.")