From 470f9ec0c54373f7d66fca7e49aee3d65a3edab9 Mon Sep 17 00:00:00 2001 From: Ed Cook Date: Thu, 31 Aug 2017 10:43:09 +0100 Subject: [PATCH 1/2] bumped cfbackup Signed-off-by: Jatin Naik --- glide.lock | 8 ++++---- glide.yaml | 2 +- integration/cmd_test.go | 13 +++++++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/glide.lock b/glide.lock index 7e2f6d6..6a9a767 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 2cfecbde9c62762b13545f7a9a9cc1dc036b46d28b16bee2f3e2301238c1b1cc -updated: 2017-08-18T14:44:19.243796453+01:00 +hash: c090cf39c725222667100156d17a60b27375e8b63b31bba59990e9fea0325f2e +updated: 2017-08-31T10:25:03.126941534+01:00 imports: - name: code.cloudfoundry.org/lager version: 0bfa98e49e7a976af91e918d47978f07c00b081f @@ -68,7 +68,7 @@ imports: - name: github.com/go-ini/ini version: c787282c39ac1fc618827141a1f762240def08a3 - name: github.com/golang/protobuf - version: 748d386b5c1ea99658fd69fe9f03991ce86a90c1 + version: 83cd65fc365ace80eb6b6ecfc45203e43edfbc70 subpackages: - proto - ptypes @@ -139,7 +139,7 @@ imports: - name: github.com/pivotal-golang/lager version: 95b2ada4cdf781bdcf07e5207879e034ac8c5314 - name: github.com/pivotalservices/cfbackup - version: d3b60df434d41fcd3eaab2ce918aa625161f1184 + version: db53f4188a97a8c7436ee5e98f31dd32d6d05458 subpackages: - tileregistry - tileregistry/fake diff --git a/glide.yaml b/glide.yaml index fb3439a..91f5575 100644 --- a/glide.yaml +++ b/glide.yaml @@ -4,7 +4,7 @@ import: - package: github.com/codegangsta/cli - package: github.com/hashicorp/go-plugin - package: github.com/pivotalservices/cfbackup - version: v0.1.157 + version: v0.1.158 subpackages: - tiles - tiles/opsmanager diff --git a/integration/cmd_test.go b/integration/cmd_test.go index f18bd4e..dc13f8e 100644 --- a/integration/cmd_test.go +++ b/integration/cmd_test.go @@ -107,6 +107,10 @@ func basicAuthDirectorHandlers(directorURL string) []http.HandlerFunc { ghttp.VerifyRequest("GET", "/tasks/2"), ghttp.RespondWith(http.StatusOK, getTaskResponseOK("2")), ), + ghttp.CombineHandlers( + ghttp.VerifyRequest("GET", "/info"), + ghttp.RespondWith(http.StatusOK, infoResponse), + ), ghttp.CombineHandlers( ghttp.VerifyRequest("PUT", "/deployments/cf-f21eea2dbdb8555f89fb/jobs/cloud_controller-partition-7bc61fd2fa9d654696df/0", "state=started"), ghttp.VerifyBody([]byte(``)), @@ -183,6 +187,15 @@ func uaaAuthDirectorHandlers(directorURL string) []http.HandlerFunc { ghttp.VerifyRequest("GET", "/tasks/2"), ghttp.RespondWith(http.StatusOK, getTaskResponseOK("2")), ), + ghttp.CombineHandlers( + ghttp.VerifyRequest("GET", "/info"), + ghttp.RespondWith(http.StatusOK, infoResponse), + ), + ghttp.CombineHandlers( + ghttp.VerifyRequest("POST", "/oauth/token"), + ghttp.RespondWith(http.StatusOK, tokenResponse, http.Header{ + "Content-Type": []string{"application/json"}}), + ), ghttp.CombineHandlers( ghttp.VerifyRequest("PUT", "/deployments/cf-f21eea2dbdb8555f89fb/jobs/cloud_controller-partition-7bc61fd2fa9d654696df/0", "state=started"), ghttp.VerifyBody([]byte(``)), From b19e5fe48c019fde38db0eceddf70db316ee0dcc Mon Sep 17 00:00:00 2001 From: Jatin Naik Date: Thu, 31 Aug 2017 10:50:34 +0100 Subject: [PATCH 2/2] Updating github fingerprint to use sha256 format Signed-off-by: Ed Cook --- wercker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wercker.yml b/wercker.yml index b035c9c..ea9338f 100644 --- a/wercker.yml +++ b/wercker.yml @@ -78,7 +78,7 @@ deploy: - wercker/add-to-known_hosts@1.4.0: hostname: github.com - fingerprint: 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48 + fingerprint: SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8 - script: name: set release id variable for version