Commit Graph

500 Commits

Author SHA1 Message Date
Atin Malaviya 6ef03a806c Clean up tests, use switch to default session.Behavior value if unspecified, unrecognized 2014-11-20 14:29:18 -05:00
Atin Malaviya 47241fc1c8 Ephemeral Nodes for via Session behavior settings.
Added a "delete" behavior for session invalidation, in addition to
the default "release" behavior. On session invalidation, the sessions
Behavior field is checked and if it is set to "delete", all nodes owned
by the session are deleted. If it is "release", then just the locks
are released as default.
2014-11-20 11:34:45 -05:00
Ryan Uber 28bd9810a7 agent: remove unused config variable 2014-11-19 23:18:12 -08:00
Ryan Uber c283754381 Rebase against upstream 2014-11-19 16:45:49 -08:00
Ryan Uber bc0eb4c16d agent: fix gossip encryption detection 2014-11-19 16:37:40 -08:00
Ryan Uber 8a652c6ffa agent: fix loading keyring on agent start 2014-11-19 16:37:40 -08:00
Ryan Uber ab5fbe4094 agent: ignore -encrypt if provided when keyring exists 2014-11-19 16:37:40 -08:00
Ryan Uber 4203e7ab6d consul: clean up comments, fix globalRPC tests 2014-11-19 16:37:40 -08:00
Ryan Uber 0cafb129ee consul: more tests, remove unused KeyManager() method 2014-11-19 16:37:40 -08:00
Ryan Uber 648c7cdc8e consul: simplify keyring operations 2014-11-19 16:36:19 -08:00
Ryan Uber 1398538ae2 command/keyring: adjust command help 2014-11-19 16:36:18 -08:00
Ryan Uber e60c909276 command/keyring: clean up tests 2014-11-19 16:36:18 -08:00
Ryan Uber 0b8fe6cc83 agent: fix test cases 2014-11-19 16:36:18 -08:00
Ryan Uber c945311baf agent: make rpc tests more reliable 2014-11-19 16:36:01 -08:00
Ryan Uber bc2b2120fa agent: -encrypt appends to keyring if one exists 2014-11-19 16:36:01 -08:00
Ryan Uber 22b2c63304 command/agent: fix up gossip encryption indicator 2014-11-19 16:35:37 -08:00
Ryan Uber 7a74f559b9 command: remove -init argument from keyring, auto-persist keyrings when using agent -encrypt 2014-11-19 16:35:13 -08:00
Ryan Uber 1f9d13dc73 agent: squash some more common keyring semantics 2014-11-19 16:34:18 -08:00
Ryan Uber 59a7938d1f agent: guard against empty keyring files 2014-11-19 16:34:18 -08:00
Ryan Uber 7b4b87ccf1 consul: use keyring operation type to cut out duplicated logic 2014-11-19 16:34:18 -08:00
Ryan Uber c11f6b5152 agent: fix install key test 2014-11-19 16:34:18 -08:00
Ryan Uber daf77c3f5b command/keyring: cleanup 2014-11-19 16:34:18 -08:00
Ryan Uber 6a3271980e command/keyring: refactor, adjust tests 2014-11-19 16:34:18 -08:00
Ryan Uber 91ad3461f4 command: fix panic when client RPC is asked for a keyring operation 2014-11-19 16:34:17 -08:00
Ryan Uber 9d01174521 consul: kill unused struct fields 2014-11-19 16:34:17 -08:00
Ryan Uber a163db2269 command/keyring: remove unneeded -wan arg, fix tests 2014-11-19 16:34:17 -08:00
Ryan Uber f86904ee59 agent: adjust rpc client tests for keyring 2014-11-19 16:34:17 -08:00
Ryan Uber fcba072246 command: fixing test cases for keyring 2014-11-19 16:34:17 -08:00
Ryan Uber e9f8f7f2d7 command/keyring: clean up output 2014-11-19 16:34:17 -08:00
Ryan Uber 9056e617cb consul: cross-dc key rotation works 2014-11-19 16:34:17 -08:00
Ryan Uber 2bdeaa0c6a consul: restructuring 2014-11-19 16:34:17 -08:00
Ryan Uber 8dec2744da consul: refactor keyring, repeat RPC calls to all DC's 2014-11-19 16:34:17 -08:00
Ryan Uber cfbf2b4f94 command: allow wan ring to be modified separately from lan pools 2014-11-19 16:33:34 -08:00
Ryan Uber 431b366d4f agent: split keyring functionality out of agent.go 2014-11-19 16:32:32 -08:00
Ryan Uber 5ab4a590d7 command: test generated keyring file content and conflicting args for agent 2014-11-19 16:32:06 -08:00
Ryan Uber 621aafa9b4 agent: test loading keyring files for client and server 2014-11-19 16:31:40 -08:00
Ryan Uber 2220ccdac2 command: various cleanup 2014-11-19 16:31:06 -08:00
Ryan Uber d906d16d15 agent: add tests for keyring presence checks 2014-11-19 16:31:06 -08:00
Ryan Uber 77519a5439 command/keyring: add tests for init 2014-11-19 16:31:06 -08:00
Ryan Uber 353b67826a command: use separate key files for LAN/WAN 2014-11-19 16:31:06 -08:00
Ryan Uber 67d78628a3 command: renamed keys to keyring to disambiguate usage 2014-11-19 16:31:06 -08:00
Ryan Uber 530f3ba747 command/keys: refactor, restrict key operations to server nodes 2014-11-19 16:31:06 -08:00
Ryan Uber 8a40f3888c agent: move keyring initialization out of agent, add -init option to keys command 2014-11-19 16:31:06 -08:00
Ryan Uber 0952535e33 agent: fix keyring loading when config is passed off 2014-11-19 16:31:06 -08:00
Ryan Uber b6037ef323 agent: clean up keyring file implementation 2014-11-19 16:31:06 -08:00
Ryan Uber fcb0961436 agent: refactor keyring loader 2014-11-19 16:31:06 -08:00
Ryan Uber df68820645 agent: install/use/remove key tests 2014-11-19 16:30:22 -08:00
Ryan Uber 2280434e16 agent: add rpc tests for listing lan/wan gossip keys 2014-11-19 16:30:22 -08:00
Ryan Uber e78c235dcf command/keys: test network connection failure 2014-11-19 16:30:22 -08:00
Ryan Uber 5bf70bc605 command/keys: adding more tests 2014-11-19 16:30:22 -08:00
Ryan Uber 90de483871 command/keys: begin tests 2014-11-19 16:30:22 -08:00
Ryan Uber 46ce9e936f command/keys: remove key command implemented 2014-11-19 16:30:22 -08:00
Ryan Uber 1ac6b10aed command/keys: use key command implemented 2014-11-19 16:30:22 -08:00
Ryan Uber 222adc92a0 command/keys: customize info message when listing keys 2014-11-19 16:30:22 -08:00
Ryan Uber 7b6f3d6dcc agent: install key command implemented 2014-11-19 16:30:22 -08:00
Ryan Uber 3a68d9e506 command/keys: use PrefixedUi for keys command 2014-11-19 16:30:22 -08:00
Ryan Uber 0f611572cc command/keys: fail fast if no actionable args were passed 2014-11-19 16:30:21 -08:00
Ryan Uber e4251a3372 agent: fix inversed lan/wan key listing 2014-11-19 16:30:21 -08:00
Ryan Uber 9b4707a329 command/keys: list keys working end-to-end 2014-11-19 16:30:21 -08:00
Ryan Uber f771f2ef92 command: add option for -wan to keys command 2014-11-19 16:30:21 -08:00
Ryan Uber 67b179ccc9 command: basic rpc works for keys command 2014-11-19 16:30:21 -08:00
Ryan Uber 4dd1b42477 consul: use rpc layer only for key management functions, add rpc commands 2014-11-19 16:30:21 -08:00
Ryan Uber ed3562b809 command: add skeletons for keys command 2014-11-19 16:30:21 -08:00
Ryan Uber b1c0bb60ce command: warn when passing -encrypt when keyring already exists 2014-11-19 16:30:21 -08:00
Ryan Uber 471ee9ce8f command: create serf dir if it doesn't exist, document -disable-keyring arg 2014-11-19 16:30:21 -08:00
Ryan Uber 0da6e08d9d consul: fix json marshaling 2014-11-19 16:30:21 -08:00
Ryan Uber e20a724999 consul: first pass at keyring integration 2014-11-19 16:30:20 -08:00
Armon Dadgar 6c83ef119a agent: Fixing wan join tests 2014-11-19 13:53:17 -08:00
Armon Dadgar c449f07b38 agent: Fixing config merge test 2014-11-19 13:38:58 -08:00
Armon Dadgar 666cf3c483 agent: Fixing UiDir in test 2014-11-19 13:29:15 -08:00
Armon Dadgar 485f0a0c93 agent: Fixing port collision in tests 2014-11-19 11:51:25 -08:00
Armon Dadgar 6be29e17c2 Merge pull request #478 from amalaviy/https
Added HTTPS support via a new HTTPS Port configuration option
2014-11-19 11:17:10 -08:00
Atin Malaviya 61f1d24f39 consul.Config() helper to generate the tlsutil.Config{} struct, 30 second keepalive, use keepalive for HTTP and HTTPS 2014-11-18 17:56:48 -05:00
Janne Paenkaelae e6b6f18172 Make the 'consul version' to return value that is from 'git describe --tags' 2014-11-18 22:15:58 +00:00
Atin Malaviya f1f8c88228 Moved TLS Config stuff to tlsutil package 2014-11-18 11:03:36 -05:00
Atin Malaviya 0904c651a8 Change names to StartJoinWan, RetryJoinWan etc 2014-11-17 17:14:59 -05:00
Atin Malaviya f4fd8453ed Added HTTPS support via a new HTTPS Port configuration option similar to the HTTP Port. 2014-11-17 14:29:35 -05:00
Atin Malaviya 5b41170f47 Add start-wan-join, retry-wan-join and related configuration options and commandline options 2014-11-14 10:56:39 -05:00
Ryan Uber 1b63cbf21e Merge pull request #458 from hashicorp/h-notes
Pass notes field from service checks through
2014-11-06 21:07:45 -08:00
Ryan Uber df5859580f agent: pass notes field through for checks inside of service definitions. Fixes #449 2014-11-06 18:25:21 -08:00
Armon Dadgar cf7e9e40d5 Fixing unit tests 2014-11-03 11:40:55 -08:00
Armon Dadgar cd936793ad Support old recursor config for backwards compatibility 2014-11-03 11:28:21 -08:00
foostan 35b006d884 Add multiple recursor definition support 2014-11-01 04:26:26 +09:00
Ryan Uber 28f31a8dd8 agent: add support for multiple checks and config mixing 2014-10-26 13:11:25 -07:00
Ryan Uber c1dfa55859 agent: test config as a whole in services test 2014-10-26 12:00:11 -07:00
Alexander Simmerl 461c1e18a5 Add multiple service definition support
This change-set adds another key to the configuration decoding called
`services`, which is expected to be a list of service definitions. It
follows the established convention of only allowing one of the keys:
`service`, `check`, `services`. For every entry in the list it calls
the corresponding decode method and appends it to the Servics of the
resulting Config.

While a similar result could be achieved with changing the Services
member of the Config struct to have named mapstruct tag it lacks the
proper time conversions provided by DecodeServiceDefinition.
2014-10-23 22:50:40 -04:00
Armon Dadgar 541b98a926 Gofmt 2014-10-20 10:21:31 -07:00
Armon Dadgar ce4aa7beb5 Switching to the pinned version of msgpack 2014-10-17 18:26:19 -07:00
Ryan Uber cc613a90fd agent: test services are in sync when added from the API 2014-10-17 17:33:27 -07:00
Ryan Uber 525d74aebc agent: add test for consul service sync state 2014-10-17 14:43:52 -07:00
Ryan Uber 2319460904 agent: initialize local consul service tags to fix service sync 2014-10-17 14:29:12 -07:00
Armon Dadgar e4dc15b9e3 agent: skip syslog test on windows 2014-10-17 11:24:10 -07:00
Ryan Uber b2ae3434b1 agent: optimize rpc monitor test 2014-10-16 10:20:57 -07:00
Ryan Uber 35157659a3 agent: fix failing monitor test 2014-10-15 18:23:21 -07:00
Armon Dadgar 4f1fa3a4ce Merge pull request #401 from hashicorp/f-healthcheck
Default services to "critical" state instead of "unknown"
2014-10-15 16:50:38 -07:00
Armon Dadgar e720a09aa4 Merge pull request #400 from hashicorp/f-service-filter
agent: Register "consul" service in agent layer
2014-10-15 16:48:57 -07:00
Ryan Uber 149656951d agent: fix tests after default status change 2014-10-15 15:43:53 -07:00
Ryan Uber 10610d3d26 agent: fix failing test 2014-10-15 15:03:43 -07:00
Ryan Uber cfca160cd5 formatting 2014-10-15 14:56:15 -07:00
Ryan Uber aa6ffc90f0 agent: remove special case of consul service, adjust tests 2014-10-15 14:52:00 -07:00