Commit Graph

46 Commits

Author SHA1 Message Date
David Gageot 7a6ca308c4 FIX #3016 Add timeout to active command
Signed-off-by: David Gageot <david@gageot.net>
2016-02-11 13:55:52 -08:00
Carlos Derich 0a1eb5d79f fix ls command with wrong header values
fixes #2937

Signed-off-by: Carlos Derich <d.erich@hotmail.com>
2016-01-27 01:10:55 -03:00
Nathan LeClaire e9294b4fcf Add RESPONSE time to available columns in ls
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Signed-off-by: David Gageot <david@gageot.net>
2016-01-26 11:34:14 +01:00
Jean-Laurent de Morlhon 5b2c52c409 Fix #2888 - Multi-line errors in ls mess with tab writing
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-01-25 09:49:05 +01:00
Jean-Laurent de Morlhon f10584ec85 Remove remaining log.Fatal
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-01-07 12:32:55 +01:00
David Gageot adc60712c8 Allow custom format for ls
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 17:15:07 +01:00
David Gageot c64af2918e Default template for ls command
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 16:18:30 +01:00
David Gageot 946712b1f7 Fix vet issues
Signed-off-by: David Gageot <david@gageot.net>
2015-12-24 13:30:50 +01:00
David Gageot 24a13af61e FIX #2653 docker-machine ls need to identify machine or cluster
Signed-off-by: David Gageot <david@gageot.net>
2015-12-23 18:09:24 +01:00
David Gageot 670c4808ed FIX #2663 reduce calls to the driver in ls
Signed-off-by: David Gageot <david@gageot.net>
2015-12-23 13:58:06 +01:00
David Gageot f66655fd77 FIX #2280 prevent nil dereference
Signed-off-by: David Gageot <david@gageot.net>
2015-12-14 15:24:57 +01:00
Nathan LeClaire 29ffc04cc9 Aesthetic nitpicks on ls timeout
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-12-10 13:25:13 -08:00
Jean-Laurent de Morlhon 02c235b8b9 Fix #2534 and #1696
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-10 16:51:59 +01:00
David Gageot be1d75f1c5 Merge pull request #2522 from dgageot/simplify-ls-tests
Simplify ls command tests
2015-12-08 10:50:19 +01:00
David Gageot c421bb456e Simplify ls command tests
Signed-off-by: David Gageot <david@gageot.net>
2015-12-08 10:18:42 +01:00
Anil Belur 0b0373d436 Fixes issue #2310 - machine ls --filter with engine label
* Added a new members `Labels` to `FilterOptions struct`, and `EngineOptions` to
`HostListItem struct`. `HostListItems` is already being read from the file
store `config.json` which TestFilterHostsReturnSetLabel engine labels.

* Modified `parseFilters()` and added new `func matchesLabel(`) which compares
the one or more label values provided as input.

* Also the changes include added tests for UT and integration.
Note: Have kept `--filter label=<key>=<value>` syntax which is similar to
`docker images --filter` to keep the usability consistent.

review comments from @dgageot

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-08 10:15:31 +05:30
David Gageot 3612c55677 Add version to machine ls
Signed-off-by: David Gageot <david@gageot.net>
2015-12-03 16:27:42 +01:00
Nathan LeClaire 98a1c8c159 Merge pull request #2473 from askb/2451_key_filter_case
Fixes #2451 - ensures ls filters `<key>` and `<value>` works case-insensitive
2015-12-02 15:42:12 -08:00
Jean-Laurent de Morlhon f9f886f529 Display driver in error without crashing
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-02 18:27:21 +01:00
Anil Belur 22cacbf152 Fixes #2451 ensure filters `<key>` and `<value>` work when case-insensitive
Added unit tests to verify filters

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-02 22:15:03 +05:30
David Gageot 00f62150b4 FIX nil pointer dereference in machine ls
Signed-off-by: David Gageot <david@gageot.net>
2015-11-26 08:53:09 +01:00
David Gageot 89fcca2879 Increase coverage of machine ls tests
Signed-off-by: David Gageot <david@gageot.net>
2015-11-26 08:48:07 +01:00
David Gageot 9039cbba3d FIX #2086 Add an error column to ls
Signed-off-by: David Gageot <david@gageot.net>
2015-11-24 09:50:43 +01:00
Nathan LeClaire 19ce7b79bd Revise CommandLine interface to contain libmachine client and store
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-23 19:29:20 -08:00
David Gageot 0c296783be Merge pull request #2289 from dgageot/quality-02-move-code
Quality 02 move code
2015-11-18 09:40:01 +01:00
Nick Gauthier a34a394810 skip printing swarm info when host options swarm info is nil
Fixes #2252 #2280

Signed-off-by: Nick Gauthier <ngauthier@gmail.com>
2015-11-16 15:54:16 +01:00
David Gageot eb39f098d5 Move code where it's used
Signed-off-by: David Gageot <david@gageot.net>
2015-11-13 16:27:50 +01:00
Olivier Gambier d2ada6488c Lint
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-05 13:34:07 -08:00
David Gageot 99d6fe134d Introduce CommandLine interface
Signed-off-by: David Gageot <david@gageot.net>
2015-11-05 06:07:57 +01:00
David Gageot 86c52ec3e7 Make commands code easier to test
Signed-off-by: David Gageot <david@gageot.net>
2015-10-29 11:15:17 +01:00
Dave Henderson ee4a357441 Returning active host when swarm is active
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-10-24 12:47:49 -04:00
Nathan LeClaire c8edb33ecd Move towards using external binaries / RPC plugins
- First RPC steps

- Work on some flaws in RPC model

- Remove unused TLS settings from Engine and Swarm options

- Add code to correctly encode data over the network

- Add client driver for RPC

- Rename server driver file

- Start to make marshal make sense

- Fix silly RPC method args and add client

- Fix some issues with RPC calls, and marshaling

- Simplify plugin main.go

- Move towards 100% plugin in CLI

- Ensure that plugin servers are cleaned up properly

- Make flag parsing for driver flags work properly

Includes some work carried from @dmp42 updating the build process and
tests to use the new method.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-16 16:34:56 -07:00
Soshi Katsuta 5af32bcdd3 commands: make `ls` to not report saved hosts to be active when $DOCKER_HOST is not set
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
2015-10-09 00:59:33 +09:00
Nathan LeClaire b5927f10c4 Make libmachine usable by outside world
- Clear out some cruft tightly coupling libmachine to filestore

- Comment out drivers other than virtualbox for now

- Change way too many things

- Mostly, break out the code to be more modular.

- Destroy all traces of "provider" in its current form.  It will be
brought back as something more sensible, instead of something which
overlaps in function with both Host and Store.

- Fix mis-managed config passthru

- Remove a few instances of state stored in env vars

- This should be explicitly communicated in Go-land, not through the
shell.

- Rename "store" module to "persist"

- This is done mostly to avoid confusion about the fact that a concrete
instance of a "Store" interface is oftentimes referred to as "store" in
the code.

- Rip out repetitive antipattern for getting store

- This replaces the previous repetive idiom for getting the cert info, and
consequently the store, with a much less repetitive idiom.

- Also, some redundant methods in commands.go for accessing hosts have
either been simplified or removed entirely.

- First steps towards fixing up tests

- Test progress continues

- Replace unit tests with integration tests

- MAKE ALL UNIT TESTS PASS YAY

- Add helper test files

- Don't write to disk in libmachine/host

- Heh.. coverage check strikes again

- Fix remove code

- Move cert code around

- Continued progress: simplify Driver

- Fixups and make creation work with new model

- Move drivers module inside of libmachine

- Move ssh module inside of libmachine

- Move state module to libmachine

- Move utils module to libmachine

- Move version module to libmachine

- Move log module to libmachine

- Modify some constructor methods around

- Change Travis build dep structure

- Boring gofmt fix

- Add version module

- Move NewHost to store

- Update some boring cert path infos to make API easier to use

- Fix up some issues around the new model

- Clean up some cert path stuff

- Don't use shady functions to get store path :D

- Continue artifact work

- Fix silly machines dir bug

- Continue fixing silly path issues

- Change up output of vbm a bit

- Continue work to make example go

- Change output a little more

- Last changes needed to make create finish properly

- Fix config.go to use libmachine

- Cut down code duplication and make both methods work with libmachine

- Add pluggable logging implementation

- Return error when machine already in desired state

- Update example to show log method

- Fix file:// bug

- Fix Swarm defaults

- Remove unused TLS settings from Engine and Swarm options

- Remove spurious error

- Correct bug detecting if migration was performed

- Fix compilation errors from tests

- Fix most of remaining test issues

- Fix final silly bug in tests

- Remove extraneous debug code

- Add -race to test command

- Appease the gofmt

- Appease the generate coverage

- Making executive decision to remove Travis coverage check

In the early days I thought this would be a good idea because it would
encourage people to write tests in case they added a new module.  Well,
in fact it has just turned into a giant nuisance and made refactoring
work like this even more difficult.

- Move Get to Load
- Move HostListItem code to CLI

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-23 12:30:15 -07:00
Soshi Katsuta 6496c44261 commands: show "-" in the ACTIVE column for inactive machines
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
2015-08-19 01:04:48 +09:00
Eric Sage b333ea5294 Add regex based name filter to ls command.
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add regex support

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Allow bad regex passthrough to reg string amtch

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add unit test

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add integration tests

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add documentation for name filter.

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
2015-07-22 21:06:26 -04:00
Nathan LeClaire cd55ca0030 Merge pull request #1506 from ericsage/1502
Return better error for issue #1502.
2015-07-13 17:33:30 -07:00
Eric Sage 6410da8f34 Switch to errors.New
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
2015-07-13 20:09:59 -04:00
Eric Sage b75b5d618c Change error message
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
2015-07-13 17:45:46 -04:00
Eric Sage 8a77935cd4 Return better error for issue #1502.
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
2015-07-11 00:49:59 -04:00
Nathan LeClaire 3eaab15a5b Rename libmachine.Machine to libmachine.Provider
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-09 10:24:29 -07:00
Dave Henderson a3c8b3474e Adding --filter flag to ls command
Initially supporting `swarm=`, `state=`, and `driver=` filters.

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-11 20:01:50 -04:00
Nathan LeClaire 8c34f80940 Fix bug with quiet ls mode
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-06 11:48:16 -07:00
Nathan LeClaire c602e69448 Read active host from DOCKER_HOST instead of from file
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-04 16:29:04 -07:00
Nathan LeClaire 142ffadc2c Refactor logging to focus on simple STDOUT/STDERR
This also lays the foundation for the possibility of log drivers in the
future, if it is decided that is a direction to pursue.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-30 12:04:52 -07:00
Dave Henderson 53ef9d7477 Refactoring commands.go into new commands package, with separate file for each subcommand
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-15 19:04:44 -04:00