Permalink
Browse files

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>
  • Loading branch information...
nathanleclaire committed Sep 2, 2015
1 parent a63f26f commit c8edb33ecd3951a7b5e87aea7a5548231f40e3ed
Showing with 6,292 additions and 1,054 deletions.
  1. +2 −2 .gitignore
  2. +5 −5 Makefile
  3. +4 −2 Makefile.inc
  4. +13 −0 cli/.travis.yml
  5. +21 −0 cli/LICENSE
  6. +316 −0 cli/README.md
  7. +308 −0 cli/app.go
  8. +867 −0 cli/app_test.go
  9. +15 −0 cli/autocomplete/bash_autocomplete
  10. +5 −0 cli/autocomplete/zsh_autocomplete
  11. +40 −0 cli/cli.go
  12. +98 −0 cli/cli_test.go
  13. +206 −0 cli/command.go
  14. +69 −0 cli/command_test.go
  15. +388 −0 cli/context.go
  16. +113 −0 cli/context_test.go
  17. +497 −0 cli/flag.go
  18. +740 −0 cli/flag_test.go
  19. +238 −0 cli/help.go
  20. +36 −0 cli/help_test.go
  21. +19 −0 cli/helpers_test.go
  22. +10 −0 cmd/machine-driver-amazonec2.go
  23. +10 −0 cmd/machine-driver-azure.go
  24. +10 −0 cmd/machine-driver-digitalocean.go
  25. +10 −0 cmd/machine-driver-exoscale.go
  26. +10 −0 cmd/machine-driver-generic.go
  27. +10 −0 cmd/machine-driver-google.go
  28. +10 −0 cmd/machine-driver-hyperv.go
  29. +10 −0 cmd/machine-driver-none.go
  30. +10 −0 cmd/machine-driver-openstack.go
  31. +10 −0 cmd/machine-driver-rackspace.go
  32. +10 −0 cmd/machine-driver-softlayer.go
  33. +10 −0 cmd/machine-driver-virtualbox.go
  34. +10 −0 cmd/machine-driver-vmwarefusion.go
  35. +10 −0 cmd/machine-driver-vmwarevcloudair.go
  36. +10 −0 cmd/machine-driver-vmwarevsphere.go
  37. +29 −2 cmd/machine.go
  38. +3 −4 commands/active.go
  39. +140 −124 commands/commands.go
  40. +33 −7 commands/commands_test.go
  41. +3 −3 commands/config.go
  42. +307 −56 commands/create.go
  43. +9 −10 commands/env.go
  44. +2 −2 {libmachine/drivers → commands}/flag_sort.go
  45. +7 −9 commands/inspect.go
  46. +2 −5 commands/ip.go
  47. +2 −6 commands/kill.go
  48. +37 −38 commands/ls.go
  49. +16 −16 commands/ls_test.go
  50. +2 −2 commands/regeneratecerts.go
  51. +2 −2 commands/restart.go
  52. +15 −11 commands/rm.go
  53. +22 −6 commands/scp.go
  54. +21 −8 commands/scp_test.go
  55. +8 −10 commands/ssh.go
  56. +2 −2 commands/start.go
  57. +4 −2 commands/status.go
  58. +2 −6 commands/stop.go
  59. +2 −6 commands/upgrade.go
  60. +3 −4 commands/url.go
  61. +34 −41 docs/install-machine.md
  62. +22 −28 drivers/amazonec2/amazonec2.go
  63. +14 −21 drivers/azure/azure.go
  64. +11 −17 drivers/digitalocean/digitalocean.go
  65. +0 −65 drivers/driverfactory/factory.go
  66. +12 −18 drivers/exoscale/exoscale.go
  67. +25 −20 drivers/fakedriver/fakedriver.go
  68. +7 −13 drivers/generic/generic.go
  69. +1 −1 drivers/google/auth_util.go
  70. +15 −20 drivers/google/google.go
  71. +8 −14 drivers/hyperv/hyperv.go
  72. +18 −18 drivers/none/{none.go → driver.go}
  73. +36 −32 drivers/openstack/openstack.go
  74. +12 −18 drivers/rackspace/rackspace.go
  75. +18 −24 drivers/softlayer/driver.go
  76. +12 −20 drivers/virtualbox/virtualbox.go
  77. +12 −16 drivers/vmwarefusion/fusion.go
  78. +16 −32 drivers/vmwarevcloudair/vcloudair.go
  79. +15 −21 drivers/vmwarevsphere/vsphere.go
  80. +10 −8 libmachine/cert/bootstrap.go
  81. +6 −71 libmachine/drivers/drivers.go
  82. +0 −71 libmachine/drivers/drivers_test.go
  83. +213 −0 libmachine/drivers/plugin/localbinary/plugin.go
  84. +155 −0 libmachine/drivers/plugin/localbinary/plugin_test.go
  85. +45 −0 libmachine/drivers/plugin/register_driver.go
  86. +293 −0 libmachine/drivers/rpc/client_driver.go
  87. +183 −0 libmachine/drivers/rpc/server_driver.go
  88. +3 −1 libmachine/drivers/utils.go
  89. +2 −2 libmachine/host/host.go
  90. +11 −0 libmachine/host/host_v2.go
  91. +39 −10 libmachine/host/migrate.go
  92. +2 −2 libmachine/host/migrate_v1_v2.go
  93. +46 −0 libmachine/host/migrate_v2_v3.go
  94. +4 −1 libmachine/log/log.go
  95. +12 −1 libmachine/log/standard.go
  96. +71 −0 libmachine/mcnflag/flag.go
  97. +2 −2 libmachine/mcnutils/b2d.go
  98. +1 −1 libmachine/mcnutils/utils.go
  99. +12 −12 libmachine/persist/filestore.go
  100. +2 −2 libmachine/persist/filestore_test.go
  101. +1 −1 libmachine/persist/store.go
  102. +3 −3 libmachine/provision/utils.go
  103. +3 −3 libmachine/provision/utils_test.go
  104. +1 −1 libmachine/version/version.go
  105. +3 −3 mk/build.mk
  106. +4 −5 mk/main.mk
  107. +2 −2 mk/release.mk
  108. +1 −1 script/test
  109. +4 −4 test/integration/cli/create-rm.bats
  110. +32 −54 test/integration/cli/ls.bats
  111. +2 −2 test/integration/core/core-commands.bats
  112. +5 −1 test/integration/helpers.bash
  113. +8 −1 test/integration/run-bats.sh
View
@@ -2,5 +2,5 @@ docker-machine*
*.log
*.iml
.idea/
bin
cover
./bin
cover
View
@@ -13,11 +13,11 @@ DOCKER_CONTAINER_NAME := "docker-machine-build-container"
build:
test: build
%:
@docker build -t $(DOCKER_IMAGE_NAME) .
docker build -t $(DOCKER_IMAGE_NAME) .
@test -z '$(shell docker ps -a | grep $(DOCKER_CONTAINER_NAME))' || docker rm -f $(DOCKER_CONTAINER_NAME)
test -z '$(shell docker ps -a | grep $(DOCKER_CONTAINER_NAME))' || docker rm -f $(DOCKER_CONTAINER_NAME)
@docker run --name $(DOCKER_CONTAINER_NAME) \
docker run --name $(DOCKER_CONTAINER_NAME) \
-e DEBUG \
-e STATIC \
-e VERBOSE \
@@ -30,7 +30,7 @@ test: build
$(DOCKER_IMAGE_NAME) \
make $@
@test ! -d bin || rm -Rf bin
@test -z "$(findstring build,$(patsubst cross,build,$@))" || docker cp $(DOCKER_CONTAINER_NAME):/go/src/github.com/docker/machine/bin bin
test ! -d bin || rm -Rf bin
test -z "$(findstring build,$(patsubst cross,build,$@))" || docker cp $(DOCKER_CONTAINER_NAME):/go/src/github.com/docker/machine/bin bin
endif
View
@@ -1,7 +1,9 @@
# Project name, used to name the binaries
PKG_NAME := docker-machine
GH_USER ?= docker
GH_REPO ?= machine
# Github infos
GITHUB_INFO := $(shell git config --get remote.origin.url | sed -e 's/.*:\(.*\).git/\1/')
GH_USER ?= $(shell echo $(GITHUB_INFO) | cut -d \/ -f 1)
GH_REPO ?= $(shell echo $(GITHUB_INFO) | cut -d \/ -f 2)
# If true, disable optimizations and does NOT strip the binary
DEBUG ?=
View
@@ -0,0 +1,13 @@
language: go
sudo: false
go:
- 1.0.3
- 1.1.2
- 1.2.2
- 1.3.3
- 1.4.2
script:
- go vet ./...
- go test -race -v ./libmachine/... ./commands/... ./drivers/...
View
@@ -0,0 +1,21 @@
Copyright (C) 2013 Jeremy Saenz
All Rights Reserved.
MIT LICENSE
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
@@ -0,0 +1,316 @@
[![Build Status](https://travis-ci.org/codegangsta/cli.png?branch=master)](https://travis-ci.org/codegangsta/cli)
# cli.go
`cli.go` is simple, fast, and fun package for building command line apps in Go. The goal is to enable developers to write fast and distributable command line applications in an expressive way.
You can view the API docs here:
http://godoc.org/github.com/codegangsta/cli
## Overview
Command line apps are usually so tiny that there is absolutely no reason why your code should *not* be self-documenting. Things like generating help text and parsing command flags/options should not hinder productivity when writing a command line app.
**This is where `cli.go` comes into play.** `cli.go` makes command line programming fun, organized, and expressive!
## Installation
Make sure you have a working Go environment (go 1.1+ is *required*). [See the install instructions](http://golang.org/doc/install.html).
To install `cli.go`, simply run:
```
$ go get github.com/codegangsta/cli
```
Make sure your `PATH` includes to the `$GOPATH/bin` directory so your commands can be easily used:
```
export PATH=$PATH:$GOPATH/bin
```
## Getting Started
One of the philosophies behind `cli.go` is that an API should be playful and full of discovery. So a `cli.go` app can be as little as one line of code in `main()`.
``` go
package main
import (
"os"
"github.com/codegangsta/cli"
)
func main() {
cli.NewApp().Run(os.Args)
}
```
This app will run and show help text, but is not very useful. Let's give an action to execute and some help documentation:
``` go
package main
import (
"os"
"github.com/codegangsta/cli"
)
func main() {
app := cli.NewApp()
app.Name = "boom"
app.Usage = "make an explosive entrance"
app.Action = func(c *cli.Context) {
println("boom! I say!")
}
app.Run(os.Args)
}
```
Running this already gives you a ton of functionality, plus support for things like subcommands and flags, which are covered below.
## Example
Being a programmer can be a lonely job. Thankfully by the power of automation that is not the case! Let's create a greeter app to fend off our demons of loneliness!
Start by creating a directory named `greet`, and within it, add a file, `greet.go` with the following code in it:
``` go
package main
import (
"os"
"github.com/codegangsta/cli"
)
func main() {
app := cli.NewApp()
app.Name = "greet"
app.Usage = "fight the loneliness!"
app.Action = func(c *cli.Context) {
println("Hello friend!")
}
app.Run(os.Args)
}
```
Install our command to the `$GOPATH/bin` directory:
```
$ go install
```
Finally run our new command:
```
$ greet
Hello friend!
```
`cli.go` also generates some bitchass help text:
```
$ greet help
NAME:
greet - fight the loneliness!
USAGE:
greet [global options] command [command options] [arguments...]
VERSION:
0.0.0
COMMANDS:
help, h Shows a list of commands or help for one command
GLOBAL OPTIONS
--version Shows version information
```
### Arguments
You can lookup arguments by calling the `Args` function on `cli.Context`.
``` go
...
app.Action = func(c *cli.Context) {
println("Hello", c.Args()[0])
}
...
```
### Flags
Setting and querying flags is simple.
``` go
...
app.Flags = []cli.Flag {
cli.StringFlag{
Name: "lang",
Value: "english",
Usage: "language for the greeting",
},
}
app.Action = func(c *cli.Context) {
name := "someone"
if len(c.Args()) > 0 {
name = c.Args()[0]
}
if c.String("lang") == "spanish" {
println("Hola", name)
} else {
println("Hello", name)
}
}
...
```
See full list of flags at http://godoc.org/github.com/codegangsta/cli
#### Alternate Names
You can set alternate (or short) names for flags by providing a comma-delimited list for the `Name`. e.g.
``` go
app.Flags = []cli.Flag {
cli.StringFlag{
Name: "lang, l",
Value: "english",
Usage: "language for the greeting",
},
}
```
That flag can then be set with `--lang spanish` or `-l spanish`. Note that giving two different forms of the same flag in the same command invocation is an error.
#### Values from the Environment
You can also have the default value set from the environment via `EnvVar`. e.g.
``` go
app.Flags = []cli.Flag {
cli.StringFlag{
Name: "lang, l",
Value: "english",
Usage: "language for the greeting",
EnvVar: "APP_LANG",
},
}
```
The `EnvVar` may also be given as a comma-delimited "cascade", where the first environment variable that resolves is used as the default.
``` go
app.Flags = []cli.Flag {
cli.StringFlag{
Name: "lang, l",
Value: "english",
Usage: "language for the greeting",
EnvVar: "LEGACY_COMPAT_LANG,APP_LANG,LANG",
},
}
```
### Subcommands
Subcommands can be defined for a more git-like command line app.
```go
...
app.Commands = []cli.Command{
{
Name: "add",
Aliases: []string{"a"},
Usage: "add a task to the list",
Action: func(c *cli.Context) {
println("added task: ", c.Args().First())
},
},
{
Name: "complete",
Aliases: []string{"c"},
Usage: "complete a task on the list",
Action: func(c *cli.Context) {
println("completed task: ", c.Args().First())
},
},
{
Name: "template",
Aliases: []string{"r"},
Usage: "options for task templates",
Subcommands: []cli.Command{
{
Name: "add",
Usage: "add a new template",
Action: func(c *cli.Context) {
println("new task template: ", c.Args().First())
},
},
{
Name: "remove",
Usage: "remove an existing template",
Action: func(c *cli.Context) {
println("removed task template: ", c.Args().First())
},
},
},
},
}
...
```
### Bash Completion
You can enable completion commands by setting the `EnableBashCompletion`
flag on the `App` object. By default, this setting will only auto-complete to
show an app's subcommands, but you can write your own completion methods for
the App or its subcommands.
```go
...
var tasks = []string{"cook", "clean", "laundry", "eat", "sleep", "code"}
app := cli.NewApp()
app.EnableBashCompletion = true
app.Commands = []cli.Command{
{
Name: "complete",
Aliases: []string{"c"},
Usage: "complete a task on the list",
Action: func(c *cli.Context) {
println("completed task: ", c.Args().First())
},
BashComplete: func(c *cli.Context) {
// This will complete if no args are passed
if len(c.Args()) > 0 {
return
}
for _, t := range tasks {
fmt.Println(t)
}
},
}
}
...
```
#### To Enable
Source the `autocomplete/bash_autocomplete` file in your `.bashrc` file while
setting the `PROG` variable to the name of your program:
`PROG=myprogram source /.../cli/autocomplete/bash_autocomplete`
#### To Distribute
Copy `autocomplete/bash_autocomplete` into `/etc/bash_completion.d/` and rename
it to the name of the program you wish to add autocomplete support for (or
automatically install it there if you are distributing a package). Don't forget
to source the file to make it active in the current shell.
```
sudo cp src/bash_autocomplete /etc/bash_completion.d/<myprogram>
source /etc/bash_completion.d/<myprogram>
```
Alternatively, you can just document that users should source the generic
`autocomplete/bash_autocomplete` in their bash configuration with `$PROG` set
to the name of their program (as above).
## Contribution Guidelines
Feel free to put up a pull request to fix a bug or maybe add a feature. I will give it a code review and make sure that it does not break backwards compatibility. If I or any other collaborators agree that it is in line with the vision of the project, we will work with you to get the code into a mergeable state and merge it into the master branch.
If you have contributed something significant to the project, I will most likely add you as a collaborator. As a collaborator you are given the ability to merge others pull requests. It is very important that new code does not break existing code, so be careful about what code you do choose to merge. If you have any questions feel free to link @codegangsta to the issue in question and we can review it together.
If you feel like you have contributed to the project but have not yet been added as a collaborator, I probably forgot to add you. Hit @codegangsta up over email and we will get it figured out.
Oops, something went wrong.

0 comments on commit c8edb33

Please sign in to comment.