// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: BUSL-1.1
package watch
import (
"os"
"path/filepath"
"strings"
"testing"
pkg refactor
command/agent/* -> agent/*
command/consul/* -> agent/consul/*
command/agent/command{,_test}.go -> command/agent{,_test}.go
command/base/command.go -> command/base.go
command/base/* -> command/*
commands.go -> command/commands.go
The script which did the refactor is:
(
cd $GOPATH/src/github.com/hashicorp/consul
git mv command/agent/command.go command/agent.go
git mv command/agent/command_test.go command/agent_test.go
git mv command/agent/flag_slice_value{,_test}.go command/
git mv command/agent .
git mv command/base/command.go command/base.go
git mv command/base/config_util{,_test}.go command/
git mv commands.go command/
git mv consul agent
rmdir command/base/
gsed -i -e 's|package agent|package command|' command/agent{,_test}.go
gsed -i -e 's|package agent|package command|' command/flag_slice_value{,_test}.go
gsed -i -e 's|package base|package command|' command/base.go command/config_util{,_test}.go
gsed -i -e 's|package main|package command|' command/commands.go
gsed -i -e 's|base.Command|BaseCommand|' command/commands.go
gsed -i -e 's|agent.Command|AgentCommand|' command/commands.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/commands.go
gsed -i -e 's|base\.||' command/commands.go
gsed -i -e 's|command\.||' command/commands.go
gsed -i -e 's|command|c|' main.go
gsed -i -e 's|range Commands|range command.Commands|' main.go
gsed -i -e 's|Commands: Commands|Commands: command.Commands|' main.go
gsed -i -e 's|base\.BoolValue|BoolValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.DurationValue|DurationValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.StringValue|StringValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.UintValue|UintValue|' command/operator_autopilot_set.go
gsed -i -e 's|\bCommand\b|BaseCommand|' command/base.go
gsed -i -e 's|BaseCommand Options|Command Options|' command/base.go
gsed -i -e 's|base.Command|BaseCommand|' command/*.go
gsed -i -e 's|c\.Command|c.BaseCommand|g' command/*.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/*_test.go
gsed -i -e 's|base\.||' command/*_test.go
gsed -i -e 's|\bCommand\b|AgentCommand|' command/agent{,_test}.go
gsed -i -e 's|cmd.AgentCommand|cmd.BaseCommand|' command/agent.go
gsed -i -e 's|cli.AgentCommand = new(Command)|cli.Command = new(AgentCommand)|' command/agent_test.go
gsed -i -e 's|exec.AgentCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|exec.BaseCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|NewTestAgent|agent.NewTestAgent|' command/agent_test.go
gsed -i -e 's|= TestConfig|= agent.TestConfig|' command/agent_test.go
gsed -i -e 's|: RetryJoin|: agent.RetryJoin|' command/agent_test.go
gsed -i -e 's|\.\./\.\./|../|' command/config_util_test.go
gsed -i -e 's|\bverifyUniqueListeners|VerifyUniqueListeners|' agent/config{,_test}.go command/agent.go
gsed -i -e 's|\bserfLANKeyring\b|SerfLANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bserfWANKeyring\b|SerfWANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bNewAgent\b|agent.New|g' command/agent{,_test}.go
gsed -i -e 's|\bNewAgent|New|' agent/{acl_test,agent,testagent}.go
gsed -i -e 's|\bAgent\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bBool\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDefaultConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDevConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bMergeConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bReadConfigPaths\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bParseMetaPair\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfLANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfWANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|circonus\.agent|circonus|g' command/agent{,_test}.go
gsed -i -e 's|logger\.agent|logger|g' command/agent{,_test}.go
gsed -i -e 's|metrics\.agent|metrics|g' command/agent{,_test}.go
gsed -i -e 's|// agent.Agent|// agent|' command/agent{,_test}.go
gsed -i -e 's|a\.agent\.Config|a.Config|' command/agent{,_test}.go
gsed -i -e 's|agent\.AppendSliceValue|AppendSliceValue|' command/{configtest,validate}.go
gsed -i -e 's|consul/consul|agent/consul|' GNUmakefile
gsed -i -e 's|\.\./test|../../test|' agent/consul/server_test.go
# fix imports
f=$(grep -rl 'github.com/hashicorp/consul/command/agent' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/command/agent|github.com/hashicorp/consul/agent|' $f
goimports -w $f
f=$(grep -rl 'github.com/hashicorp/consul/consul' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/consul|github.com/hashicorp/consul/agent/consul|' $f
goimports -w $f
goimports -w command/*.go main.go
)
8 years ago
"github.com/hashicorp/consul/agent"
"github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/testrpc"
"github.com/mitchellh/cli"
"github.com/stretchr/testify/require"
)
func TestWatchCommand_noTabs ( t * testing . T ) {
t . Parallel ( )
if strings . ContainsRune ( New ( cli . NewMockUi ( ) , nil ) . Help ( ) , '\t' ) {
t . Fatal ( "help has tabs" )
}
}
func TestWatchCommand ( t * testing . T ) {
if testing . Short ( ) {
t . Skip ( "too slow for testing.Short" )
}
t . Parallel ( )
a := agent . NewTestAgent ( t , ` ` )
defer a . Shutdown ( )
testrpc . WaitForTestAgent ( t , a . RPC , "dc1" )
ui := cli . NewMockUi ( )
c := New ( ui , nil )
args := [ ] string { "-http-addr=" + a . HTTPAddr ( ) , "-type=nodes" }
code := c . Run ( args )
if code != 0 {
t . Fatalf ( "bad: %d. %#v" , code , ui . ErrorWriter . String ( ) )
}
if ! strings . Contains ( ui . OutputWriter . String ( ) , a . Config . NodeName ) {
t . Fatalf ( "bad: %#v" , ui . OutputWriter . String ( ) )
}
}
func TestWatchCommand_loadToken ( t * testing . T ) {
if testing . Short ( ) {
t . Skip ( "too slow for testing.Short" )
}
a := agent . NewTestAgent ( t , ` ` )
defer a . Shutdown ( )
testrpc . WaitForTestAgent ( t , a . RPC , "dc1" )
const testToken = "4a0db5a1-869f-4602-ae8a-b0306a82f1ef"
testDir := testutil . TempDir ( t , "watchtest" )
fullname := filepath . Join ( testDir , "token.txt" )
require . NoError ( t , os . WriteFile ( fullname , [ ] byte ( testToken ) , 0600 ) )
resetEnv := func ( ) {
os . Unsetenv ( "CONSUL_HTTP_TOKEN" )
os . Unsetenv ( "CONSUL_HTTP_TOKEN_FILE" )
}
t . Run ( "token arg" , func ( t * testing . T ) {
resetEnv ( )
defer resetEnv ( )
ui := cli . NewMockUi ( )
c := New ( ui , nil )
args := [ ] string {
"-http-addr=" + a . HTTPAddr ( ) ,
"-type=nodes" ,
"-token" , testToken ,
}
require . NoError ( t , c . flags . Parse ( args ) )
tok , err := c . loadToken ( )
require . NoError ( t , err )
require . Equal ( t , testToken , tok )
} )
t . Run ( "token env" , func ( t * testing . T ) {
resetEnv ( )
defer resetEnv ( )
ui := cli . NewMockUi ( )
c := New ( ui , nil )
args := [ ] string {
"-http-addr=" + a . HTTPAddr ( ) ,
"-type=nodes" ,
}
os . Setenv ( "CONSUL_HTTP_TOKEN" , testToken )
require . NoError ( t , c . flags . Parse ( args ) )
tok , err := c . loadToken ( )
require . NoError ( t , err )
require . Equal ( t , testToken , tok )
} )
t . Run ( "token file arg" , func ( t * testing . T ) {
resetEnv ( )
defer resetEnv ( )
ui := cli . NewMockUi ( )
c := New ( ui , nil )
args := [ ] string {
"-http-addr=" + a . HTTPAddr ( ) ,
"-type=nodes" ,
"-token-file" , fullname ,
}
require . NoError ( t , c . flags . Parse ( args ) )
tok , err := c . loadToken ( )
require . NoError ( t , err )
require . Equal ( t , testToken , tok )
} )
t . Run ( "token file env" , func ( t * testing . T ) {
resetEnv ( )
defer resetEnv ( )
ui := cli . NewMockUi ( )
c := New ( ui , nil )
args := [ ] string {
"-http-addr=" + a . HTTPAddr ( ) ,
"-type=nodes" ,
}
os . Setenv ( "CONSUL_HTTP_TOKEN_FILE" , fullname )
require . NoError ( t , c . flags . Parse ( args ) )
tok , err := c . loadToken ( )
require . NoError ( t , err )
require . Equal ( t , testToken , tok )
} )
}
func TestWatchCommandNoConnect ( t * testing . T ) {
if testing . Short ( ) {
t . Skip ( "too slow for testing.Short" )
}
t . Parallel ( )
a := agent . NewTestAgent ( t , ` ` )
defer a . Shutdown ( )
testrpc . WaitForTestAgent ( t , a . RPC , "dc1" )
ui := cli . NewMockUi ( )
c := New ( ui , nil )
args := [ ] string { "-http-addr=" + a . HTTPAddr ( ) , "-type=connect_leaf" }
code := c . Run ( args )
if code != 1 {
t . Fatalf ( "bad: %d. %#v" , code , ui . ErrorWriter . String ( ) )
}
if ! strings . Contains ( ui . ErrorWriter . String ( ) ,
"Type connect_leaf is not supported in the CLI tool" ) {
t . Fatalf ( "bad: %#v" , ui . ErrorWriter . String ( ) )
}
}
func TestWatchCommandNoAgentService ( t * testing . T ) {
if testing . Short ( ) {
t . Skip ( "too slow for testing.Short" )
}
t . Parallel ( )
a := agent . NewTestAgent ( t , ` ` )
defer a . Shutdown ( )
ui := cli . NewMockUi ( )
c := New ( ui , nil )
args := [ ] string { "-http-addr=" + a . HTTPAddr ( ) , "-type=agent_service" }
code := c . Run ( args )
if code != 1 {
t . Fatalf ( "bad: %d. %#v" , code , ui . ErrorWriter . String ( ) )
}
if ! strings . Contains ( ui . ErrorWriter . String ( ) ,
"Type agent_service is not supported in the CLI tool" ) {
t . Fatalf ( "bad: %#v" , ui . ErrorWriter . String ( ) )
}
}