From 60da1c5f65dda96b9aeaeb2afbc513bf134a1990 Mon Sep 17 00:00:00 2001 From: Denis Makogon Date: Fri, 18 Aug 2017 21:31:44 +0300 Subject: [PATCH 1/4] Updating functions_go to 0.1.37 --- glide.lock | 6 ++---- vendor/github.com/funcy/functions_go/VERSION | 2 +- .../funcy/functions_go/client/functions_client.go | 14 -------------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/glide.lock b/glide.lock index 2cbcfa367..c41b67ee6 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ hash: b555054a6f86ac84f6104ad9efabdcd85966c8f6574e485be7337c3ee9f29aa0 -updated: 2017-08-16T11:13:27.488480563-07:00 +updated: 2017-08-18T21:27:39.98453555+03:00 imports: - name: github.com/amir/raidman version: 1ccc43bfb9c93cb401a4025e49c64ba71e5e668b @@ -116,15 +116,13 @@ imports: - name: github.com/fsouza/go-dockerclient version: 75772940379e725b5aae213e570f9dcd751951cb - name: github.com/funcy/functions_go - version: fc7e7ca2fbc8bef236300b7b9f1075410a62447f + version: e046aa4ca1f1028a04fc51395297ff07515cb0b6 subpackages: - client - client/apps - client/call - client/operations - client/routes - - client/tasks - - client/version - models - name: github.com/garyburd/redigo version: b925df3cc15d8646e9b5b333ebaf3011385aba11 diff --git a/vendor/github.com/funcy/functions_go/VERSION b/vendor/github.com/funcy/functions_go/VERSION index d3662a8dd..f37372d37 100644 --- a/vendor/github.com/funcy/functions_go/VERSION +++ b/vendor/github.com/funcy/functions_go/VERSION @@ -1 +1 @@ -0.1.36 \ No newline at end of file +0.1.37 \ No newline at end of file diff --git a/vendor/github.com/funcy/functions_go/client/functions_client.go b/vendor/github.com/funcy/functions_go/client/functions_client.go index 7604c416e..ac2259094 100644 --- a/vendor/github.com/funcy/functions_go/client/functions_client.go +++ b/vendor/github.com/funcy/functions_go/client/functions_client.go @@ -15,8 +15,6 @@ import ( "github.com/funcy/functions_go/client/call" "github.com/funcy/functions_go/client/operations" "github.com/funcy/functions_go/client/routes" - "github.com/funcy/functions_go/client/tasks" - "github.com/funcy/functions_go/client/version" ) // Default functions HTTP client. @@ -68,10 +66,6 @@ func New(transport runtime.ClientTransport, formats strfmt.Registry) *Functions cli.Routes = routes.New(transport, formats) - cli.Tasks = tasks.New(transport, formats) - - cli.Version = version.New(transport, formats) - return cli } @@ -124,10 +118,6 @@ type Functions struct { Routes *routes.Client - Tasks *tasks.Client - - Version *version.Client - Transport runtime.ClientTransport } @@ -143,8 +133,4 @@ func (c *Functions) SetTransport(transport runtime.ClientTransport) { c.Routes.SetTransport(transport) - c.Tasks.SetTransport(transport) - - c.Version.SetTransport(transport) - } From 091b035921f58f33dc0a3f39f5edd2ea6ca13cdb Mon Sep 17 00:00:00 2001 From: Denis Makogon Date: Fri, 18 Aug 2017 21:35:59 +0300 Subject: [PATCH 2/4] Updating CLI dependency: functions_go 0.1.37 --- cli/glide.lock | 9 ++++++--- cli/vendor/github.com/funcy/functions_go/VERSION | 6 +++++- .../funcy/functions_go/client/functions_client.go | 14 -------------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/cli/glide.lock b/cli/glide.lock index b54acedcd..2ffad3930 100644 --- a/cli/glide.lock +++ b/cli/glide.lock @@ -1,5 +1,10 @@ +<<<<<<< 60da1c5f65dda96b9aeaeb2afbc513bf134a1990 hash: da81ae46b9ef53596e8daaaa1aeb662af8704d77ae34ce2d33c7da87e6bd1ef5 updated: 2017-08-09T23:25:49.919468872+03:00 +======= +hash: fc16e358787292cb0b0d7f71adf4f0685b5994ca1c81788fdd056de21ebe7e55 +updated: 2017-08-18T21:34:47.686061147+03:00 +>>>>>>> Updating CLI dependency: functions_go 0.1.37 imports: - name: github.com/asaskevich/govalidator version: aa5cce4a76edb1a5acecab1870c17abbffb5419e @@ -50,15 +55,13 @@ imports: - name: github.com/docker/go-units version: 0dadbb0345b35ec7ef35e228dabb8de89a65bf52 - name: github.com/funcy/functions_go - version: fc7e7ca2fbc8bef236300b7b9f1075410a62447f + version: e046aa4ca1f1028a04fc51395297ff07515cb0b6 subpackages: - client - client/apps - client/call - client/operations - client/routes - - client/tasks - - client/version - models - name: github.com/giantswarm/semver-bump version: 88e6c9f2fe390c48839eaba32490fd09cb3b581c diff --git a/cli/vendor/github.com/funcy/functions_go/VERSION b/cli/vendor/github.com/funcy/functions_go/VERSION index d3662a8dd..81522d9ab 100644 --- a/cli/vendor/github.com/funcy/functions_go/VERSION +++ b/cli/vendor/github.com/funcy/functions_go/VERSION @@ -1 +1,5 @@ -0.1.36 \ No newline at end of file +<<<<<<< 60da1c5f65dda96b9aeaeb2afbc513bf134a1990 +0.1.36 +======= +0.1.37 +>>>>>>> Updating CLI dependency: functions_go 0.1.37 diff --git a/cli/vendor/github.com/funcy/functions_go/client/functions_client.go b/cli/vendor/github.com/funcy/functions_go/client/functions_client.go index 7604c416e..ac2259094 100644 --- a/cli/vendor/github.com/funcy/functions_go/client/functions_client.go +++ b/cli/vendor/github.com/funcy/functions_go/client/functions_client.go @@ -15,8 +15,6 @@ import ( "github.com/funcy/functions_go/client/call" "github.com/funcy/functions_go/client/operations" "github.com/funcy/functions_go/client/routes" - "github.com/funcy/functions_go/client/tasks" - "github.com/funcy/functions_go/client/version" ) // Default functions HTTP client. @@ -68,10 +66,6 @@ func New(transport runtime.ClientTransport, formats strfmt.Registry) *Functions cli.Routes = routes.New(transport, formats) - cli.Tasks = tasks.New(transport, formats) - - cli.Version = version.New(transport, formats) - return cli } @@ -124,10 +118,6 @@ type Functions struct { Routes *routes.Client - Tasks *tasks.Client - - Version *version.Client - Transport runtime.ClientTransport } @@ -143,8 +133,4 @@ func (c *Functions) SetTransport(transport runtime.ClientTransport) { c.Routes.SetTransport(transport) - c.Tasks.SetTransport(transport) - - c.Version.SetTransport(transport) - } From a461f0bba01a7d85c45001ac9bb69f9e3c4a9adc Mon Sep 17 00:00:00 2001 From: Denis Makogon Date: Fri, 18 Aug 2017 21:47:29 +0300 Subject: [PATCH 3/4] Updating API tests --- test/fn-api-tests/utils.go | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/test/fn-api-tests/utils.go b/test/fn-api-tests/utils.go index 35976f02d..670d13590 100644 --- a/test/fn-api-tests/utils.go +++ b/test/fn-api-tests/utils.go @@ -133,20 +133,17 @@ func SetupDefaultSuite() *SuiteSetup { Memory: uint64(256), } - _, ok := ss.Client.Version.GetVersion(nil) - if ok != nil { - if Host() != "localhost:8080" { - _, ok := http.Get(fmt.Sprintf("http://%s/version", Host())) - if ok != nil { - panic("Cannot reach remote api for functions") - } - } else { - _, ok := http.Get(fmt.Sprintf("http://%s/version", Host())) - if ok != nil { - log.Println("Making functions server") - _, cancel := getServerWithCancel() - ss.Cancel = cancel - } + if Host() != "localhost:8080" { + _, ok := http.Get(fmt.Sprintf("http://%s/version", Host())) + if ok != nil { + panic("Cannot reach remote api for functions") + } + } else { + _, ok := http.Get(fmt.Sprintf("http://%s/version", Host())) + if ok != nil { + log.Println("Making functions server") + _, cancel := getServerWithCancel() + ss.Cancel = cancel } } From 347baa05167575deabfb4b0fcee3531f33304aa7 Mon Sep 17 00:00:00 2001 From: Denis Makogon Date: Fri, 18 Aug 2017 21:49:08 +0300 Subject: [PATCH 4/4] Cleaning up from merge conficts --- cli/glide.lock | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cli/glide.lock b/cli/glide.lock index 2ffad3930..97f0693e7 100644 --- a/cli/glide.lock +++ b/cli/glide.lock @@ -1,10 +1,5 @@ -<<<<<<< 60da1c5f65dda96b9aeaeb2afbc513bf134a1990 -hash: da81ae46b9ef53596e8daaaa1aeb662af8704d77ae34ce2d33c7da87e6bd1ef5 -updated: 2017-08-09T23:25:49.919468872+03:00 -======= hash: fc16e358787292cb0b0d7f71adf4f0685b5994ca1c81788fdd056de21ebe7e55 updated: 2017-08-18T21:34:47.686061147+03:00 ->>>>>>> Updating CLI dependency: functions_go 0.1.37 imports: - name: github.com/asaskevich/govalidator version: aa5cce4a76edb1a5acecab1870c17abbffb5419e