compliance, nodemanager: removed unused functions (#1138)

While this removes code, I think it is a bit of a downside as these
functions are kind of a family of functions that make sense to travel
together. My hope in cleaning up this kind of thing between services
is so that we can start to see what kind of functionality might be
useful to share somewhere.

Signed-off-by: Steven Danna <[email protected]>

Author: stevendanna

components/compliance-service/dao/pgdb/tags.go

@@ -1,10 +1,9 @@
 package pgdb
 
 import (
-	"encoding/json"
+	"github.com/pkg/errors"
 
 	"github.com/chef/automate/components/compliance-service/api/common"
-	"github.com/pkg/errors"
 )
 
 type tag struct {
@@ -68,30 +67,3 @@ func RemoveKeyValue(tags []*common.Kv, key string) []*common.Kv {
 	}
 	return tags
 }
-
-// KeyValueToRawMap helps convert an array of KeyValues in a Map and convert it to json
-func KeyValueToRawMap(arr []*common.Kv) (json.RawMessage, error) {
-	zaMap := make(map[string]string, 0)
-	for _, kv := range arr {
-		zaMap[kv.Key] = kv.Value
-	}
-	jsonMap, err := json.Marshal(zaMap)
-	if err != nil {
-		return jsonMap, errors.Wrap(err, "keyValueToRawMap unable to marshal map")
-	}
-	return jsonMap, nil
-}
-
-// RawMapToKeyValue helps convert an array of KeyValues in a Map and convert it to json
-func RawMapToKeyValue(rawJSON json.RawMessage) ([]*common.Kv, error) {
-	var zaMap map[string]string
-	var zaArray []*common.Kv
-	err := json.Unmarshal(rawJSON, &zaMap)
-	if err != nil {
-		return zaArray, errors.Wrap(err, "rawMapToKeyValue unable to unmarshal map")
-	}
-	for k, v := range zaMap {
-		zaArray = append(zaArray, &common.Kv{Key: k, Value: v})
-	}
-	return zaArray, nil
-}

components/compliance-service/dao/pgdb/tags_test.go

@@ -1,7 +1,6 @@
 package pgdb
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/chef/automate/components/compliance-service/api/common"
@@ -64,61 +63,3 @@ func TestRemoveKeyValueReturnsArrayWithKeyRemoved(t *testing.T) {
 
 	assert.Equal(t, []*common.Kv{&secret2}, result)
 }
-
-func TestKeyValueToRawMapReturnsEmptyMessageWhenArrayEmpty(t *testing.T) {
-	var tags []*common.Kv
-	var bytes []byte
-	var err error
-	var j json.RawMessage
-
-	if j, err = KeyValueToRawMap(tags); err != nil {
-		t.FailNow()
-	}
-
-	bytes, _ = j.MarshalJSON()
-
-	assert.Equal(t, "{}", string(bytes))
-}
-
-func TestKeyValueToRawMapReturnsJsonMessage(t *testing.T) {
-	secret1 := common.Kv{Key: "key1", Value: "value1"}
-	secret2 := common.Kv{Key: "key2", Value: "value2"}
-	tags := []*common.Kv{&secret1, &secret2}
-
-	var bytes []byte
-	var err error
-	var j json.RawMessage
-
-	if j, err = KeyValueToRawMap(tags); err != nil {
-		t.FailNow()
-	}
-
-	bytes, _ = j.MarshalJSON()
-
-	assert.Equal(t, "{\"key1\":\"value1\",\"key2\":\"value2\"}", string(bytes))
-}
-
-func TestRawMapToKeyValueReturnsEmptyTagsWhenJsonEmpty(t *testing.T) {
-	var tags []*common.Kv
-	j := json.RawMessage(`{}`)
-
-	result, err := RawMapToKeyValue(j)
-
-	if assert.Nil(t, err) {
-		assert.ElementsMatch(t, tags, result)
-	}
-}
-
-func TestRawMapToKeyValueReturnsKeyValues(t *testing.T) {
-	secret1 := common.Kv{Key: "key1", Value: "value1"}
-	secret2 := common.Kv{Key: "key2", Value: "value2"}
-	tags := []*common.Kv{&secret1, &secret2}
-
-	j := json.RawMessage(`{"key1":"value1","key2":"value2"}`)
-
-	result, err := RawMapToKeyValue(j)
-
-	if assert.Nil(t, err) {
-		assert.ElementsMatch(t, tags, result)
-	}
-}

components/nodemanager-service/pgdb/tags.go

@@ -1,8 +1,6 @@
 package pgdb
 
 import (
-	"encoding/json"
-
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
@@ -104,52 +102,3 @@ func (trans *DBTrans) tagNode(nodeID string, tagIDs []string) error {
 	}
 	return trans.Insert(links...)
 }
-
-// FindKeyValue finds a Tag object in the array based on key match
-func FindKeyValue(tags []*common.Kv, key string) *common.Kv {
-	for _, tag := range tags {
-		if tag.Key == key {
-			return tag
-		}
-	}
-	return &common.Kv{}
-}
-
-// RemoveKeyValue removes an item from the array base on key match
-func RemoveKeyValue(tags []*common.Kv, key string) []*common.Kv {
-	for i, tag := range tags {
-		if tag.Key == key {
-			tags[i] = tags[len(tags)-1]
-			return tags[:len(tags)-1]
-		}
-	}
-	return tags
-}
-
-// KeyValueToRawMap helps convert an array of KeyValues in a Map and convert it to json
-func KeyValueToRawMap(arr []*common.Kv) (json.RawMessage, error) {
-	zaMap := make(map[string]string, 0)
-	for _, kv := range arr {
-		zaMap[kv.Key] = kv.Value
-	}
-	jsonMap, err := json.Marshal(zaMap)
-	if err != nil {
-		return jsonMap, errors.Wrap(err, "keyValueToRawMap unable to marshal map")
-	}
-	return jsonMap, nil
-}
-
-// RawMapToKeyValue helps convert an array of KeyValues in a Map and convert it to json
-func RawMapToKeyValue(rawJSON json.RawMessage) ([]*common.Kv, error) {
-	var zaMap map[string]string
-	err := json.Unmarshal(rawJSON, &zaMap)
-	if err != nil {
-		return nil, errors.Wrap(err, "rawMapToKeyValue unable to unmarshal map")
-	}
-
-	zaArray := make([]*common.Kv, 0, len(zaMap))
-	for k, v := range zaMap {
-		zaArray = append(zaArray, &common.Kv{Key: k, Value: v})
-	}
-	return zaArray, nil
-}