Updated dependencies and fixed issue with fn dependending on version from api.

fn/Gopkg.lock

@@ -1,4 +1,5 @@
-memo = "9e1d9db05f14e4fcb5786440592f93e0baab3f6b9ef00fc46cb39da2dd0d5fce"
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
 
 [[projects]]
   branch = "master"
@@ -32,9 +33,9 @@ memo = "9e1d9db05f14e4fcb5786440592f93e0baab3f6b9ef00fc46cb39da2dd0d5fce"
 
 [[projects]]
   name = "github.com/aws/aws-sdk-go"
-  packages = ["aws","aws/awserr","aws/awsutil","aws/client","aws/client/metadata","aws/corehandlers","aws/credentials","aws/credentials/ec2rolecreds","aws/credentials/endpointcreds","aws/credentials/stscreds","aws/defaults","aws/ec2metadata","aws/endpoints","aws/request","aws/session","aws/signer/v4","private/protocol","private/protocol/json/jsonutil","private/protocol/jsonrpc","private/protocol/query","private/protocol/query/queryutil","private/protocol/rest","private/protocol/restjson","private/protocol/xml/xmlutil","service/lambda","service/sts"]
+  packages = ["aws","aws/awserr","aws/awsutil","aws/client","aws/client/metadata","aws/corehandlers","aws/credentials","aws/credentials/ec2rolecreds","aws/credentials/endpointcreds","aws/credentials/stscreds","aws/defaults","aws/ec2metadata","aws/endpoints","aws/request","aws/session","aws/signer/v4","internal/shareddefaults","private/protocol","private/protocol/json/jsonutil","private/protocol/jsonrpc","private/protocol/query","private/protocol/query/queryutil","private/protocol/rest","private/protocol/restjson","private/protocol/xml/xmlutil","service/lambda","service/sts"]
-  revision = "9f8b24cb7c7701c78150869d906711a2e7184bc0"
+  revision = "f9a14dadf426ac17058f5ed3ec9bac9a61b5990b"
-  version = "v1.8.23"
+  version = "v1.8.33"
 
 [[projects]]
   name = "github.com/coreos/go-semver"
@@ -63,8 +64,8 @@ memo = "9e1d9db05f14e4fcb5786440592f93e0baab3f6b9ef00fc46cb39da2dd0d5fce"
 [[projects]]
   name = "github.com/go-ini/ini"
   packages = ["."]
-  revision = "e7fea39b01aea8d5671f6858f0532f56e8bff3a5"
+  revision = "36da989cdc560b989d8f195aec46214d33665d20"
-  version = "v1.27.0"
+  version = "v1.27.2"
 
 [[projects]]
   branch = "master"
@@ -94,7 +95,7 @@ memo = "9e1d9db05f14e4fcb5786440592f93e0baab3f6b9ef00fc46cb39da2dd0d5fce"
   branch = "master"
   name = "github.com/go-openapi/loads"
   packages = ["."]
-  revision = "ad6217c63d9d12406790ee4acae2aaebd8dc63ec"
+  revision = "a80dea3052f00e5f032e860dd7355cd0cc67e24d"
 
 [[projects]]
   branch = "master"
@@ -118,7 +119,7 @@ memo = "9e1d9db05f14e4fcb5786440592f93e0baab3f6b9ef00fc46cb39da2dd0d5fce"
   branch = "master"
   name = "github.com/go-openapi/swag"
   packages = ["."]
-  revision = "24ebf76d720bab64f62824d76bced3184a65490d"
+  revision = "e43299b4afa7bc7f22e5e82e3d48607230e4c177"
 
 [[projects]]
   branch = "master"
@@ -129,8 +130,8 @@ memo = "9e1d9db05f14e4fcb5786440592f93e0baab3f6b9ef00fc46cb39da2dd0d5fce"
 [[projects]]
   name = "github.com/go-resty/resty"
   packages = ["."]
-  revision = "c45c7bcc0000d1a9ac1b119b2e6043c6540eedea"
+  revision = "7a8134d8718193eb857994adee49d73a302e7718"
-  version = "v0.11"
+  version = "v0.12"
 
 [[projects]]
   branch = "master"
@@ -160,13 +161,13 @@ memo = "9e1d9db05f14e4fcb5786440592f93e0baab3f6b9ef00fc46cb39da2dd0d5fce"
   branch = "master"
   name = "github.com/mailru/easyjson"
   packages = ["buffer","jlexer","jwriter"]
-  revision = "dffba8d13bbd998df17d8557570cdea0624b9d1d"
+  revision = "44c0351a5bc860bcb2608d54aa03ea686c4e7b25"
 
 [[projects]]
   branch = "master"
   name = "github.com/mitchellh/mapstructure"
   packages = ["."]
-  revision = "cc8532a8e9a55ea36402aa21efdf403a60d34096"
+  revision = "d0303fe809921458f417bcf828397a65db30a7e4"
 
 [[projects]]
   name = "github.com/moby/moby"
@@ -180,29 +181,23 @@ memo = "9e1d9db05f14e4fcb5786440592f93e0baab3f6b9ef00fc46cb39da2dd0d5fce"
   revision = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"
   version = "v1.19.1"
 
-[[projects]]
-  name = "gitlab-odx.oracle.com/odx/functions"
-  packages = ["api/version"]
-  revision = "37b53a5820fd2f10a1afa3b04e2423408828afb5"
-  version = "0.3.7"
-
 [[projects]]
   branch = "master"
   name = "golang.org/x/net"
   packages = ["context","context/ctxhttp","idna","publicsuffix"]
-  revision = "34057069f4ab13dc4433c68d368737ebeafcccdc"
+  revision = "3da985ce5951d99de868be4385f21ea6c2b22f24"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/sys"
   packages = ["unix"]
-  revision = "1e99a4f9d247b28c670884b9a8d6801f39a47b77"
+  revision = "b90f89a1e7a9c1f6b918820b3daa7f08488c8594"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/text"
   packages = ["internal/gen","internal/triegen","internal/ucd","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable","width"]
-  revision = "19e51611da83d6be54ddafce4a4af510cb3e9ea4"
+  revision = "4ee4af566555f5fbe026368b75596286a312663a"
 
 [[projects]]
   branch = "v2"
@@ -215,3 +210,10 @@ memo = "9e1d9db05f14e4fcb5786440592f93e0baab3f6b9ef00fc46cb39da2dd0d5fce"
   name = "gopkg.in/yaml.v2"
   packages = ["."]
   revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "3ea53dfb758c5e85c0dcbea6325506f905f1d5e9f7d43d57d8e500112e021bac"
+  solver-name = "gps-cdcl"
+  solver-version = 1

fn/Gopkg.toml

@@ -1,6 +1,13 @@
 
 ## Gopkg.toml example (these lines may be deleted)
 
+## "metadata" defines metadata about the project that could be used by other independent
+## systems. The metadata defined here will be ignored by dep.
+# [metadata]
+# key1 = "value that convey data to other systems"
+# system1-data = "value that is used by a system"
+# system2-data = "value that is used by another system"
+
 ## "required" lists a set of packages (not projects) that must be included in
 ## Gopkg.lock. This list is merged with the set of packages imported by the current
 ## project. Use it when your project needs a package it doesn't explicitly import -
@@ -12,9 +19,10 @@
 ## or in a dependency.
 # ignored = ["github.com/user/project/badpkg"]
 
-## Dependencies define constraints on dependent projects. They are respected by
+## Constraints are rules for how directly imported projects
+## may be incorporated into the depgraph. They are respected by
 ## dep whether coming from the Gopkg.toml of the current project or a dependency.
-# [[dependencies]]
+# [[constraint]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #
@@ -26,18 +34,25 @@
 #
 ## Optional: an alternate location (URL or import path) for the project's source.
 # source = "https://github.com/myfork/package.git"
+#
+## "metadata" defines metadata about the dependency or override that could be used
+## by other independent systems. The metadata defined here will be ignored by dep.
+# [metadata]
+# key1 = "value that convey data to other systems"
+# system1-data = "value that is used by a system"
+# system2-data = "value that is used by another system"
 
-## Overrides have the same structure as [[dependencies]], but supercede all
+## Overrides have the same structure as [[constraint]], but supersede all
-## [[dependencies]] declarations from all projects. Only the current project's
+## [[constraint]] declarations from all projects. Only [[override]] from
-## [[overrides]] are applied.
+## the current project's are applied.
 ##
 ## Overrides are a sledgehammer. Use them only as a last resort.
-# [[overrides]]
+# [[override]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #
 ## Optional: specifying a version constraint override will cause all other
-## constraints on this project to be ignored; only the overriden constraint
+## constraints on this project to be ignored; only the overridden constraint
 ## need be satisfied.
 ## Again, only one of "branch", "version" or "revision" can be specified.
 # version = "1.0.0"
@@ -49,40 +64,44 @@
 ## what source location any dependent projects specify.
 # source = "https://github.com/myfork/package.git"
 
-ignored = ["github.com/treeder/functions", "github.com/treeder/functions/api/version"]
 
-[[dependencies]]
+
+[[constraint]]
+  name = "github.com/Sirupsen/logrus"
+  version = "0.11.5"
+
+[[constraint]]
   name = "github.com/aws/aws-sdk-go"
-  version = "^1.8.23"
+  version = "1.8.33"
 
-[[dependencies]]
+[[constraint]]
   name = "github.com/giantswarm/semver-bump"
-  version = "^1.1.1"
+  version = "1.1.1"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/go-openapi/runtime"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/go-openapi/strfmt"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/iron-io/functions_go"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/jmoiron/jsonq"
 
-[[dependencies]]
+[[constraint]]
   name = "github.com/moby/moby"
-  version = "^1.13.1"
+  version = "1.13.1"
 
-[[dependencies]]
+[[constraint]]
   name = "github.com/urfave/cli"
-  version = "^1.19.1"
+  version = "1.19.1"
 
-[[dependencies]]
+[[constraint]]
   branch = "v2"
   name = "gopkg.in/yaml.v2"

fn/main.go

@@ -9,7 +9,6 @@ import (
 
 	functions "github.com/iron-io/functions_go"
 	"github.com/urfave/cli"
-	vers "gitlab-odx.oracle.com/odx/functions/api/version"
 )
 
 var aliases = map[string]cli.Command{
@@ -34,7 +33,7 @@ func aliasesFn() []cli.Command {
 func newFn() *cli.App {
 	app := cli.NewApp()
 	app.Name = "fn"
-	app.Version = vers.Version
+	app.Version = Version
 	app.Authors = []cli.Author{{Name: "Oracle Corporation"}}
 	app.Description = "Oracle Functions command line tools"
 	app.UsageText = `Check the manual at https://gitlab-odx.oracle.com/odx/functions/blob/master/fn/README.md`

fn/version.go

@@ -5,11 +5,13 @@ import (
 	"net/url"
 	"os"
 
-	vers "gitlab-odx.oracle.com/odx/functions/api/version"
 	functions "github.com/iron-io/functions_go"
 	"github.com/urfave/cli"
 )
 
+// Version of Functions CLI
+var Version = "0.3.7"
+
 func version() cli.Command {
 	r := versionCmd{VersionApi: functions.NewVersionApi()}
 	return cli.Command{
@@ -35,7 +37,7 @@ func (r *versionCmd) version(c *cli.Context) error {
 	}
 	r.Configuration.BasePath = u.String()
 
-	fmt.Println("Client version:", vers.Version)
+	fmt.Println("Client version:", Version)
 	v, _, err := r.VersionGet()
 	if err != nil {
 		return err