github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
consul/agent/nodeid_test.go

113 lines
3.0 KiB
Go
Raw Normal View History

Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
package agent
import (
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
"fmt"
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
"io/ioutil"
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
"os"
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
"path/filepath"
"strings"
"testing"
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
"github.com/hashicorp/consul/agent/config"
"github.com/hashicorp/consul/sdk/testutil"
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
"github.com/hashicorp/consul/types"
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
"github.com/hashicorp/go-hclog"
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
"github.com/hashicorp/go-uuid"
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
"github.com/stretchr/testify/require"
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
)
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
func TestNewNodeIDFromConfig(t *testing.T) {
logger := hclog.New(nil)
tmpDir := testutil.TempDir(t, "")
t.Cleanup(func() {
os.RemoveAll(tmpDir)
})
cfg := &config.RuntimeConfig{
DataDir: tmpDir,
}
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
var randomNodeID types.NodeID
t.Run("a new ID is generated when none is specified", func(t *testing.T) {
var err error
randomNodeID, err = newNodeIDFromConfig(cfg, logger)
require.NoError(t, err)
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
_, err = uuid.ParseUUID(string(randomNodeID))
require.NoError(t, err)
})
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
t.Run("running again should get the NodeID that was persisted to disk", func(t *testing.T) {
nodeID, err := newNodeIDFromConfig(cfg, logger)
require.NoError(t, err)
require.NotEqual(t, nodeID, "")
require.Equal(t, nodeID, randomNodeID)
})
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
t.Run("invalid NodeID in config", func(t *testing.T) {
cfg.NodeID = "nope"
_, err := newNodeIDFromConfig(cfg, logger)
require.Error(t, err)
require.Contains(t, err.Error(), "specified NodeID is invalid")
})
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
t.Run("valid NodeID in config", func(t *testing.T) {
newID, err := uuid.GenerateUUID()
require.NoError(t, err)
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
cfg.NodeID = types.NodeID(strings.ToUpper(newID))
nodeID, err := newNodeIDFromConfig(cfg, logger)
require.NoError(t, err)
require.Equal(t, string(nodeID), newID)
})
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
t.Run("invalid NodeID in file", func(t *testing.T) {
cfg.NodeID = ""
filename := filepath.Join(cfg.DataDir, "node-id")
err := ioutil.WriteFile(filename, []byte("adf4238a!882b!9ddc!4a9d!5b6758e4159e"), 0600)
require.NoError(t, err)
_, err = newNodeIDFromConfig(cfg, logger)
require.Error(t, err)
require.Contains(t, err.Error(), fmt.Sprintf("NodeID in %s is invalid", filename))
})
t.Run("valid NodeID in file", func(t *testing.T) {
cfg.NodeID = ""
filename := filepath.Join(cfg.DataDir, "node-id")
err := ioutil.WriteFile(filename, []byte("ADF4238a-882b-9ddc-4a9d-5b6758e4159e"), 0600)
require.NoError(t, err)
nodeID, err := newNodeIDFromConfig(cfg, logger)
require.NoError(t, err)
require.Equal(t, string(nodeID), "adf4238a-882b-9ddc-4a9d-5b6758e4159e")
})
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
}
func TestMakeNodeID(t *testing.T) {
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
logger := hclog.New(nil)
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
var randomID string
t.Run("Random ID when HostNodeID is disabled", func(t *testing.T) {
var err error
randomID, err = makeNodeID(logger, true)
require.NoError(t, err)
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
_, err = uuid.ParseUUID(randomID)
require.NoError(t, err)
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
agent: convert NodeID methods to functions Making these functions allows us to cleanup how an agent is initialized. They only make use of a config and a logger, so they do not need to be agent methods. Also cleanup the testing to use t.Run and require.
2020-08-07 23:24:51 +00:00
another, err := makeNodeID(logger, true)
require.NoError(t, err)
require.NotEqual(t, randomID, another)
})
t.Run("host-based ID when HostNodeID is enabled", func(t *testing.T) {
id, err := makeNodeID(logger, false)
require.NoError(t, err)
require.NotEqual(t, randomID, id)
another, err := makeNodeID(logger, false)
require.NoError(t, err)
require.Equal(t, id, another)
})
Extract nodeID functions to a different file In preparation for turning them into functions. To reduce the scope of Agent, and refactor how Agent is created and started.
2020-08-07 22:30:32 +00:00
}