Closes #21
[BROOKLYN-280] add --skipSslChecks flag to work with self-signed certs
- defaults to `false`, ie existing behaviour
- setting the flag `--skipSslChecks` disables certificate chain and hostname verification (see `InsecureSkipVerify` in https://golang.org/pkg/crypto/tls/)
- persisted to `~/.brooklyn_cli`
- also bumped version to `0.10.0-SNAPSHOT`
```
bash-4.3$ br login https://10.10.10.100:8443/ admin password
Get https://10.10.10.100:8443/v1/server/version: x509: certificate signed by unknown authority
bash-4.3$ br app
Get https://10.10.10.100:8443/v1/applications: x509: certificate signed by unknown authority
bash-4.3$ br --skipSslChecks login https://10.10.10.100:8443/ admin password
Connected to Brooklyn version 0.10.0-20160513.2042 at https://10.10.10.100:8443
bash-4.3$ br app
Id Name Status Location
```
*Note*: I'd no apps running on this system so the empty table is ok, catalog returns as expected.
```json
{
"auth": {
"https://10.10.10.100:8443": {
"password": "password",
"username": "admin"
}
},
"skipSslChecks": true,
"target": "https://10.10.10.100:8443"
}
```
diff --git a/LICENSE b/LICENSE
index 13abdda..9764158 100644
--- a/LICENSE
+++ b/LICENSE
@@ -194,8 +194,8 @@
(2) Notices for bundled software
-This project includes the software: github.com/codegangsta/cli
- Available at: https://github.com/codegangsta/cli
+This project includes the software: github.com/urfave/cli
+ Available at: https://github.com/urfave/cli
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (C) 2013 Jeremy Saenz
diff --git a/api/application/applications.go b/api/application/applications.go
index 7f44ce0..f46ebac 100644
--- a/api/application/applications.go
+++ b/api/application/applications.go
@@ -48,10 +48,10 @@
return appSummary, err
}
-func Create(network *net.Network, filePath string) (models.TaskSummary, error) {
+func Create(network *net.Network, resource string) (models.TaskSummary, error) {
url := "/v1/applications"
var response models.TaskSummary
- body, err := network.SendPostFileRequest(url, filePath, "application/json")
+ body, err := network.SendPostResourceRequest(url, resource, "application/json")
if err != nil {
return response, err
}
diff --git a/api/catalog/catalog.go b/api/catalog/catalog.go
index b087530..dd5b75a 100644
--- a/api/catalog/catalog.go
+++ b/api/catalog/catalog.go
@@ -161,9 +161,9 @@
return catalogLocation, err
}
-func AddCatalog(network *net.Network, filePath string) (string, error) {
+func AddCatalog(network *net.Network, resource string) (string, error) {
url := "/v1/catalog"
- body, err := network.SendPostFileRequest(url, filePath, "application/json")
+ body, err := network.SendPostResourceRequest(url, resource, "application/json")
if err != nil {
return "", err
}
diff --git a/api/entities/entities.go b/api/entities/entities.go
index f132827..90dbb49 100644
--- a/api/entities/entities.go
+++ b/api/entities/entities.go
@@ -60,10 +60,10 @@
return entityList, err
}
-func AddChildren(network *net.Network, application, entity, filePath string) (models.TaskSummary, error) {
+func AddChildren(network *net.Network, application, entity, resource string) (models.TaskSummary, error) {
urlStr := fmt.Sprintf("/v1/applications/%s/entities/%s/children", application, entity)
var response models.TaskSummary
- body, err := network.SendPostFileRequest(urlStr, filePath, "application/json")
+ body, err := network.SendPostResourceRequest(urlStr, resource, "application/json")
if err != nil {
return response, err
}
diff --git a/app/app.go b/app/app.go
index b2ae791..afdb41d 100644
--- a/app/app.go
+++ b/app/app.go
@@ -23,7 +23,7 @@
"github.com/apache/brooklyn-client/command_metadata"
"github.com/apache/brooklyn-client/command_runner"
"github.com/apache/brooklyn-client/error_handler"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
"os"
"strings"
)
diff --git a/command/command.go b/command/command.go
index 14c03a5..1a16282 100644
--- a/command/command.go
+++ b/command/command.go
@@ -21,7 +21,7 @@
import (
"github.com/apache/brooklyn-client/command_metadata"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type Command interface {
diff --git a/command_metadata/command_metadata.go b/command_metadata/command_metadata.go
index 7f5c1b9..eac321f 100644
--- a/command_metadata/command_metadata.go
+++ b/command_metadata/command_metadata.go
@@ -18,7 +18,7 @@
*/
package command_metadata
-import "github.com/codegangsta/cli"
+import "github.com/urfave/cli"
type CommandMetadata struct {
Name string
diff --git a/command_runner/runner.go b/command_runner/runner.go
index 5fc86e5..c123b5f 100644
--- a/command_runner/runner.go
+++ b/command_runner/runner.go
@@ -21,7 +21,7 @@
import (
"github.com/apache/brooklyn-client/command_factory"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type Runner interface {
diff --git a/commands/access.go b/commands/access.go
index 1ddef76..87e26cd 100644
--- a/commands/access.go
+++ b/commands/access.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/error_handler"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type Access struct {
diff --git a/commands/activity-stream.go b/commands/activity-stream.go
index 38cec20..eceadc4 100644
--- a/commands/activity-stream.go
+++ b/commands/activity-stream.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/error_handler"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type ActivityStreamEnv struct {
diff --git a/commands/activity.go b/commands/activity.go
index cee097b..d748c1a 100644
--- a/commands/activity.go
+++ b/commands/activity.go
@@ -28,7 +28,7 @@
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
"github.com/apache/brooklyn-client/terminal"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
"sort"
"strconv"
"strings"
diff --git a/commands/add-catalog.go b/commands/add-catalog.go
index bf79f23..b161f8b 100644
--- a/commands/add-catalog.go
+++ b/commands/add-catalog.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/error_handler"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type AddCatalog struct {
@@ -41,8 +41,8 @@
func (cmd *AddCatalog) Metadata() command_metadata.CommandMetadata {
return command_metadata.CommandMetadata{
Name: "add-catalog",
- Description: "* Add a new catalog item from the supplied YAML",
- Usage: "BROOKLYN_NAME add-catalog FILEPATH",
+ Description: "* Add a new catalog item from the supplied YAML (a file or http URL)",
+ Usage: "BROOKLYN_NAME add-catalog ( FILEPATH | URL )",
Flags: []cli.Flag{},
}
}
diff --git a/commands/add-children.go b/commands/add-children.go
index 6492044..d05a114 100644
--- a/commands/add-children.go
+++ b/commands/add-children.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
"github.com/apache/brooklyn-client/terminal"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
"time"
)
@@ -43,7 +43,7 @@
return command_metadata.CommandMetadata{
Name: "add-children",
Description: "* Add a child or children to this entity from the supplied YAML",
- Usage: "BROOKLYN_NAME SCOPE add-children FILEPATH",
+ Usage: "BROOKLYN_NAME SCOPE add-children ( FILEPATH | URL )",
Flags: []cli.Flag{},
}
}
diff --git a/commands/add-policy.go b/commands/add-policy.go
index a17e6c5..35de8c4 100644
--- a/commands/add-policy.go
+++ b/commands/add-policy.go
@@ -19,7 +19,7 @@
package commands
import (
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
//"github.com/apache/brooklyn-client/api/entity_policies"
"github.com/apache/brooklyn-client/command_metadata"
"github.com/apache/brooklyn-client/net"
diff --git a/commands/application.go b/commands/application.go
index 3538689..c321227 100644
--- a/commands/application.go
+++ b/commands/application.go
@@ -29,7 +29,7 @@
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
"github.com/apache/brooklyn-client/terminal"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
"strings"
)
diff --git a/commands/catalog.go b/commands/catalog.go
index 2cb884d..fd1d8ad 100644
--- a/commands/catalog.go
+++ b/commands/catalog.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
"github.com/apache/brooklyn-client/terminal"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type Catalog struct {
diff --git a/commands/config.go b/commands/config.go
index 8af3046..33d9cba 100644
--- a/commands/config.go
+++ b/commands/config.go
@@ -26,7 +26,7 @@
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
"github.com/apache/brooklyn-client/terminal"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type Config struct {
diff --git a/commands/delete.go b/commands/delete.go
index e4bfdae..90c60f9 100644
--- a/commands/delete.go
+++ b/commands/delete.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/error_handler"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type Delete struct {
diff --git a/commands/deploy.go b/commands/deploy.go
index 3b0607c..bc42b08 100644
--- a/commands/deploy.go
+++ b/commands/deploy.go
@@ -26,7 +26,7 @@
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
"github.com/apache/brooklyn-client/terminal"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
"io/ioutil"
"os"
"strings"
@@ -45,8 +45,8 @@
func (cmd *Deploy) Metadata() command_metadata.CommandMetadata {
return command_metadata.CommandMetadata{
Name: "deploy",
- Description: "Deploy a new application from the given YAML (read from file or stdin)",
- Usage: "BROOKLYN_NAME deploy ( <FILE> | - )",
+ Description: "Deploy a new application from the given YAML (read from file or URL, or stdin)",
+ Usage: "BROOKLYN_NAME deploy ( FILE | URL | '-' )",
Flags: []cli.Flag{},
}
}
@@ -60,7 +60,7 @@
var err error
var blueprint []byte
if c.Args().First() == "" {
- error_handler.ErrorExit("A filename or '-' must be provided as the first argument", error_handler.CLIUsageErrorExitCode)
+ error_handler.ErrorExit("A filename or URL or '-' must be provided as the first argument", error_handler.CLIUsageErrorExitCode)
}
if c.Args().First() == "-" {
blueprint, err = ioutil.ReadAll(os.Stdin)
diff --git a/commands/destroy-policy.go b/commands/destroy-policy.go
index c358d70..4ea37ec 100644
--- a/commands/destroy-policy.go
+++ b/commands/destroy-policy.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/error_handler"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type DestroyPolicy struct {
diff --git a/commands/effector.go b/commands/effector.go
index 7105cf9..aeff664 100644
--- a/commands/effector.go
+++ b/commands/effector.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
"github.com/apache/brooklyn-client/terminal"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
"strings"
)
diff --git a/commands/entity.go b/commands/entity.go
index b6688a3..e5903c9 100644
--- a/commands/entity.go
+++ b/commands/entity.go
@@ -27,7 +27,7 @@
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
"github.com/apache/brooklyn-client/terminal"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
"os"
)
diff --git a/commands/invoke.go b/commands/invoke.go
index 21842f8..a719ed7 100644
--- a/commands/invoke.go
+++ b/commands/invoke.go
@@ -26,7 +26,7 @@
"github.com/apache/brooklyn-client/error_handler"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
"io/ioutil"
"strings"
)
diff --git a/commands/list.go b/commands/list.go
index d675f77..7758568 100644
--- a/commands/list.go
+++ b/commands/list.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/error_handler"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
"strings"
)
diff --git a/commands/locations.go b/commands/locations.go
index 79646d5..f197130 100644
--- a/commands/locations.go
+++ b/commands/locations.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
"github.com/apache/brooklyn-client/terminal"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type Locations struct {
diff --git a/commands/login.go b/commands/login.go
index 8e35f18..df63b33 100644
--- a/commands/login.go
+++ b/commands/login.go
@@ -26,7 +26,7 @@
"github.com/apache/brooklyn-client/io"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
"golang.org/x/crypto/ssh/terminal"
"syscall"
)
diff --git a/commands/policy.go b/commands/policy.go
index b548ab8..1d587fd 100644
--- a/commands/policy.go
+++ b/commands/policy.go
@@ -27,7 +27,7 @@
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
"github.com/apache/brooklyn-client/terminal"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
"sort"
)
diff --git a/commands/rename.go b/commands/rename.go
index 70df396..7891971 100644
--- a/commands/rename.go
+++ b/commands/rename.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/error_handler"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type Rename struct {
diff --git a/commands/sensor.go b/commands/sensor.go
index d4fb78d..ac75660 100644
--- a/commands/sensor.go
+++ b/commands/sensor.go
@@ -27,7 +27,7 @@
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
"github.com/apache/brooklyn-client/terminal"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
"sort"
)
diff --git a/commands/set.go b/commands/set.go
index 5342e4d..ae1a594 100644
--- a/commands/set.go
+++ b/commands/set.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/error_handler"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type SetConfig struct {
diff --git a/commands/spec.go b/commands/spec.go
index 64d0a8c..06819b9 100644
--- a/commands/spec.go
+++ b/commands/spec.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/error_handler"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type Spec struct {
diff --git a/commands/start-policy.go b/commands/start-policy.go
index 46c3823..68dbec7 100644
--- a/commands/start-policy.go
+++ b/commands/start-policy.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/error_handler"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type StartPolicy struct {
diff --git a/commands/stop-policy.go b/commands/stop-policy.go
index da67bea..2700802 100644
--- a/commands/stop-policy.go
+++ b/commands/stop-policy.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/error_handler"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type StopPolicy struct {
diff --git a/commands/tree.go b/commands/tree.go
index 96e19d6..5665997 100644
--- a/commands/tree.go
+++ b/commands/tree.go
@@ -26,7 +26,7 @@
"github.com/apache/brooklyn-client/models"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type Tree struct {
diff --git a/commands/version.go b/commands/version.go
index a378e1e..39de4b6 100644
--- a/commands/version.go
+++ b/commands/version.go
@@ -25,7 +25,7 @@
"github.com/apache/brooklyn-client/error_handler"
"github.com/apache/brooklyn-client/net"
"github.com/apache/brooklyn-client/scope"
- "github.com/codegangsta/cli"
+ "github.com/urfave/cli"
)
type Version struct {
diff --git a/net/net.go b/net/net.go
index f981ecc..b35a6c3 100644
--- a/net/net.go
+++ b/net/net.go
@@ -153,18 +153,49 @@
return body, err
}
-func (net *Network) SendPostFileRequest(url, filePath string, contentType string) ([]byte, error) {
- file, err := os.Open(filepath.Clean(filePath))
- if err != nil {
- return nil, err
- }
- defer file.Close()
- req := net.NewPostRequest(url, file)
+func (net *Network) SendPostResourceRequest(restUrl string, resourceUrl string, contentType string) ([]byte, error) {
+ resource, err := openResource(resourceUrl)
+ defer resource.Close()
+ req := net.NewPostRequest(restUrl, resource)
req.Header.Set("Content-Type", contentType)
body, err := net.SendRequest(req)
return body, err
}
+func openResource(resourceUrl string) (io.ReadCloser, error) {
+ u, err := url.Parse(resourceUrl)
+ if err != nil {
+ return nil, err
+ }
+ if "" == u.Scheme || "file" == u.Scheme {
+ return openFileResource(u)
+
+ } else if "http" == u.Scheme || "https" == u.Scheme {
+ return openHttpResource(resourceUrl)
+
+ } else {
+ return nil, errors.New("Unrecognised protocol scheme: " + u.Scheme)
+ }
+}
+
+func openFileResource(url *url.URL) (io.ReadCloser, error) {
+ filePath := url.Path;
+ file, err := os.Open(filepath.Clean(filePath))
+ if err != nil {
+ return nil, err
+ }
+ return file, nil
+}
+
+func openHttpResource(resourceUrl string) (io.ReadCloser, error) {
+ resp, err := http.Get(resourceUrl)
+ if err != nil {
+ return nil, err
+ }
+ return resp.Body, nil
+}
+
+
func VerifyLoginURL(network *Network) error {
url, err := url.Parse(network.BrooklynUrl)
if err != nil {
diff --git a/release/license/files/LICENSE b/release/license/files/LICENSE
index 13abdda..9764158 100644
--- a/release/license/files/LICENSE
+++ b/release/license/files/LICENSE
@@ -194,8 +194,8 @@
(2) Notices for bundled software
-This project includes the software: github.com/codegangsta/cli
- Available at: https://github.com/codegangsta/cli
+This project includes the software: github.com/urfave/cli
+ Available at: https://github.com/urfave/cli
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (C) 2013 Jeremy Saenz
diff --git a/release/license/source-inclusions.yaml b/release/license/source-inclusions.yaml
index c985c5b..dddc9dc 100644
--- a/release/license/source-inclusions.yaml
+++ b/release/license/source-inclusions.yaml
@@ -20,5 +20,5 @@
# extras file for org.heneveld.license-audit-maven-plugin
# listing projects from which *source* files are included
-- id: github.com/codegangsta/cli
+- id: github.com/urfave/cli
- id: golang.org/x/crypto/ssh
diff --git a/vendor/github.com/codegangsta/cli/.travis.yml b/vendor/github.com/urfave/cli/.travis.yml
similarity index 100%
rename from vendor/github.com/codegangsta/cli/.travis.yml
rename to vendor/github.com/urfave/cli/.travis.yml
diff --git a/vendor/github.com/codegangsta/cli/LICENSE b/vendor/github.com/urfave/cli/LICENSE
similarity index 100%
rename from vendor/github.com/codegangsta/cli/LICENSE
rename to vendor/github.com/urfave/cli/LICENSE
diff --git a/vendor/github.com/codegangsta/cli/README.md b/vendor/github.com/urfave/cli/README.md
similarity index 100%
rename from vendor/github.com/codegangsta/cli/README.md
rename to vendor/github.com/urfave/cli/README.md
diff --git a/vendor/github.com/codegangsta/cli/app.go b/vendor/github.com/urfave/cli/app.go
similarity index 100%
rename from vendor/github.com/codegangsta/cli/app.go
rename to vendor/github.com/urfave/cli/app.go
diff --git a/vendor/github.com/codegangsta/cli/appveyor.yml b/vendor/github.com/urfave/cli/appveyor.yml
similarity index 100%
rename from vendor/github.com/codegangsta/cli/appveyor.yml
rename to vendor/github.com/urfave/cli/appveyor.yml
diff --git a/vendor/github.com/codegangsta/cli/cli.go b/vendor/github.com/urfave/cli/cli.go
similarity index 100%
rename from vendor/github.com/codegangsta/cli/cli.go
rename to vendor/github.com/urfave/cli/cli.go
diff --git a/vendor/github.com/codegangsta/cli/command.go b/vendor/github.com/urfave/cli/command.go
similarity index 100%
rename from vendor/github.com/codegangsta/cli/command.go
rename to vendor/github.com/urfave/cli/command.go
diff --git a/vendor/github.com/codegangsta/cli/context.go b/vendor/github.com/urfave/cli/context.go
similarity index 100%
rename from vendor/github.com/codegangsta/cli/context.go
rename to vendor/github.com/urfave/cli/context.go
diff --git a/vendor/github.com/codegangsta/cli/flag.go b/vendor/github.com/urfave/cli/flag.go
similarity index 100%
rename from vendor/github.com/codegangsta/cli/flag.go
rename to vendor/github.com/urfave/cli/flag.go
diff --git a/vendor/github.com/codegangsta/cli/help.go b/vendor/github.com/urfave/cli/help.go
similarity index 100%
rename from vendor/github.com/codegangsta/cli/help.go
rename to vendor/github.com/urfave/cli/help.go
