831d84c940
build: make tests independent of build tags
...
When the metadata server is scanning the agents for potential servers
it is parsing the version number which the agent provided when it
joined. This version number has to conform to a certain format, i.e.
'n.n.n'. Without this version number properly set some tests fail with
error messages that disguise the root cause.
The default version number is currently set to 'unknown' in
version/version.go which does not parse and triggers the tests to fail.
The work around is to use a build tag 'consul' which will use the
version number set in version_base.go instead which has the correct
format and is set to the current release version.
In addition, some parts of the code also require the version number to
be of a certain value. Setting it to '0.0.0' for example makes some
tests pass and others fail since they don't pass the semantic check.
When using go build/install/test one has to remember to use '-tags
consul' or tests will fail with non-obvious error messages.
Using build tags makes the build process more complex and error prone
since it prevents the use of the plain go toolchain and - at least in
its current form - introduces subtle build and test issues. We should
try to eliminate build tags for anything else but platform specific
code.
This patch removes all references to specific version numbers in the
code and tests and sets the default version to '9.9.9' which is
syntactically correct and passes the semantic check. This solves the
issue of running go build/install/test without tags for the OSS build.
2017-08-30 13:40:18 +02:00
d6729243eb
fix command/kv_import.go help text ( #3387 )
2017-08-10 09:17:37 +02:00
4b642fed2f
agent: honor deprecated flags for retry-join-{ec2,azure,gce} ( #3384 )
2017-08-09 16:18:30 -07:00
1acff3533e
agent: move agent/consul/structs to agent/structs
2017-08-09 14:32:12 +02:00
d5634fe2a8
Add support for labels/filters from go-metrics
2017-08-08 01:45:10 -07:00
2fac427cd4
agent: use github.com/hashicorp/go-discover
...
Replace the provider specific node discovery code
with go-discover to support AWS, Azure and GCE.
Fixes #3282
2017-08-01 11:41:43 +02:00
840749db7e
Fix comments, and remove redundant TestConfig init from a couple of unit tests
2017-07-28 10:40:43 -05:00
aa98aeb4b1
Moved handling advertise address to readConfig and out of the agent's constructor, plus unit test fixes
2017-07-27 22:06:31 -05:00
25acd1534a
Move go-socketaddr template parsing into config package to make it happen before creating a new agent. Also removed redundant parsetemplate calls from agent.go.
2017-07-27 16:17:35 -05:00
08a8d9f2a7
command/lock: Add -child-exitcode, return 2 on child error ( #3329 )
...
* Exit 2 if -child-exit-code and the child returned with an error.
* There is no platform independent way to check the exact return code of
* the child, so on error always return 2.
* Closes #947
* Closes #1503
2017-07-26 22:09:19 -07:00
9268849d11
Add UpgradeVersionTag to autopilot get/set commands
2017-07-18 14:01:04 -07:00
1791d99a10
Adds new config to make script checks opt-in, updates documentation. ( #3284 )
2017-07-17 11:20:35 -07:00
86918be323
Sort tags so output is deterministic.
2017-07-14 17:00:08 -07:00
afd83a9705
Add catalog CLI functions ( #3204 )
2017-07-14 12:45:08 -07:00
406dc2ead8
command: make TestExecCommandRun_CrossDC more resilient
...
Wait after WAN join that both members see each other.
2017-07-07 09:22:34 +02:00
f1bded7c5e
Removes unneeded shutdown channel in config reading tests.
2017-06-25 10:39:51 -07:00
6977e40077
Fixes watch tracking during reloads and fixes address issue. ( #3189 )
...
This patch fixes watch registration through the config file and a broken log line when the watch registration fails. It also plumbs all the watch loading through a common function and tweaks the
unit test to create the watch before the reload.
2017-06-24 12:52:41 -07:00
380c8b957d
Changes host-based node IDs from opt-out to opt-in. ( #3187 )
2017-06-24 09:36:53 -07:00
3cdde3c7ca
Warn when attempting to bootstrap an even number of nodes ( #3158 )
...
* Warn when attempting to bootstrap an even number of nodes. Addresses #1282
* add more detailed warning for two server case
2017-06-21 15:36:55 -07:00
ea5b0f2c7c
agent: fix 'consul leave' shutdown race ( #2880 )
...
When the agent is triggered to shutdown via an external 'consul leave'
command delivered via the HTTP API then the client expects to receive a
response when the agent is down. This creates a race on when to shutdown
the agent itself like the RPC server, the checks and the state and the
external endpoints like DNS and HTTP.
This patch splits the shutdown process into two parts:
* shutdown the agent
* shutdown the endpoints (http and dns)
They can be executed multiple times, concurrently and in any order but
should be executed first agent, then endpoints to provide consistent
behavior across all use cases. Both calls have to be executed for a
proper shutdown.
This could be partially hidden in a single function but would introduce
some magic that happens behind the scenes which one has to know of but
isn't obvious.
Fixes #2880
2017-06-21 05:52:51 +02:00
6b2ad20131
Moves flag slice helper into configutil.
2017-06-20 12:52:35 -07:00
902f1ce16f
Moves config util helpers into their own package. ( #3165 )
2017-06-20 10:49:37 -07:00
5d99ee80ca
Add an option to disable keyring file ( #3145 )
...
Also disables keyring file in dev mode.
2017-06-15 15:24:04 -07:00
1c75cf1af5
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
)
2017-06-10 18:52:45 +02:00
9ceef2b32e
test: move discover tests
2017-06-10 18:52:45 +02:00
d2ee591fbf
use 'c' as command receiver for simple commands
2017-06-10 18:52:45 +02:00
902f4caff2
agent: move watch plans into agent
2017-06-10 18:52:45 +02:00
2de032125b
Fixed regression with dns server start condition ( #3137 )
2017-06-09 15:50:06 -07:00
89f16984f9
Simplify
2017-06-09 14:55:04 -04:00
ee1b5d5024
Update comment
2017-06-09 14:51:34 -04:00
532f8d1435
Parse values given to ?passing in the API
...
This PR fixes GH-2212 in the most backwards-compatible way I can think
of. If the user does not pass a value for `?passing`, it's assumed to be
true, which mirrors the current behavior. However, if the user passes
any value for passing, that value is parsed as a bool using strconv.
It's important to note that this is technically a breaking change.
Previously using `?passing=false` would return only passing nodes. While
this behavior is obviously incorrect, it was the previous behavior. We
should call this out very clearly in the CHANGELOG.
2017-06-09 14:36:00 -04:00
86713c1b8a
Opens up timing bound on flaky test.
2017-06-08 21:37:52 -07:00
66ec9c7a7d
Fixes HTTP header compare by including standard headers.
2017-06-08 14:10:46 -07:00
b5f8d6f9fd
agent: fix time.Duration parsing
...
The duration can be passed as a string, a float64 or a time.Duration
and this patch handles this properly.
2017-06-08 22:42:49 +02:00
39d33c2fdc
agent: log events and exit code to the log file
...
This patch logs the signals, events, errors and the exit
code to the log file instead of printing it on the console.
This should provide a more complete picture for debugging.
2017-06-08 10:07:55 +02:00
4a223111d2
log: use prefix [ERR] instead of [ERROR]
2017-06-08 09:50:47 +02:00
fa8a26ad54
Updates static assets to latest.
2017-06-07 21:16:59 -07:00
a09eed585e
Merge pull request #3121 from hashicorp/increase-graceful-timeout
...
agent: increase graceful shutdown timeout
2017-06-07 10:42:19 -07:00
fe69de3bba
agent: increase graceful shutdown timeout
...
When triggering a leave through an INT/TERM signal the hard-coded
timeout of 5 seconds is too short to complete the leave successfully.
Therefore, the agent always times out.
This value should probably configurable.
2017-06-07 13:12:34 +02:00
46c055d57b
agent: log differnt shutdown stages
...
Log the different code paths during shutdown.
2017-06-07 13:11:04 +02:00
825f72f5ef
agent: support custom header and method for http checks ( #3106 )
...
This patch adds support for custom headers and
method for HTTP checks.
Fixes #2474
Fixes #2657
Fixes #3106
2017-06-07 01:11:56 +02:00
94b39557e8
test: refactor TestDecodeConfig test
...
This patch refactors the multiple tests for
DecodeConfig into a single table-driven test
that tests most fields individually.
2017-06-04 23:55:12 +02:00
325f82972a
test: Fix TestAgent_Reload
...
This test was still referring to cmd.agent which has been removed.
2017-06-04 22:45:40 +02:00
240413f5d6
Merge pull request #3105 from hashicorp/test-stability
...
Tweaks things for better test stability.
2017-06-03 10:09:12 -07:00
51e0e158f1
agent: fix graceful http server shutdown
2017-06-03 19:08:50 +02:00
ae711c3b04
agent: cleanup run method
2017-06-03 19:08:50 +02:00
b203ffab29
agent: move registerWatches out of the run method
2017-06-03 19:08:50 +02:00
11245e53a7
agent: move telemetry out of the run method
2017-06-03 19:08:50 +02:00
84f5e8c3ab
agent: move update check out of the run method
2017-06-03 19:08:50 +02:00
96d8035adc
agent: simplify signal handling
2017-06-03 19:08:50 +02:00
34fd31b7b1
agent: move config reloading into the agent
2017-06-03 19:08:50 +02:00
aa1519c9f7
agent: move parseMetaPair to config and export
2017-06-03 19:08:50 +02:00
cb98754cd6
agent: remove agent from command
...
Decouple command and agent a bit more.
2017-06-03 19:08:50 +02:00
d977aa1fe7
agent: move retry join into agent
2017-06-03 19:08:50 +02:00
55a513da2e
agent: add GossipEncrypted function
...
Remove dead code and expose a GossipEncrypted() method
on the agent instead of accessing the internal delegate.
2017-06-03 19:08:50 +02:00
b0b5df579f
Cleans up an unrelated vet error.
2017-06-02 21:07:15 -07:00
b4b5036dfb
Adds back the port shuffle on agent start retries.
2017-06-02 20:53:20 -07:00
375825f34c
Do not recurse when the service address is a local cname
...
Fixes #2795
2017-06-01 18:20:31 +02:00
9956bc9b47
agent: LastContact cannot be negative ( #3067 )
...
The X-Consul-LastContact header cannot be negative.
Fixes #3067
2017-06-01 18:20:12 +02:00
db15cd847a
test: replace one more BoolFalse with agent.Bool()
2017-05-31 11:41:17 +02:00
dcc68f0f85
test: we will not use dev mode for testing for now
2017-05-31 11:34:00 +02:00
f89ae9f7e7
test: stagger retry attempts of TestAgent.Start
2017-05-31 11:33:25 +02:00
bdfed817ee
test: make TestAgent setup reusable
...
Pick the random ports only once and try starting with them
a number of times so that the configuration can be re-used.
This is because the ports are written into the data files
and a subsequent agent reading the files needs to have the
same ports.
For the same reason we do not remove the data directory on
every attempt since this makes it impossible to re-read the
data files.
2017-05-31 11:32:31 +02:00
4034d0ac0b
agent: use agent logger for consul client and deps
2017-05-31 11:05:02 +02:00
c1e6a77c75
test: start secondary agents also via TestAgent
2017-05-31 10:56:19 +02:00
a9451d596f
agent: set tcpKeepAliveListener when there is no error
2017-05-31 10:24:32 +02:00
345666bdb6
test: use test name as log prefix
2017-05-31 09:54:09 +02:00
d6c7404b34
agent: simplify shutdown timeout logging
...
Note that we are currently timing out every time. This still
needs to be investigated.
2017-05-31 09:41:58 +02:00
30ba712857
agent: set proto to http since we are logging it now
2017-05-31 09:41:16 +02:00
ceda18366f
test: Use Bool() instead of &BoolTrue/False since
2017-05-31 09:21:01 +02:00
ec729693d7
Address review comments
2017-05-31 01:05:21 +02:00
26200929c1
agent: start HTTPS only if there is a cert and key
2017-05-31 00:29:29 +02:00
b6c69ebf5d
agent: refactor DNS and HTTP server
...
* refactor DNS server to be ready for multiple bind addresses
* drop tcpKeepAliveListener since it is default for the HTTP servers
* add startup timeout watcher for HTTP servers identical to DNS server
2017-05-31 00:29:29 +02:00
aa92adcdd5
test: increase sleep time for test
2017-05-31 00:29:28 +02:00
f498f24032
test: allow tests to control anti-entropy syncs
2017-05-31 00:29:28 +02:00
eea16e1640
test: run mock dns recursors on random ports
2017-05-31 00:29:28 +02:00
6148910399
test: skip tests that use cmd.Run until signal handling is fixed
2017-05-31 00:29:28 +02:00
56cf015117
test: add test for starting/stopping lots of agents
2017-05-31 00:29:28 +02:00
7c5892a196
test: use UniqueID prefix for check tests to unify log output
2017-05-31 00:29:28 +02:00
0a31094e06
test: improve TestAgent
...
* don't use retry to try restarting the agent
this caused some issues when the startup would fail in
a separate go routine
* clear out the data directory on every retry since the ports
are stored in the raft data files
* set a unique id for every agent to allow for tracking of
concurrent output
2017-05-31 00:29:28 +02:00
10540f8d5f
agent: fix logging
...
* use agent logger for consul/serf/raft/dns/agent/...
* support optional id for concurrent tests
2017-05-31 00:29:27 +02:00
fe777852cd
test: call t.Fatal() from main go routine
2017-05-31 00:29:27 +02:00
3e39f04527
dns: do not log socket close during shutdown
2017-05-31 00:29:27 +02:00
1df74e36bd
agent: print more useful shutdown message
2017-05-31 00:29:27 +02:00
2e14c09447
test: start sync after agent start
2017-05-31 00:29:27 +02:00
5b5566d916
test: add test name to output
2017-05-31 00:29:27 +02:00
28ed8f1847
test: perform blocking query on agent
2017-05-31 00:29:27 +02:00
ebc0c80f08
test: parallelize dns test
2017-05-31 00:29:26 +02:00
72c214b908
test: fix failing test
2017-05-31 00:29:26 +02:00
c5f565ee1a
test: remove output to stdout
2017-05-31 00:29:26 +02:00
8f943542b0
test: use cli.NewMockUi instead of new(cli.MockUi)
...
Use the constructor function to prevent a nil panic
if there was no write to the output buffers.
2017-05-31 00:29:26 +02:00
0325a42089
test: fix data race with endpoints
2017-05-31 00:29:26 +02:00
e16589c079
agent: shutdown delegate if created
...
When the TestAgent shuts down a half-started agent
the delegate may not have been created at this point.
2017-05-31 00:29:26 +02:00
632f837c98
agent: shutdown dns servers on error
2017-05-31 00:29:26 +02:00
8c1a668481
test: Shutdown half-started agent before retrying
2017-05-31 00:29:25 +02:00
584693482d
test: fix data race in MockNotify
...
42 -> 32 data races
2017-05-31 00:29:25 +02:00
9509ab463c
test: run command tests in parallel
2017-05-31 00:29:25 +02:00
3658d4d428
test: address pull request comments
2017-05-31 00:29:25 +02:00
0f912c8aad
test: remove ACL options from default test config
2017-05-31 00:29:25 +02:00
bc47972696
test: allocate ports in blocks of 10
2017-05-31 00:29:24 +02:00
53c1c86ab3
test: refactor command tests to use TestAgent
2017-05-31 00:29:24 +02:00
24eec373de
test: retry a bit more often
2017-05-31 00:29:24 +02:00
659d7dbbde
agent: rename *Config vars to 'cfg'
2017-05-31 00:29:24 +02:00
e86d34685f
agent: rename *Command vars to 'cmd'
...
'c' is ambigious and it conflicts with 'config'.
2017-05-31 00:29:24 +02:00
141efd9588
test: rename *Config vars to 'cfg'
...
'c' is ambigous since Command also uses this
and we want to use 'config' as a package name.
2017-05-31 00:29:24 +02:00
06677708cf
test: use less aggressive retry for agent startup
2017-05-31 00:29:24 +02:00
47501309ae
test: use system temp dir for TestAgent
2017-05-31 00:29:24 +02:00
0c905a0df8
test: a.config -> a.Config
2017-05-31 00:29:23 +02:00
0be63d7060
test: refactor httpTest with TestAgent
2017-05-31 00:29:23 +02:00
308f9929b3
test: run agent tests in parallel
...
This brings down the test run from 108 sec to 15 sec.
There is an occasional port conflict because of the nature
the next port is chosen. So far it seems rare enough to live
with it.
2017-05-31 00:29:23 +02:00
23a6ff383c
agent: refactor tests for TestAgent
...
Refactored tests that use
* makeAgentXXX
* makeDNSServerXXX
* makeHTTPServerXXX
2017-05-31 00:29:23 +02:00
b5b3aa1376
agent: add TestAgent to replace other mechanisms
...
TestAgent will replace the following mechanisms to
start test agents in subsequent requests:
* makeAgentXXX
* makeDNSServerXXX
* makeHTTPServerXXX
* testServer
* httpTest
2017-05-31 00:29:23 +02:00
3865f14a25
agent: simplify agent creation
...
This patch creates an agent with just a config struct
and allows for other fields to be set as required.
2017-05-31 00:29:23 +02:00
82650f73e3
agent: move http/dns endpoints into agent
...
Move the HTTP and DNS endpoints into the agent and control
their lifespan via the agent.
This removes the requirement to manage HTTP and DNS servers
indpendent of the agent since the agent is mostly useless
without an endpoint and the endpoints without the agent.
2017-05-31 00:29:23 +02:00
74be791f9b
agent: fix comment
2017-05-31 00:29:22 +02:00
b42916e1ff
agent: simplify socket address helper
2017-05-31 00:29:22 +02:00
c44e41a741
agent: replace goto with local function
2017-05-31 00:29:22 +02:00
327401e7ee
agent: inline uiDir field
...
uiDir can be inlined as agent.config.UIDir
2017-05-31 00:29:22 +02:00
8f381d62f6
agent: drop logOutput parameter
...
agent.logOutput is identical to logOutput
2017-05-31 00:29:22 +02:00
c47db2c922
agent: drop config argument
...
agent.config and config are identical.
2017-05-31 00:29:22 +02:00
62f72f104c
Add settings for upshifting to encrypted gossip ( #3079 )
2017-05-30 08:51:37 -07:00
385c9522b3
Removes obsolete agent API documentation.
2017-05-26 10:24:45 -07:00
91c5c9a2d0
doc: update comments and run goimports
2017-05-24 10:20:28 +02:00
deb206b7d7
agent: add RetryJoin support for Azure
...
Pull #2978 from leowmjw/develop
Resolves #2978
2017-05-24 10:15:38 +02:00
9aa232ea2e
Merge pull request #2901 from deckarep/consul-ensure-exit-non-zero-on-timeout
...
Ensure to exit with a non-zero status code when a timeout and all jobs are not completed.
2017-05-18 10:25:50 -04:00
8ad66f4bea
agent: support custom check id and name
...
This patch adds support for a custom check id and name when
registering a service.
This is achieved by adding a CheckID and a Name field to the
CheckType structure which is used to register checks with a
service and when returning health check definitions.
CheckDefinition is a superset of CheckType which duplicates
some of the fields of CheckType. This patch decouples these
two structures by removing the embedding of CheckType in
CheckDefinition.
Fixes #3047
2017-05-17 20:17:08 +02:00
ad40a855bd
agent: move isAddrANY to separate package
2017-05-15 22:44:43 +02:00
e2c37b47ee
agent: Replace client/server with delegate interface
...
This patch adds a new internal interface clientServer
which defines the common methods of consul.Client and
consul.Server. This allows to replace the following
code
if a.server != nil {
a.server.do()
} else {
a.client.do()
}
with
a.delegate.do()
In case a specific type is required a type check can
be performed:
if srv, ok := a.delegate.(*consul.Server); ok {
srv.doSrv()
}
2017-05-15 18:35:38 +02:00
41f01a0cfc
agent: allow "::" as IPv6 bind address
...
Fixes #2285
2017-05-15 17:51:33 +02:00
65b5c51ec7
test: add helper for ioutil.TempDir/TempFile
...
This creates a simplified helper for temporary directories and files.
All path names are prefixed with the name of the current test.
All files and directories are stored either in /tmp/consul-test
or /tmp if the former could not be created.
Using the system temp dir breaks some tests on macOS where the unix
socket path becomes too long.
2017-05-12 22:12:47 +02:00
3d54fe51ba
test: lower wait time for some tests
2017-05-12 22:12:47 +02:00
98f6e3b7c5
test: suppress osx firewall warning
...
macOS displays a firewall warning dialog when an unsigned
application is trying to bind to a non-loopback address.
This patch updates some test configurations to ensure binding
to a loopback address where possible to suppress these warnings.
2017-05-12 22:12:47 +02:00
3522a41bad
test: include test name in temp file/dir
...
This helps identifying hanging tests by looking
at the process list.
2017-05-12 22:12:47 +02:00
db3599762f
test: drop unused code
2017-05-11 17:04:36 +02:00
914a83cae0
agent: use bind address as src unless INADDR_ANY
...
Use the bind address as source address for outgoing
RPC connections unless it is INADDR_ANY.
The current code uses the advertise address which will
not work in certain environments where the advertise
address is not routable in the network of the agent,
e.g. NAT environment, container... After all, that is
the purpose of the advertise address.
See #2822
2017-05-11 00:34:14 +02:00
e6c6f8cedd
agent: use helper for INADDR_ANY
2017-05-11 00:34:14 +02:00
5bab68b9bb
Add a path for transitioning to TLS on an existing cluster ( #3001 )
...
Fixes #1705
2017-05-10 14:25:48 -07:00
6eba69fbfe
agent: drop atlas/scada code
2017-05-10 23:06:36 +02:00
5328609d59
test: refactor TestAgent_Leave_ACLDeny to use only one server
2017-05-10 17:42:38 +02:00
a60f508880
test: use isPermissionDenied
2017-05-10 17:42:38 +02:00
66bc2cbabc
test: replace blocks and comments with sub-tests
2017-05-10 17:42:38 +02:00
d711b9bba0
test: inline request body encoding
2017-05-10 17:42:38 +02:00
82cb9c50ad
test: add helper for permission denied check
2017-05-10 17:42:38 +02:00
1e89692cc1
test: drop error check on http.NewRequest
...
Most URLs are static so the error check is redundant.
The subsequent test wouldn't work if the url is wrong.
2017-05-10 17:42:38 +02:00
6fa76fd90f
agent: Disallow :: or [::] as advertise or advertise-wan address
2017-05-09 17:56:16 +02:00
8ad52ee9b5
agent: Disallow :: and [::] as service address
2017-05-09 17:56:15 +02:00
e365ef12cf
agent: Disallow 0.0.0.0 as advertise or advertise-wan address
...
Fixes #2961
2017-05-09 17:56:15 +02:00
73a31b9bfe
agent: Disallow 0.0.0.0 as service address
...
Fixes #2961
2017-05-09 17:56:15 +02:00
33a7b8e401
Tweaks some tests that were having a hard time in Travis CI and
...
bumps up the default retry time.
2017-05-09 06:48:26 -07:00
efff41a8b2
Updates built-in static assets for web UI.
2017-05-08 19:50:54 -07:00
2794db5aac
test: Fix badly formatted retry.Run tests
2017-05-05 17:07:03 +02:00
9c86d5c764
test: convert remaining WaitForResult tests
2017-05-05 17:07:03 +02:00
ddfa57765c
retry: Removes the description parameter.
2017-05-05 17:07:03 +02:00
2de1cd5a4a
test: Turns off ACLs for catalog and health WAN translation tests.
...
Since this was doing registration to a foreign DC, it needs extra time
for the route to the ACL datacenter to be set up. ACLs aren't part of
this test, so by disabling them we make this more reliable and converge
faster than if we had added a retry.
2017-05-05 17:07:03 +02:00
888fa5cad6
test: Moves a variable closer to where it's used.
2017-05-05 17:07:03 +02:00
0daacfe5e5
test: Turns down server health interval for faster convergence.
...
This fixes the autopilot tests.
2017-05-05 17:07:02 +02:00
21a82a0a16
test: Refactor WaitForResult tests with retry
...
Refactor tests that use testutil.WaitForResult to use retry.
Since this requires refactoring the test functions in general this patch
also shows the use of the github.com/pascaldekloe/goe/verify library
which provides a good mechanism for comparing nested data structures.
Instead of just converting the tests from testutil.WaitForResult to
retry the tests that performing a nested comparison of data structures
are converted to the verify library at the same time.
2017-05-05 17:07:02 +02:00
f39c604cd7
Fix imports
2017-05-05 17:07:00 +02:00
8c2b261c61
Use bind address as source for outgoing connections ( #2822 )
...
This patch configures consul to use the bind address as the
source address for outgoing connections.
Fixes #2822
2017-05-04 01:41:47 +02:00
fb83790cb9
Do not modify config after creation II
...
Move code for finding the advertise address via a
template into consulConfig() so that the config
object is not modified after creation.
2017-05-04 01:41:47 +02:00
a235986a28
Do not modify config after creation
...
Make sure the RPCAdvertise address is always set
so that the configuration does not have to be modified
after creation.
2017-05-04 01:41:47 +02:00
a226edd4a9
Move GCE discovery code to command/agent/config_gce.go
2017-05-04 01:41:47 +02:00
7f73f14260
Move AWS discovery code to command/agent/config_aws.go
2017-05-04 01:41:47 +02:00
78fc19c48c
Move verifyUniqueListeners to command/agent/config.go
2017-05-04 01:41:47 +02:00
d34ba3e823
Cleanup agent config
2017-05-04 01:41:47 +02:00
98407322a6
Itty bitty typo
2017-05-02 16:08:07 -07:00
6382f95898
Updates static assets to pick up #2712 .
2017-05-02 10:52:06 -07:00
cd56a5ebdd
Add separate option for verifying incoming HTTPS traffic ( #2974 )
...
* Add separate option for verifying incoming HTTPS traffic
2017-04-28 16:15:55 -07:00
84d6ac2d51
api: Return empty list instead of nil
2017-04-28 15:00:08 -07:00
9685bdcd0b
api: Add ServiceTags to Health state endpoint ( #153 )
...
This patch adds the ServiceTags to the /v1/health/state/<state>
endpoint.
Fixes #153
2017-04-28 15:00:08 -07:00
7075695627
Faster dev server startup
...
This patch reduces the timeouts for the development
server so that it starts up almost instantly.
2017-04-28 14:43:44 -07:00
48fa2962eb
Revert "test: Run command/agent tests in parallel"
...
This reverts commit 17be40a733
2017-04-27 14:39:04 -07:00
0cb4295182
test: Do not run RetryJoin tests in parallel
...
I am suspecting port conflicts with the agents
that are started. This needs further investigation.
2017-04-27 14:39:04 -07:00
7281b4291a
test: Speedup session renew tests
2017-04-27 10:34:30 -07:00
37c180a920
test: Speedup Retry*Join tests
2017-04-27 10:34:30 -07:00
17be40a733
test: Run command/agent tests in parallel
2017-04-27 10:34:30 -07:00
b70e419aeb
Add TLS cipher suite options and CA path support ( #2963 )
...
This patch adds options to configure the available
TLS cipher suites and adds support for a path
for multiple CA certificates.
Fixes #2959
2017-04-27 01:29:39 -07:00
59c4128deb
Updates compiled static assets.
2017-04-25 13:54:03 -07:00
3403cd4372
golint: Fix existing comments
...
This needs more work.
2017-04-25 09:26:13 -07:00
3e00e36f41
golint: Untangle if blocks with return in else
2017-04-25 09:26:13 -07:00
d7e23857ad
golint: No stutter
2017-04-25 09:26:13 -07:00
cf3ec1cf5c
golint: Rename fields and structs
2017-04-25 09:26:13 -07:00
5a3961f31f
golint: Replace a += 1 with a++
2017-04-25 09:26:13 -07:00
6688a510e1
golint: Consistent receiver name
...
Ensure the receiver name is consistent
2017-04-25 09:26:13 -07:00
8bb7792799
golint: Drop the unused value from range
...
for i, _ := range foo -> for i := range foo
2017-04-25 09:26:13 -07:00
eddb1af603
Remove duplicate constants
...
This patch removes duplicate internal copies of constants in the structs
package which are also defined in the api package. The api.KVOp type
with all its values for the TXN endpoint and the api.HealthXXX constants
are now used throughout the codebase.
This resulted in some circular dependencies in the testutil package
which have been resolved by copying code and constants and moving the
WaitForLeader function into a separate testrpc package.
2017-04-20 09:54:49 -07:00
ee5b06a231
Use fmt.Fprint/Fprintf/Fprintln
...
Used the following rewrite rules:
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b, c, d))) -> fmt.Fprintf(resp, a, b, c, d)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b, c))) -> fmt.Fprintf(resp, a, b, c)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b))) -> fmt.Fprintf(resp, a, b)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a))) -> fmt.Fprint(resp, a)' *.go
gofmt -w -r 'resp.Write([]byte(a + "\n")) -> fmt.Fprintln(resp, a)' *.go
gofmt -w -r 'resp.Write([]byte(a)) -> fmt.Fprint(resp, a)' *.go
2017-04-20 09:02:59 -07:00
f25cac4c8f
Show raft protocol in list-peers command ( #2929 )
2017-04-19 15:01:40 -07:00
29a4a42f17
Fix help text on client cert/key options
2017-04-18 16:30:20 -07:00
a489f2b734
Added check to see if ui and ui-dir flags are both specified
2017-04-17 17:25:57 -07:00
b1d98522ee
Fix help text for -ca-path
2017-04-14 14:44:45 -07:00
ae6bf56ee1
Add tls client options to api/cli
2017-04-14 13:37:29 -07:00
fb089e2bbb
Merge pull request #2842 from vaLski/supress_sigpipe_logging
...
Supress signal logging on SIGPIPE. Should address #2768
2017-04-13 16:52:29 -07:00
4de270326e
Updates static assets to pick up #2899 .
2017-04-13 14:40:16 -07:00
2843da5cd9
Merge pull request #2904 from hashicorp/non-host-id
...
Adds a new -disable-host-node-id option to help when testing with containers.
2017-04-13 10:49:05 -07:00
fa04c24978
Adds a new -disable-host-node-id option to help when testing with containers.
...
Fixes #2877 .
2017-04-12 22:07:18 -07:00
7ab576891e
Ensure to exit with a non-zero status code when a timeout occurs and we don't complete all the jobs.
2017-04-12 17:51:16 -07:00
87f1a1a3ee
Fixed spelling for consul kv get command --help comments.
2017-04-12 17:31:57 -07:00
7f6d95f1c9
Hash host ID so its stable and well distributed
...
This PR takes the host ID and runs it through a hash so that it is well
distributed. This makes it so that machines that report similar host IDs
are easily distinguished.
Instances of similar IDs occur on EC2 where the ID is prefixed and on
motherboards created in the same batch.
2017-04-10 11:57:24 -07:00
86870ae51d
Merge pull request #2854 from hashicorp/remote-exec
...
Changes `disable_remote_exec` default to true so remote exec is opt-in.
2017-03-30 10:29:09 -07:00
Frank Schroeder
wuxin
Kyle Havlovitz
Preetha Appan
James Phillips
Seth Vargo
Jared Wasinger
Michael Leow
Damon Buckwalter
mckennajones
Ralph Caraveo
Alex Dadgar