engine: Resources package rewrite

This giant patch makes some much needed improvements to the code base.

* The engine has been rewritten and lives within engine/graph/
* All of the common interfaces and code now live in engine/
* All of the resources are in one package called engine/resources/
* The Res API can use different "traits" from engine/traits/
* The Res API has been simplified to hide many of the old internals
* The Watch & Process loops were previously inverted, but is now fixed
* The likelihood of package cycles has been reduced drastically
* And much, much more...

Unfortunately, some code had to be temporarily removed. The remote code
had to be taken out, as did the prometheus code. We hope to have these
back in new forms as soon as possible.

integration/basic_test.go

@@ -24,6 +24,8 @@ import (
 	"path"
 	"sort"
 	"testing"
+
+	"github.com/purpleidea/mgmt/util"
 )
 
 func TestInstance0(t *testing.T) {
@@ -67,7 +69,7 @@ func TestInstance1(t *testing.T) {
 	values := []test{}
 
 	{
-		code := Code(`
+		code := util.Code(`
 		$root = getenv("MGMT_TEST_ROOT")
 
 		file "${root}/mgmt-hello-world" {
@@ -150,7 +152,7 @@ func TestCluster1(t *testing.T) {
 	values := []test{}
 
 	{
-		code := Code(`
+		code := util.Code(`
 		$root = getenv("MGMT_TEST_ROOT")
 
 		file "${root}/mgmt-hostname" {
@@ -174,7 +176,7 @@ func TestCluster1(t *testing.T) {
 		})
 	}
 	{
-		code := Code(`
+		code := util.Code(`
 		$root = getenv("MGMT_TEST_ROOT")
 
 		file "${root}/mgmt-hostname" {

integration/instance.go

@@ -52,11 +52,11 @@ const (
 
 	// longTimeout is a high bound of time we're willing to wait for events.
 	// If we exceed this timeout, then it's likely we are blocked somewhere.
-	longTimeout = 30 // seconds
+	longTimeout = 60 // seconds
 
 	// convergedTimeout is the number of seconds we wait for our instance to
 	// remain unchanged to be considered as converged.
-	convergedTimeout = 5 // seconds
+	convergedTimeout = 15 // seconds
 
 	// dirMode is the the mode used when making directories.
 	dirMode = 0755
@@ -297,7 +297,7 @@ func (obj *Instance) Wait(ctx context.Context) error {
 	for {
 		select {
 		// FIXME: instead of sending one event here, the recwatch
-		// library should sent one initial event at startup...
+		// library should send one initial event at startup...
 		case <-startup:
 			startup = nil
 			// send an initial event

integration/util.go

@@ -25,7 +25,6 @@ import (
 	"path/filepath"
 	"runtime"
 	"strconv"
-	"strings"
 
 	errwrap "github.com/pkg/errors"
 )
@@ -48,37 +47,6 @@ func BinaryPath() (string, error) {
 	return path.Join(root, binaryName), nil
 }
 
-// Code takes a code block as a backtick enclosed `heredoc` and removes any
-// common indentation from each line. This helps inline code as strings to be
-// formatted nicely without unnecessary indentation. It also drops the very
-// first line of code if it has zero length.
-func Code(code string) string {
-	output := []string{}
-	lines := strings.Split(code, "\n")
-	var found bool
-	var strip string // prefix to remove
-	for i, x := range lines {
-		if !found && len(x) > 0 {
-			for j := 0; j < len(x); j++ {
-				if x[j] != '\t' {
-					break
-				}
-				strip += "\t"
-			}
-			// otherwise, there's no indentation
-			found = true
-		}
-		if i == 0 && len(x) == 0 { // drop first line if it's empty
-			continue
-		}
-
-		s := strings.TrimPrefix(x, strip)
-		output = append(output, s)
-	}
-
-	return strings.Join(output, "\n")
-}
-
 // ParsePort parses a URL and returns the port that was found.
 func ParsePort(input string) (int, error) {
 	u, err := url.Parse(input)

integration/util_test.go

@@ -41,29 +41,6 @@ func TestBinaryPath(t *testing.T) {
 	_ = fi
 }
 
-func TestCodeIndent(t *testing.T) {
-	c1 := Code(
-		`
-	$root = getenv("MGMT_TEST_ROOT")
-
-	file "${root}/mgmt-hello-world" {
-		content => "hello world from @purpleidea\n",
-		state => "exists",
-	}
-	`)
-	c2 :=
-		`$root = getenv("MGMT_TEST_ROOT")
-
-file "${root}/mgmt-hello-world" {
-	content => "hello world from @purpleidea\n",
-	state => "exists",
-}
-`
-	if c1 != c2 {
-		t.Errorf("code samples differ")
-	}
-}
-
 func TestParsePort(t *testing.T) {
 	if port, err := ParsePort("http://127.0.0.1:2379"); err != nil {
 		t.Errorf("could not determine port: %+v", err)