Migrate to Go 1.18 (#45)

* Migrate to Go 1.18 and add linters

dag/dag.go

@@ -25,6 +25,9 @@ package dag
 import (
 	"errors"
 	"sort"
+
+	"golang.org/x/exp/maps"
+	"golang.org/x/exp/slices"
 )
 
 type Graph struct {
@@ -52,6 +55,7 @@ func (g *Graph) AddNode(name string) error {
 	}
 	g.outputs[name] = make(map[string]struct{})
 	g.inputs[name] = 0
+
 	return nil
 }
 
@@ -61,6 +65,7 @@ func (g *Graph) AddNodes(names ...string) error {
 			return err
 		}
 	}
+
 	return nil
 }
 
@@ -101,7 +106,9 @@ func (g *Graph) Toposort() ([]string, error) {
 		L = append(L, n)
 
 		ms := make([]string, len(outputs[n]))
-		for _, k := range keys(outputs[n]) {
+		keys := maps.Keys(outputs[n])
+		slices.Sort(keys)
+		for _, k := range keys {
 			m := k
 			// i := outputs[n][m]
 			// ms[i-1] = m
@@ -130,15 +137,6 @@ func (g *Graph) Toposort() ([]string, error) {
 	return L, nil
 }
 
-func keys(m map[string]struct{}) []string {
-	var keys []string
-	for k := range m {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-	return keys
-}
-
 func (g *Graph) GetParents(id string) []string {
 	var parents []string
 	for node, targets := range g.outputs {
@@ -147,6 +145,7 @@ func (g *Graph) GetParents(id string) []string {
 		}
 	}
 	sort.Strings(parents)
+
 	return parents
 }
 
@@ -160,5 +159,6 @@ func (g *Graph) GetRoot() (string, error) {
 	if len(roots) != 1 {
 		return "", errors.New("more than one root")
 	}
+
 	return roots[0], nil
 }

dag/dag_test.go

@@ -20,23 +20,17 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-package dag
+package dag_test
 
 import (
 	"reflect"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-)
+	"golang.org/x/exp/slices"
 
-func index(s []string, v string) int {
-	for i, s := range s {
-		if s == v {
-			return i
-		}
-	}
-	return -1
-}
+	"github.com/SecurityBrewery/catalyst/dag"
+)
 
 type Edge struct {
 	From string
@@ -44,13 +38,17 @@ type Edge struct {
 }
 
 func TestDuplicatedNode(t *testing.T) {
-	graph := NewGraph()
+	t.Parallel()
+
+	graph := dag.NewGraph()
 	assert.NoError(t, graph.AddNode("a"))
 	assert.Error(t, graph.AddNode("a"))
 }
 
 func TestWikipedia(t *testing.T) {
-	graph := NewGraph()
+	t.Parallel()
+
+	graph := dag.NewGraph()
 	assert.NoError(t, graph.AddNodes("2", "3", "5", "7", "8", "9", "10", "11"))
 
 	edges := []Edge{
@@ -79,27 +77,30 @@ func TestWikipedia(t *testing.T) {
 	}
 
 	for _, e := range edges {
-		if i, j := index(result, e.From), index(result, e.To); i > j {
+		if i, j := slices.Index(result, e.From), slices.Index(result, e.To); i > j {
 			t.Errorf("dependency failed: not satisfy %v(%v) > %v(%v)", e.From, i, e.To, j)
 		}
 	}
 }
 
 func TestCycle(t *testing.T) {
-	graph := NewGraph()
+	t.Parallel()
+
+	graph := dag.NewGraph()
 	assert.NoError(t, graph.AddNodes("1", "2", "3"))
 
 	assert.NoError(t, graph.AddEdge("1", "2"))
 	assert.NoError(t, graph.AddEdge("2", "3"))
 	assert.NoError(t, graph.AddEdge("3", "1"))
 
-	_, err := graph.Toposort()
-	if err == nil {
+	if _, err := graph.Toposort(); err == nil {
 		t.Errorf("closed path not detected in closed pathed graph")
 	}
 }
 
 func TestGraph_GetParents(t *testing.T) {
+	t.Parallel()
+
 	type fields struct {
 		nodes []string
 		edges map[string]string
@@ -117,8 +118,11 @@ func TestGraph_GetParents(t *testing.T) {
 		{"parents 3", fields{nodes: []string{"1", "2", "3"}, edges: map[string]string{"1": "3", "2": "3"}}, args{id: "3"}, []string{"1", "2"}},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			g := NewGraph()
+			t.Parallel()
+
+			g := dag.NewGraph()
 			for _, node := range tt.fields.nodes {
 				assert.NoError(t, g.AddNode(node))
 			}
@@ -134,7 +138,9 @@ func TestGraph_GetParents(t *testing.T) {
 }
 
 func TestDAG_AddNode(t *testing.T) {
-	dag := NewGraph()
+	t.Parallel()
+
+	dag := dag.NewGraph()
 
 	v := "1"
 	assert.NoError(t, dag.AddNode(v))
@@ -143,7 +149,9 @@ func TestDAG_AddNode(t *testing.T) {
 }
 
 func TestDAG_AddEdge(t *testing.T) {
-	dag := NewGraph()
+	t.Parallel()
+
+	dag := dag.NewGraph()
 	assert.NoError(t, dag.AddNode("0"))
 	assert.NoError(t, dag.AddNode("1"))
 	assert.NoError(t, dag.AddNode("2"))
@@ -162,7 +170,9 @@ func TestDAG_AddEdge(t *testing.T) {
 }
 
 func TestDAG_GetParents(t *testing.T) {
-	dag := NewGraph()
+	t.Parallel()
+
+	dag := dag.NewGraph()
 	assert.NoError(t, dag.AddNode("1"))
 	assert.NoError(t, dag.AddNode("2"))
 	assert.NoError(t, dag.AddNode("3"))
@@ -176,7 +186,9 @@ func TestDAG_GetParents(t *testing.T) {
 }
 
 func TestDAG_GetDescendants(t *testing.T) {
-	dag := NewGraph()
+	t.Parallel()
+
+	dag := dag.NewGraph()
 	assert.NoError(t, dag.AddNode("1"))
 	assert.NoError(t, dag.AddNode("2"))
 	assert.NoError(t, dag.AddNode("3"))
@@ -188,7 +200,9 @@ func TestDAG_GetDescendants(t *testing.T) {
 }
 
 func TestDAG_Topsort(t *testing.T) {
-	dag := NewGraph()
+	t.Parallel()
+
+	dag := dag.NewGraph()
 	assert.NoError(t, dag.AddNode("1"))
 	assert.NoError(t, dag.AddNode("2"))
 	assert.NoError(t, dag.AddNode("3"))
@@ -203,7 +217,9 @@ func TestDAG_Topsort(t *testing.T) {
 }
 
 func TestDAG_TopsortStable(t *testing.T) {
-	dag := NewGraph()
+	t.Parallel()
+
+	dag := dag.NewGraph()
 	assert.NoError(t, dag.AddNode("1"))
 	assert.NoError(t, dag.AddNode("2"))
 	assert.NoError(t, dag.AddNode("3"))
@@ -216,7 +232,9 @@ func TestDAG_TopsortStable(t *testing.T) {
 }
 
 func TestDAG_TopsortStable2(t *testing.T) {
-	dag := NewGraph()
+	t.Parallel()
+
+	dag := dag.NewGraph()
 
 	assert.NoError(t, dag.AddNodes("block-ioc", "block-iocs", "block-sender", "board", "fetch-iocs", "escalate", "extract-iocs", "mail-available", "search-email-gateway"))
 	assert.NoError(t, dag.AddEdge("block-iocs", "block-ioc"))