From 817065bb064b8fb9df72ea3be99bfa2ae7813ecc Mon Sep 17 00:00:00 2001 From: David Sabeti and Derek Richard Date: Wed, 30 Apr 2014 16:53:12 -0700 Subject: [PATCH 01/37] Fix .ruby-version files --- example_app/.ruby-version | 2 +- service_broker/.ruby-version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example_app/.ruby-version b/example_app/.ruby-version index 33de1dc..7fa1d1e 100644 --- a/example_app/.ruby-version +++ b/example_app/.ruby-version @@ -1 +1 @@ -ruby-2.0.0-p353 \ No newline at end of file +2.0.0-p353 diff --git a/service_broker/.ruby-version b/service_broker/.ruby-version index c506e4e..7fa1d1e 100644 --- a/service_broker/.ruby-version +++ b/service_broker/.ruby-version @@ -1 +1 @@ -ruby-2.0.0-p353 +2.0.0-p353 From a345c5211315d67843e330366ed02e61b57dcbed Mon Sep 17 00:00:00 2001 From: David Sabeti and Derek Richard Date: Wed, 30 Apr 2014 16:54:13 -0700 Subject: [PATCH 02/37] Add codeclimate test coverage reporting --- .travis.yml | 13 +++++++------ service_broker/Gemfile | 1 + service_broker/Gemfile.lock | 10 ++++++++++ service_broker/test/test_helper.rb | 5 +++++ 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 68ed704..987b14d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,13 @@ branches: only: - - develop - - master - + - develop + - master language: ruby rvm: - - 2.0.0 - +- 2.0.0 before_script: - - chmod +x ci.sh +- chmod +x ci.sh script: ./ci.sh +env: + global: + secure: UwZfR1zlq+42af+6PACVJ+e9qcaHo2ibXiEbFQHQXkCj9cG0DLmdJ6LrhZ9WO0Za/HlB5Lv9988xWV/VGkH10K3n1e59xzEggDYCLpaR3L+YsPHbvX6q9GHKowePo+eztmwI5Vx65zHMMM+9G2mwzzyQBt3yOIG/k90+dUbGtPs= diff --git a/service_broker/Gemfile b/service_broker/Gemfile index 4e7d283..3f6166f 100644 --- a/service_broker/Gemfile +++ b/service_broker/Gemfile @@ -8,6 +8,7 @@ gem 'sshkey' gem 'rake' group :test do + gem 'codeclimate-test-reporter', require: nil gem 'rack-test' gem 'mocha', require: false gem 'webmock' diff --git a/service_broker/Gemfile.lock b/service_broker/Gemfile.lock index 5a2338e..408d12c 100644 --- a/service_broker/Gemfile.lock +++ b/service_broker/Gemfile.lock @@ -2,9 +2,12 @@ GEM remote: https://rubygems.org/ specs: addressable (2.3.5) + codeclimate-test-reporter (0.3.0) + simplecov (>= 0.7.1, < 1.0.0) coderay (1.1.0) crack (0.4.1) safe_yaml (~> 0.9.0) + docile (1.1.3) faraday (0.8.8) multipart-post (~> 1.2.0) json (1.8.1) @@ -12,6 +15,7 @@ GEM method_source (0.8.2) mocha (0.14.0) metaclass (~> 0.0.1) + multi_json (1.9.3) multipart-post (1.2.0) octokit (2.6.3) sawyer (~> 0.5.1) @@ -29,6 +33,11 @@ GEM sawyer (0.5.1) addressable (~> 2.3.5) faraday (~> 0.8, < 0.10) + simplecov (0.8.2) + docile (~> 1.1.0) + multi_json + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) sinatra (1.4.4) rack (~> 1.4) rack-protection (~> 1.4) @@ -44,6 +53,7 @@ PLATFORMS ruby DEPENDENCIES + codeclimate-test-reporter json mocha octokit diff --git a/service_broker/test/test_helper.rb b/service_broker/test/test_helper.rb index 54901ac..136d04a 100644 --- a/service_broker/test/test_helper.rb +++ b/service_broker/test/test_helper.rb @@ -1,3 +1,6 @@ +require 'codeclimate-test-reporter' +CodeClimate::TestReporter.start + ENV['RACK_ENV'] = 'test' require 'minitest/autorun' require 'minitest/spec' @@ -6,6 +9,8 @@ require 'webmock/minitest' require 'pry' +WebMock.disable_net_connect!(allow: 'codeclimate.com') + SETTINGS_FILENAME = "test/config/settings.yml" require File.expand_path '../../service_broker_app.rb', __FILE__ From 01fcac61c4dd8d68f4ac2a816b3facb8a1177a4c Mon Sep 17 00:00:00 2001 From: Shannon Coen Date: Wed, 22 Oct 2014 12:04:09 -0700 Subject: [PATCH 03/37] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d033a34..c586350 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ github-service-broker-ruby ## Introduction -A Service Broker is required to integrate any service with a Cloud Foundry instance (for brevity, we'll refer to such an instance simply as "Cloud Foundry") as a [Managed Service](http://docs.cloudfoundry.com/docs/running/architecture/services/#managed). +A Service Broker is required to integrate any service with a Cloud Foundry instance (for brevity, we'll refer to such an instance simply as "Cloud Foundry") as a [Managed Service](http://docs.cloudfoundry.org/services/). -This repo contains a service broker written as standalone ruby application (based on [Sinatra](https://github.com/sinatra/sinatra)) that implements the [v2.0 Service Broker API (aka Services API, or Broker API)](http://docs.cloudfoundry.com/docs/running/architecture/services/api-v2.0.html). +This repo contains a service broker written as standalone ruby application (based on [Sinatra](https://github.com/sinatra/sinatra)) that implements the [v2.0 Service Broker API (aka Services API, or Broker API)](http://docs.cloudfoundry.org/services/api.html). Generally, a Service Broker can be a standalone application that communicates with one or more services, or can be implemented as a component of a service itself. I.e. if the service itself is a Ruby on Rails application, the code in this repository could be added into the application (either copied in, or added as a Rails engine). @@ -32,7 +32,7 @@ The service broker has been written to be as simple to read as possible. There a In this example, the service provided is the management of repositories inside a single GitHub account owned by the service administrator. -The Service Broker provides 5 basic functions (see general description in the [API documentation](http://docs.cloudfoundry.com/docs/running/architecture/services/api.html#api-overview)): +The Service Broker provides 5 basic functions (see [API documentation](http://docs.cloudfoundry.org/services/api.html)): Function | Resulting action | -------- | :--------------- | @@ -73,8 +73,8 @@ For example, to deploy this broker application to Cloud Foundry 5. edit the Basic Auth username and password in `settings.yml` 6. `cd` into the application root directory: `github-service-broker-ruby/service_broker/` 7. run `cf push github-broker` or `gcf push github-broker` to deploy the application to Cloud Foundry -8. register the service broker with CF (instructions [here](http://docs.cloudfoundry.com/docs/running/architecture/services/managing-service-brokers.html#add-broker)) -9. make the service plan public (instructions [here](http://docs.cloudfoundry.com/docs/running/architecture/services/managing-service-brokers.html#make-plans-public)) +8. register the service broker with CF (instructions [here](http://docs.cloudfoundry.org/services/managing-service-brokers.html#add-broker)) +9. make the service plan public (instructions [here](http://docs.cloudfoundry.org/services/access-control.html#enable-access)) ## The GitHub Service Consumer example application From 94a40f70cdd414430db97d9819091519d0320b63 Mon Sep 17 00:00:00 2001 From: orthographic-pedant Date: Wed, 30 Sep 2015 17:01:17 -0400 Subject: [PATCH 04/37] Fixed typographical error, changed adminstrator to administrator in README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c586350..07d5976 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ bind | Generates a GitHub deploy key which gives write access to the repository, unbind | Destroys the deploy key bound to the service instance. delete | Deletes the service instance (repository). -The GitHub credentials of the GitHub account adminstrator should be specified in `settings.yml` if you are deploying your own instance of this broker application. We suggest that you create a dedicated GitHub account solely for the purpose of testing this broker (since it will create and destroy repositories). +The GitHub credentials of the GitHub account administrator should be specified in `settings.yml` if you are deploying your own instance of this broker application. We suggest that you create a dedicated GitHub account solely for the purpose of testing this broker (since it will create and destroy repositories). ## The Service Broker From 7ecd339d1421a83c86055d97f288d50555ebc49d Mon Sep 17 00:00:00 2001 From: Aaron Schlesinger Date: Thu, 28 Jul 2016 11:52:37 -0700 Subject: [PATCH 05/37] feat(Dockerfile): add Dockerfile for service broker --- service_broker/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 service_broker/Dockerfile diff --git a/service_broker/Dockerfile b/service_broker/Dockerfile new file mode 100644 index 0000000..c892f20 --- /dev/null +++ b/service_broker/Dockerfile @@ -0,0 +1,6 @@ +FROM ruby:2.0.0 +RUN mkdir /sb +COPY . /sb +WORKDIR /sb +RUN bundle install +CMD rackup From 906279f1999546ffd22cae40275e21ee7f21d5f6 Mon Sep 17 00:00:00 2001 From: Aaron Schlesinger Date: Wed, 10 Aug 2016 12:08:42 -0700 Subject: [PATCH 06/37] use env vars for the GH config values --- service_broker/config/settings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service_broker/config/settings.yml b/service_broker/config/settings.yml index b67503d..791ff62 100644 --- a/service_broker/config/settings.yml +++ b/service_broker/config/settings.yml @@ -36,5 +36,5 @@ github: # An access token is used in place of username/password to access your GitHub account. # To generate an access token run the following command then copy the value of "token" from the response. # curl -u -d '{"scopes": ["repo", "delete_repo"], "note": "CF Service Broker"}' https://api.github.com/authorizations - username: # - access_token: # + username: <%= ENV['GITHUB_USER_NAME'] %> + access_token: <%= ENV['GITHUB_TOKEN'] %> From ca1b8a20fc7bdbed620bf267d86e055ffc8eec30 Mon Sep 17 00:00:00 2001 From: Tim Hausler Date: Mon, 15 Aug 2016 16:06:25 -0700 Subject: [PATCH 07/37] Revert "use env vars for the GH config values" This reverts commit 906279f1999546ffd22cae40275e21ee7f21d5f6. Signed-off-by: Simon Leung --- service_broker/config/settings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service_broker/config/settings.yml b/service_broker/config/settings.yml index 791ff62..b67503d 100644 --- a/service_broker/config/settings.yml +++ b/service_broker/config/settings.yml @@ -36,5 +36,5 @@ github: # An access token is used in place of username/password to access your GitHub account. # To generate an access token run the following command then copy the value of "token" from the response. # curl -u -d '{"scopes": ["repo", "delete_repo"], "note": "CF Service Broker"}' https://api.github.com/authorizations - username: <%= ENV['GITHUB_USER_NAME'] %> - access_token: <%= ENV['GITHUB_TOKEN'] %> + username: # + access_token: # From ee3df3aaa92b55ed1252df6d9c1657d46144180d Mon Sep 17 00:00:00 2001 From: Sebastien Diaz Date: Tue, 24 Jan 2017 12:49:23 +0100 Subject: [PATCH 08/37] correct json version --- ci.sh | 0 example_app/Gemfile | 4 ++-- service_broker/Gemfile | 4 ++-- service_broker/Gemfile.lock | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 ci.sh diff --git a/ci.sh b/ci.sh old mode 100644 new mode 100755 diff --git a/example_app/Gemfile b/example_app/Gemfile index a545e37..8736a27 100644 --- a/example_app/Gemfile +++ b/example_app/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby "2.0.0" +ruby "2.3.1" gem 'sinatra' gem 'rack-flash3' @@ -14,4 +14,4 @@ group :test do gem 'capybara_minitest_spec' gem 'octokit' gem 'pry' -end \ No newline at end of file +end diff --git a/service_broker/Gemfile b/service_broker/Gemfile index 3f6166f..264af64 100644 --- a/service_broker/Gemfile +++ b/service_broker/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby "2.0.0" +ruby "2.3.1" gem 'sinatra' gem 'json' @@ -13,4 +13,4 @@ group :test do gem 'mocha', require: false gem 'webmock' gem 'pry' -end \ No newline at end of file +end diff --git a/service_broker/Gemfile.lock b/service_broker/Gemfile.lock index 408d12c..17e78c4 100644 --- a/service_broker/Gemfile.lock +++ b/service_broker/Gemfile.lock @@ -10,7 +10,7 @@ GEM docile (1.1.3) faraday (0.8.8) multipart-post (~> 1.2.0) - json (1.8.1) + json (1.8.6) metaclass (0.0.1) method_source (0.8.2) mocha (0.14.0) From 55334b02a77cd49e35a17889d603bb3b75197d76 Mon Sep 17 00:00:00 2001 From: Sebastien DIAZ Date: Sat, 18 Feb 2017 07:53:51 +0100 Subject: [PATCH 09/37] make 2.0.0 ruby --- service_broker/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service_broker/Gemfile b/service_broker/Gemfile index 264af64..2c9aa4f 100644 --- a/service_broker/Gemfile +++ b/service_broker/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby "2.3.1" +ruby "2.0.0" gem 'sinatra' gem 'json' From 6eee93dd61b74f43d54f6890b13597926d32453b Mon Sep 17 00:00:00 2001 From: Sebastien DIAZ Date: Sat, 18 Feb 2017 07:56:16 +0100 Subject: [PATCH 10/37] make ruby 2.0.0 --- example_app/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example_app/Gemfile b/example_app/Gemfile index 8736a27..4b0d3f2 100644 --- a/example_app/Gemfile +++ b/example_app/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby "2.3.1" +ruby "2.0.0" gem 'sinatra' gem 'rack-flash3' From b5b5fbab7c60718fbe043a4966251b2ac008c73f Mon Sep 17 00:00:00 2001 From: Steffen Uhlig Date: Tue, 26 Sep 2017 14:20:11 +0200 Subject: [PATCH 11/37] Update to use Ruby 2.4.2 Requires a recent buildpack. --- service_broker/.ruby-version | 2 +- service_broker/Gemfile | 2 +- service_broker/Gemfile.lock | 92 +++++++++++++++++++----------------- 3 files changed, 51 insertions(+), 45 deletions(-) diff --git a/service_broker/.ruby-version b/service_broker/.ruby-version index 7fa1d1e..8e8299d 100644 --- a/service_broker/.ruby-version +++ b/service_broker/.ruby-version @@ -1 +1 @@ -2.0.0-p353 +2.4.2 diff --git a/service_broker/Gemfile b/service_broker/Gemfile index 2c9aa4f..6ee58b5 100644 --- a/service_broker/Gemfile +++ b/service_broker/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby "2.0.0" +ruby '2.4.2' gem 'sinatra' gem 'json' diff --git a/service_broker/Gemfile.lock b/service_broker/Gemfile.lock index 17e78c4..e820d77 100644 --- a/service_broker/Gemfile.lock +++ b/service_broker/Gemfile.lock @@ -1,53 +1,56 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.3.5) - codeclimate-test-reporter (0.3.0) - simplecov (>= 0.7.1, < 1.0.0) - coderay (1.1.0) - crack (0.4.1) - safe_yaml (~> 0.9.0) - docile (1.1.3) - faraday (0.8.8) - multipart-post (~> 1.2.0) - json (1.8.6) - metaclass (0.0.1) - method_source (0.8.2) - mocha (0.14.0) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + codeclimate-test-reporter (1.0.8) + simplecov (<= 0.13) + coderay (1.1.2) + crack (0.4.3) + safe_yaml (~> 1.0.0) + docile (1.1.5) + faraday (0.13.1) + multipart-post (>= 1.2, < 3) + hashdiff (0.3.6) + json (2.1.0) + metaclass (0.0.4) + method_source (0.9.0) + mocha (1.3.0) metaclass (~> 0.0.1) - multi_json (1.9.3) - multipart-post (1.2.0) - octokit (2.6.3) - sawyer (~> 0.5.1) - pry (0.9.12.4) - coderay (~> 1.0) - method_source (~> 0.8) - slop (~> 3.4) - rack (1.5.2) - rack-protection (1.5.1) + multipart-post (2.0.0) + mustermann (1.0.1) + octokit (4.7.0) + sawyer (~> 0.8.0, >= 0.5.3) + pry (0.11.1) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + public_suffix (3.0.0) + rack (2.0.3) + rack-protection (2.0.0) rack - rack-test (0.6.2) - rack (>= 1.0) - rake (10.1.1) - safe_yaml (0.9.7) - sawyer (0.5.1) - addressable (~> 2.3.5) - faraday (~> 0.8, < 0.10) - simplecov (0.8.2) + rack-test (0.7.0) + rack (>= 1.0, < 3) + rake (12.1.0) + safe_yaml (1.0.4) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) + simplecov (0.13.0) docile (~> 1.1.0) - multi_json - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - sinatra (1.4.4) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) - slop (3.4.7) - sshkey (1.6.1) - tilt (1.4.1) - webmock (1.16.0) - addressable (>= 2.2.7) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sinatra (2.0.0) + mustermann (~> 1.0) + rack (~> 2.0) + rack-protection (= 2.0.0) + tilt (~> 2.0) + sshkey (1.9.0) + tilt (2.0.8) + webmock (3.0.1) + addressable (>= 2.3.6) crack (>= 0.3.2) + hashdiff PLATFORMS ruby @@ -63,3 +66,6 @@ DEPENDENCIES sinatra sshkey webmock + +BUNDLED WITH + 1.15.3 From 167da0ccc5b51c2852dae46e3270b52dd76f5610 Mon Sep 17 00:00:00 2001 From: Steffen Uhlig Date: Tue, 26 Sep 2017 16:03:53 +0200 Subject: [PATCH 12/37] Update example app to Ruby 2.4.2 --- example_app/.ruby-version | 2 +- example_app/Gemfile | 2 +- example_app/Gemfile.lock | 110 ++++++++++++++++++++------------------ 3 files changed, 61 insertions(+), 53 deletions(-) diff --git a/example_app/.ruby-version b/example_app/.ruby-version index 7fa1d1e..8e8299d 100644 --- a/example_app/.ruby-version +++ b/example_app/.ruby-version @@ -1 +1 @@ -2.0.0-p353 +2.4.2 diff --git a/example_app/Gemfile b/example_app/Gemfile index 4b0d3f2..a428b93 100644 --- a/example_app/Gemfile +++ b/example_app/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby "2.0.0" +ruby '2.4.2' gem 'sinatra' gem 'rack-flash3' diff --git a/example_app/Gemfile.lock b/example_app/Gemfile.lock index e9949ae..945c46f 100644 --- a/example_app/Gemfile.lock +++ b/example_app/Gemfile.lock @@ -1,66 +1,68 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.3.5) - capybara (2.2.1) - mime-types (>= 1.16) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + capybara (2.15.1) + addressable + mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara_minitest_spec (1.0.1) + capybara_minitest_spec (1.0.6) capybara (>= 2) - minitest (>= 2) - cf-app-utils (0.2) - coderay (1.1.0) - faraday (0.8.8) - multipart-post (~> 1.2.0) - ffi (1.9.3) - listen (1.0.3) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - rb-kqueue (>= 0.2) - metaclass (0.0.1) - method_source (0.8.2) - mime-types (2.0) - mini_portile (0.5.2) - minitest (5.2.1) - mocha (0.14.0) + minitest (>= 4) + cf-app-utils (0.6) + coderay (1.1.2) + faraday (0.13.1) + multipart-post (>= 1.2, < 3) + ffi (1.9.18) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + metaclass (0.0.4) + method_source (0.9.0) + mini_mime (0.1.4) + mini_portile2 (2.3.0) + minitest (5.10.3) + mocha (1.3.0) metaclass (~> 0.0.1) - multipart-post (1.2.0) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) - octokit (2.7.0) - sawyer (~> 0.5.2) - pry (0.9.12.4) - coderay (~> 1.0) - method_source (~> 0.8) - slop (~> 3.4) - rack (1.5.2) + multipart-post (2.0.0) + mustermann (1.0.1) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + octokit (4.7.0) + sawyer (~> 0.8.0, >= 0.5.3) + pry (0.11.1) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + public_suffix (3.0.0) + rack (2.0.3) rack-flash3 (1.0.5) rack - rack-protection (1.5.1) + rack-protection (2.0.0) rack - rack-test (0.6.2) - rack (>= 1.0) - rake (10.1.1) - rb-fsevent (0.9.4) - rb-inotify (0.9.3) - ffi (>= 0.5.0) - rb-kqueue (0.2.0) - ffi (>= 0.5.0) - rerun (0.8.2) - listen (~> 1.0.3) - sawyer (0.5.2) - addressable (~> 2.3.5) - faraday (~> 0.8, < 0.10) - sinatra (1.4.4) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) - slop (3.4.7) - tilt (1.4.1) - xpath (2.0.0) + rack-test (0.7.0) + rack (>= 1.0, < 3) + rake (12.1.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rerun (0.11.0) + listen (~> 3.0) + ruby_dep (1.5.0) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) + sinatra (2.0.0) + mustermann (~> 1.0) + rack (~> 2.0) + rack-protection (= 2.0.0) + tilt (~> 2.0) + tilt (2.0.8) + xpath (2.1.0) nokogiri (~> 1.3) PLATFORMS @@ -78,3 +80,9 @@ DEPENDENCIES rake rerun sinatra + +RUBY VERSION + ruby 2.4.2p198 + +BUNDLED WITH + 1.15.4 From adadd1a3796f15ff50af27b20627fa37bacdea34 Mon Sep 17 00:00:00 2001 From: Steffen Uhlig Date: Tue, 26 Sep 2017 16:04:47 +0200 Subject: [PATCH 13/37] Update broker to Ruby 2.4.2 --- .travis.yml | 2 +- service_broker/Dockerfile | 2 +- service_broker/Gemfile.lock | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 987b14d..c942660 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ branches: - master language: ruby rvm: -- 2.0.0 +- 2.4.2 before_script: - chmod +x ci.sh script: ./ci.sh diff --git a/service_broker/Dockerfile b/service_broker/Dockerfile index c892f20..6abc98f 100644 --- a/service_broker/Dockerfile +++ b/service_broker/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.0.0 +FROM ruby:2.4.2 RUN mkdir /sb COPY . /sb WORKDIR /sb diff --git a/service_broker/Gemfile.lock b/service_broker/Gemfile.lock index e820d77..851d95f 100644 --- a/service_broker/Gemfile.lock +++ b/service_broker/Gemfile.lock @@ -67,5 +67,8 @@ DEPENDENCIES sshkey webmock +RUBY VERSION + ruby 2.4.2p198 + BUNDLED WITH - 1.15.3 + 1.15.4 From 96d2a5c77fce3d72b88ba9599df07156fb741f14 Mon Sep 17 00:00:00 2001 From: Steffen Uhlig Date: Tue, 26 Sep 2017 16:40:58 +0200 Subject: [PATCH 14/37] Fix cf invocation in README --- README.md | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 07d5976..6ed6e7a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ github-service-broker-ruby ========================== -##Build Status +## Build Status [![Build Status](https://travis-ci.org/cloudfoundry-samples/github-service-broker-ruby.png?branch=develop)](https://travis-ci.org/cloudfoundry-samples/github-service-broker-ruby) (develop branch) @@ -16,7 +16,7 @@ This repo contains a service broker written as standalone ruby application (base Generally, a Service Broker can be a standalone application that communicates with one or more services, or can be implemented as a component of a service itself. I.e. if the service itself is a Ruby on Rails application, the code in this repository could be added into the application (either copied in, or added as a Rails engine). -This Service Broker is intended to provide a simple yet functional, readable example of how Cloud Foundry service brokers operate. Even if you are developing a broker in another language, this should clearly demonstrate the API endpoints you will need to implement. This broker is not meant as an example of best practices for Ruby software design nor does it demonstrate BOSH packaging; for an example of these concepts see [cf-mysql-release](https://github.com/cloudfoundry/cf-mysql-release). +This Service Broker is intended to provide a simple yet functional, readable example of how Cloud Foundry service brokers operate. Even if you are developing a broker in another language, this should clearly demonstrate the API endpoints you will need to implement. This broker is not meant as an example of best practices for Ruby software design nor does it demonstrate BOSH packaging; for an example of these concepts see [cf-mysql-release](https://github.com/cloudfoundry/cf-mysql-release). ## Repo Contents @@ -26,7 +26,7 @@ The service broker has been written to be as simple to read as possible. There a * service_broker_app.rb - This is the service broker. * github_service_helper.rb - This is how the broker interfaces with GitHub. -* config/settings.yml - The config file contains the service catalog advertised by the broker, credentials used by Cloud Foundry to authenticate with the broker, and credentials used by the broker to authenticate with GitHub. +* config/settings.yml - The config file contains the service catalog advertised by the broker, credentials used by Cloud Foundry to authenticate with the broker, and credentials used by the broker to authenticate with GitHub. ## The GitHub repo service @@ -66,16 +66,24 @@ This service broker application can be deployed on any environment or hosting se For example, to deploy this broker application to Cloud Foundry -1. install the `cf` or `gcf` command line tool -2. log in as a cloud controller admin using `cf login` or `gcf login` +1. install the `cf` command line tool +2. log in as a cloud controller admin using `cf login` 3. fork or clone this git repository 4. add the credentials (username and access token) for the GitHub account in which you want this service broker to provide repository services in `settings.yml`. 5. edit the Basic Auth username and password in `settings.yml` 6. `cd` into the application root directory: `github-service-broker-ruby/service_broker/` -7. run `cf push github-broker` or `gcf push github-broker` to deploy the application to Cloud Foundry +7. run `cf push github-broker` to deploy the application to Cloud Foundry 8. register the service broker with CF (instructions [here](http://docs.cloudfoundry.org/services/managing-service-brokers.html#add-broker)) + + ```bash + $ cf create-service-broker github-repo admin password http://github-broker. + ``` + 9. make the service plan public (instructions [here](http://docs.cloudfoundry.org/services/access-control.html#enable-access)) + ```bash + $ cf enable-service-access github-repo + ``` ## The GitHub Service Consumer example application @@ -89,24 +97,13 @@ With `cf`: ``` $ cd github-service-broker-ruby/example_app/ $ cf push github-consumer -$ cf create-service github-repo github-repo-1 --plan public +$ cf create-service github-repo public github-repo-1 $ cf bind-service github-repo-1 github-consumer $ cf services # can be used to verify the binding was created $ cf restart github-consumer ``` -With `gcf`: - -``` -$ cd github-service-broker-ruby/example_app/ -$ gcf push github-consumer -$ gcf create-service github-repo public github-repo-1 -$ gcf bind-service github-consumer github-repo-1 -$ gcf services # can be used to verify the binding was created -$ gcf restart github-consumer -``` - -Point your web browser at `http://github-consumer.` and you should see the example app's interface. If the app has not been bound to a service instance of the github-repo service, you will see a meaningful error. Once the app has been bound and restarted you can click a submit button to make empty commits to the repo represented by the bound service instance. +Point your web browser at `http://github-consumer.` and you should see the example app's interface. If the app has not been bound to a service instance of the github-repo service, you will see a meaningful error. Once the app has been bound and restarted you can click a submit button to make empty commits to the repo represented by the bound service instance. ### Testing the example app @@ -115,4 +112,3 @@ The integration tests verify that the application can make commits and push them To run the tests, you'll need to create a test account on GitHub, and store the credentials in environment variables (see `example_app/test/integration/github_integration_test.rb` for details) The integration tests can be run by `bundle exec rake integration_test`. - From f8d28308c8f48b8197e49298a6bf92d97ced7063 Mon Sep 17 00:00:00 2001 From: Steffen Uhlig Date: Thu, 28 Sep 2017 10:39:35 +0200 Subject: [PATCH 15/37] Fix warning about missing parentheses --- example_app/test/service_consumer_app_test.rb | 12 ++++---- .../test/github_service_helper_test.rb | 28 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/example_app/test/service_consumer_app_test.rb b/example_app/test/service_consumer_app_test.rb index 60ffca7..635ce84 100644 --- a/example_app/test/service_consumer_app_test.rb +++ b/example_app/test/service_consumer_app_test.rb @@ -25,7 +25,7 @@ def make_request make_request last_response.status.must_equal 200 - last_response.body.must_match /After binding or unbinding any service instances, restart/ + last_response.body.must_match(/After binding or unbinding any service instances, restart/) end describe "when no service instances are bound to the app" do @@ -33,7 +33,7 @@ def make_request make_request last_response.status.must_equal 200 - last_response.body.must_match /You haven't bound any instances of the #{service_name} service/ + last_response.body.must_match(/You haven't bound any instances of the #{service_name} service/) end end @@ -115,7 +115,7 @@ def make_request it "displays instructions for binding" do make_request - last_response.body.must_match /You haven't bound any instances of the #{service_name} service/ + last_response.body.must_match(/You haven't bound any instances of the #{service_name} service/) end it "shows the value of VCAP_APPLICATION" do @@ -189,7 +189,7 @@ def make_request end it "displays a message saying that no instances are bound" do - last_response.body.must_match /You haven't bound any instances of the #{service_name} service/ + last_response.body.must_match(/You haven't bound any instances of the #{service_name} service/) end end @@ -203,7 +203,7 @@ def make_request it "shows the value of VCAP_SERVICES" do make_request - last_response.body.must_match /VCAP_SERVICES = \n\{}/ + last_response.body.must_match(/VCAP_SERVICES = \n\{}/) end end end @@ -325,4 +325,4 @@ def flash end end end -end \ No newline at end of file +end diff --git a/service_broker/test/github_service_helper_test.rb b/service_broker/test/github_service_helper_test.rb index bb396da..82f0f3d 100644 --- a/service_broker/test/github_service_helper_test.rb +++ b/service_broker/test/github_service_helper_test.rb @@ -85,8 +85,8 @@ def stub_successful_deploy_key_list_request(repo_name, empty = false) GithubServiceHelper.new('octocat', 'access-token').create_github_repo("Hello-World") }.must_raise GithubServiceHelper::GithubError - expected_exception.message.must_match /GitHub returned an error/ - expected_exception.message.must_match /Semantically Invalid/ + expected_exception.message.must_match(/GitHub returned an error/) + expected_exception.message.must_match(/Semantically Invalid/) end end @@ -110,8 +110,8 @@ def stub_successful_deploy_key_list_request(repo_name, empty = false) GithubServiceHelper.new('octocat', 'access-token').create_github_repo("Hello-World") }.must_raise GithubServiceHelper::GithubError - expected_exception.message.must_match /GitHub returned an error/ - expected_exception.message.must_match /Validation Failed/ + expected_exception.message.must_match(/GitHub returned an error/) + expected_exception.message.must_match(/Validation Failed/) end end @@ -184,8 +184,8 @@ def stub_key_pair_generation GithubServiceHelper.new('octocat', 'access-token').create_github_deploy_key(repo_name: @repo_name, deploy_key_title: @key_title) }.must_raise GithubServiceHelper::GithubError - expected_exception.message.must_match /GitHub returned an error/ - expected_exception.message.must_match /some error message/ + expected_exception.message.must_match(/GitHub returned an error/) + expected_exception.message.must_match(/some error message/) end end @@ -285,8 +285,8 @@ def stub_key_pair_generation GithubServiceHelper.new('octocat', 'access-token').create_github_deploy_key(repo_name: @repo_name, deploy_key_title: @key_title) }.must_raise GithubServiceHelper::GithubError - expected_exception.message.must_match /GitHub returned an error/ - expected_exception.message.must_match /key is invalid. Ensure you've copied the file correctly/ + expected_exception.message.must_match(/GitHub returned an error/) + expected_exception.message.must_match(/key is invalid. Ensure you've copied the file correctly/) end end @@ -403,8 +403,8 @@ def stub_key_pair_generation remove_github_deploy_key(repo_name: @repo_name, deploy_key_title: @key_title) }.must_raise GithubServiceHelper::GithubError - expected_exception.message.must_match /GitHub returned an error/ - expected_exception.message.must_match /some error message/ + expected_exception.message.must_match(/GitHub returned an error/) + expected_exception.message.must_match(/some error message/) end end end @@ -515,8 +515,8 @@ def stub_key_pair_generation remove_github_deploy_key(repo_name: @repo_name, deploy_key_title: @key_title) }.must_raise GithubServiceHelper::GithubError - expected_exception.message.must_match /GitHub returned an error/ - expected_exception.message.must_match /some error message/ + expected_exception.message.must_match(/GitHub returned an error/) + expected_exception.message.must_match(/some error message/) end end @@ -596,8 +596,8 @@ def stub_key_pair_generation GithubServiceHelper.new('octocat', 'access-token').delete_github_repo(@repo_name) }.must_raise GithubServiceHelper::GithubError - expected_exception.message.must_match /GitHub returned an error/ - expected_exception.message.must_match /some error message/ + expected_exception.message.must_match(/GitHub returned an error/) + expected_exception.message.must_match(/some error message/) end end From 59c8bab745aac5365377d9cb8ba0e1bb4a57a5fe Mon Sep 17 00:00:00 2001 From: Steffen Uhlig Date: Thu, 28 Sep 2017 10:59:54 +0200 Subject: [PATCH 16/37] Remove deprecated way of codeclimate integration --- service_broker/Gemfile | 1 - service_broker/Gemfile.lock | 9 --------- 2 files changed, 10 deletions(-) diff --git a/service_broker/Gemfile b/service_broker/Gemfile index 6ee58b5..e48535f 100644 --- a/service_broker/Gemfile +++ b/service_broker/Gemfile @@ -8,7 +8,6 @@ gem 'sshkey' gem 'rake' group :test do - gem 'codeclimate-test-reporter', require: nil gem 'rack-test' gem 'mocha', require: false gem 'webmock' diff --git a/service_broker/Gemfile.lock b/service_broker/Gemfile.lock index 851d95f..649242f 100644 --- a/service_broker/Gemfile.lock +++ b/service_broker/Gemfile.lock @@ -3,12 +3,9 @@ GEM specs: addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - codeclimate-test-reporter (1.0.8) - simplecov (<= 0.13) coderay (1.1.2) crack (0.4.3) safe_yaml (~> 1.0.0) - docile (1.1.5) faraday (0.13.1) multipart-post (>= 1.2, < 3) hashdiff (0.3.6) @@ -35,11 +32,6 @@ GEM sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) - simplecov (0.13.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) sinatra (2.0.0) mustermann (~> 1.0) rack (~> 2.0) @@ -56,7 +48,6 @@ PLATFORMS ruby DEPENDENCIES - codeclimate-test-reporter json mocha octokit From acd6596b90b003b2358ea3ad54093acc40354911 Mon Sep 17 00:00:00 2001 From: Steffen Uhlig Date: Thu, 28 Sep 2017 11:01:07 +0200 Subject: [PATCH 17/37] Add minitest It is a separate gem in newer Rubies. --- service_broker/Gemfile | 1 + service_broker/Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+) diff --git a/service_broker/Gemfile b/service_broker/Gemfile index e48535f..1d96ff0 100644 --- a/service_broker/Gemfile +++ b/service_broker/Gemfile @@ -8,6 +8,7 @@ gem 'sshkey' gem 'rake' group :test do + gem 'minitest' gem 'rack-test' gem 'mocha', require: false gem 'webmock' diff --git a/service_broker/Gemfile.lock b/service_broker/Gemfile.lock index 649242f..fd32ad6 100644 --- a/service_broker/Gemfile.lock +++ b/service_broker/Gemfile.lock @@ -12,6 +12,7 @@ GEM json (2.1.0) metaclass (0.0.4) method_source (0.9.0) + minitest (5.10.3) mocha (1.3.0) metaclass (~> 0.0.1) multipart-post (2.0.0) @@ -49,6 +50,7 @@ PLATFORMS DEPENDENCIES json + minitest mocha octokit pry From deecc076172a264d76a292556bd7a0ee2c44c188 Mon Sep 17 00:00:00 2001 From: Steffen Uhlig Date: Thu, 28 Sep 2017 11:01:29 +0200 Subject: [PATCH 18/37] Make 'test' the default task --- example_app/Rakefile | 2 ++ service_broker/Rakefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/example_app/Rakefile b/example_app/Rakefile index 527be16..28810d2 100644 --- a/example_app/Rakefile +++ b/example_app/Rakefile @@ -7,3 +7,5 @@ end Rake::TestTask.new(:integration_test) do |t| t.pattern = "test/integration/*_test.rb" end + +task default: :test diff --git a/service_broker/Rakefile b/service_broker/Rakefile index 32a4f7f..686288a 100644 --- a/service_broker/Rakefile +++ b/service_broker/Rakefile @@ -3,3 +3,5 @@ require 'rake/testtask' Rake::TestTask.new do |t| t.pattern = "test/*_test.rb" end + +task default: :test From f25d22842fd10fe95a2ea6d3675f311c11309064 Mon Sep 17 00:00:00 2001 From: Steffen Uhlig Date: Thu, 28 Sep 2017 11:02:03 +0200 Subject: [PATCH 19/37] Catch Faraday::ConnectionFailed, too --- service_broker/github_service_helper.rb | 11 +++++------ service_broker/test/test_helper.rb | 8 ++------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/service_broker/github_service_helper.rb b/service_broker/github_service_helper.rb index 7de38c1..5d2abfc 100644 --- a/service_broker/github_service_helper.rb +++ b/service_broker/github_service_helper.rb @@ -28,7 +28,7 @@ def create_github_repo(name) # error due to unknown reason, pass the original error message upstream raise GithubServiceHelper::GithubError.new("GitHub returned an error - #{e.message}") end - rescue Faraday::Error::TimeoutError + rescue Faraday::Error::TimeoutError, Faraday::ConnectionFailed raise GithubServiceHelper::GithubUnreachableError end @@ -40,7 +40,7 @@ def delete_github_repo(name) octokit_client.delete_repository(full_repo_name(name)) rescue Octokit::Error => e raise GithubServiceHelper::GithubError.new("GitHub returned an error - #{e.message}") - rescue Faraday::Error::TimeoutError + rescue Faraday::Error::TimeoutError, Faraday::ConnectionFailed raise GithubServiceHelper::GithubUnreachableError end end @@ -88,7 +88,7 @@ def get_deploy_keys(full_repo_name) raise GithubServiceHelper::GithubResourceNotFoundError rescue Octokit::Error => e raise GithubServiceHelper::GithubError.new("GitHub returned an error - #{e.message}") - rescue Faraday::Error::TimeoutError + rescue Faraday::Error::TimeoutError, Faraday::ConnectionFailed raise GithubServiceHelper::GithubUnreachableError end end @@ -98,7 +98,7 @@ def add_deploy_key(deploy_key_title, full_repo_name, public_key) octokit_client.add_deploy_key(full_repo_name, deploy_key_title, public_key) rescue Octokit::Error => e raise GithubServiceHelper::GithubError.new("GitHub returned an error - #{e.message}") - rescue Faraday::Error::TimeoutError + rescue Faraday::Error::TimeoutError, Faraday::ConnectionFailed raise GithubServiceHelper::GithubUnreachableError end end @@ -108,7 +108,7 @@ def remove_deploy_key(full_repo_name, deploy_key_id) octokit_client.remove_deploy_key(full_repo_name, deploy_key_id) rescue Octokit::Error => e raise GithubServiceHelper::GithubError.new("GitHub returned an error - #{e.message}") - rescue Faraday::Error::TimeoutError + rescue Faraday::Error::TimeoutError, Faraday::ConnectionFailed raise GithubServiceHelper::GithubUnreachableError end end @@ -129,4 +129,3 @@ def octokit_client ::Octokit::Client.new(access_token: @access_token) end end - diff --git a/service_broker/test/test_helper.rb b/service_broker/test/test_helper.rb index 136d04a..ea37305 100644 --- a/service_broker/test/test_helper.rb +++ b/service_broker/test/test_helper.rb @@ -1,7 +1,5 @@ -require 'codeclimate-test-reporter' -CodeClimate::TestReporter.start - ENV['RACK_ENV'] = 'test' + require 'minitest/autorun' require 'minitest/spec' require 'rack/test' @@ -9,9 +7,7 @@ require 'webmock/minitest' require 'pry' -WebMock.disable_net_connect!(allow: 'codeclimate.com') - SETTINGS_FILENAME = "test/config/settings.yml" require File.expand_path '../../service_broker_app.rb', __FILE__ -require File.expand_path '../../github_service_helper.rb', __FILE__ \ No newline at end of file +require File.expand_path '../../github_service_helper.rb', __FILE__ From 206c9dfa66664daeb24c6d16512145c9945caa47 Mon Sep 17 00:00:00 2001 From: Steffen Uhlig Date: Thu, 28 Sep 2017 14:39:09 +0200 Subject: [PATCH 20/37] Fix injection of VCAP_SERVICES into integration tests --- example_app/service_consumer_app.rb | 5 +++-- .../test/integration/github_integration_test.rb | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/example_app/service_consumer_app.rb b/example_app/service_consumer_app.rb index 54f4912..3c0719f 100644 --- a/example_app/service_consumer_app.rb +++ b/example_app/service_consumer_app.rb @@ -77,6 +77,7 @@ def service_name end def credentials_of_all_repos - CF::App::Credentials.find_all_by_service_label(service_name) + @credentials ||= CF::App::Credentials.new({'VCAP_SERVICES' => vcap_services}) + @credentials.find_all_by_service_label(service_name) end -end \ No newline at end of file +end diff --git a/example_app/test/integration/github_integration_test.rb b/example_app/test/integration/github_integration_test.rb index 377ff18..a4fa77a 100644 --- a/example_app/test/integration/github_integration_test.rb +++ b/example_app/test/integration/github_integration_test.rb @@ -5,7 +5,7 @@ before do ensure_env_vars_exist - @vcap_services_value = < Date: Thu, 28 Sep 2017 14:39:37 +0200 Subject: [PATCH 21/37] Use mktmpdir instead of hard-coded /tmp --- example_app/github_repo_helper.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/example_app/github_repo_helper.rb b/example_app/github_repo_helper.rb index f5dca99..ba1beec 100644 --- a/example_app/github_repo_helper.rb +++ b/example_app/github_repo_helper.rb @@ -54,10 +54,11 @@ def shell_create_and_push_commit(repo_credentials, application_name) private_key = repo_credentials["private_key"] repo_name = repo_credentials["name"] repo_ssh_url = repo_credentials["ssh_url"] - keys_dir = "/tmp/github_keys" + temp_dir = Dir.mktmpdir + keys_dir = "#{temp_dir}/github_keys" key_file_name = "#{keys_dir}/#{repo_name}.key" - git_ssh_script = "/tmp/#{repo_name}_ssh_script.sh" - known_hosts_file = "/tmp/github_known_hosts" + git_ssh_script = "#{temp_dir}/#{repo_name}_ssh_script.sh" + known_hosts_file = "#{temp_dir}/github_known_hosts" # Create directory for storing key file, and set permissions `if [ ! -d #{keys_dir} ]; then mkdir #{keys_dir}; fi` @@ -87,14 +88,13 @@ def shell_create_and_push_commit(repo_credentials, application_name) end commands = [ - "cd /tmp; GIT_SSH=#{git_ssh_script} git clone #{repo_ssh_url} 2>&1", - "cd /tmp/#{repo_name} && git config user.name '#{application_name}' 2>&1", - "cd /tmp/#{repo_name} && git commit --allow-empty -m 'auto generated empty commit' 2>&1", - "cd /tmp/#{repo_name} && git log --pretty=format:\"%h%x09%ad%x09%s\" 2>&1", - "cd /tmp/#{repo_name}; GIT_SSH=#{git_ssh_script} git push origin master 2>&1" + "cd #{temp_dir}; GIT_SSH=#{git_ssh_script} git clone #{repo_ssh_url} 2>&1", + "cd #{temp_dir}/#{repo_name} && git config user.name '#{application_name}' 2>&1", + "cd #{temp_dir}/#{repo_name} && git commit --allow-empty -m 'auto generated empty commit' 2>&1", + "cd #{temp_dir}/#{repo_name} && git log --pretty=format:\"%h%x09%ad%x09%s\" 2>&1", + "cd #{temp_dir}/#{repo_name}; GIT_SSH=#{git_ssh_script} git push origin master 2>&1" ] - return_code = 0 output = "" @@ -109,7 +109,7 @@ def shell_create_and_push_commit(repo_credentials, application_name) cleanup_commands = [ "rm #{key_file_name}", "rm #{git_ssh_script}", - "rm -rf /tmp/#{repo_name}" + "rm -rf #{temp_dir}/#{repo_name}" ] cleanup_commands.each do |command| @@ -131,4 +131,4 @@ def credentials_are_present?(credentials) blank?(credentials["ssh_url"]) || blank?(credentials["private_key"])) end -end \ No newline at end of file +end From f030835fd5824ff7dd121676cf361d6129c15aba Mon Sep 17 00:00:00 2001 From: Steffen Uhlig Date: Thu, 28 Sep 2017 14:40:18 +0200 Subject: [PATCH 22/37] git-ignore .envrc and Rake's cache file --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c1bb12e..fac89ce 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ .idea /service_broker/manifest.yml /example_app/manifest.yml +.envrc +.rake_t_cache From 291e663daf054be965b52d1e6e8317ea20462689 Mon Sep 17 00:00:00 2001 From: Steffen Uhlig Date: Thu, 28 Sep 2017 14:45:35 +0200 Subject: [PATCH 23/37] Add email to git config This fixes the error 'unable to auto-detect email address' when trying to commit. --- example_app/github_repo_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/example_app/github_repo_helper.rb b/example_app/github_repo_helper.rb index ba1beec..ca7013c 100644 --- a/example_app/github_repo_helper.rb +++ b/example_app/github_repo_helper.rb @@ -90,6 +90,7 @@ def shell_create_and_push_commit(repo_credentials, application_name) commands = [ "cd #{temp_dir}; GIT_SSH=#{git_ssh_script} git clone #{repo_ssh_url} 2>&1", "cd #{temp_dir}/#{repo_name} && git config user.name '#{application_name}' 2>&1", + "cd #{temp_dir}/#{repo_name} && git config user.email '#{application_name}@example.com' 2>&1", "cd #{temp_dir}/#{repo_name} && git commit --allow-empty -m 'auto generated empty commit' 2>&1", "cd #{temp_dir}/#{repo_name} && git log --pretty=format:\"%h%x09%ad%x09%s\" 2>&1", "cd #{temp_dir}/#{repo_name}; GIT_SSH=#{git_ssh_script} git push origin master 2>&1" From c3f08888e8b94075aa8a8e35f7e8348f143b4e43 Mon Sep 17 00:00:00 2001 From: Andrew Wittrock Date: Mon, 10 May 2021 15:46:03 -0700 Subject: [PATCH 24/37] cf bind-service command arguments incorrect order - cf bind-service APP_NAME SERVICE_INSTANCE suggests that `github-consumer` should come before `github-repo-1`. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ed6e7a..00ca0d9 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ With `cf`: $ cd github-service-broker-ruby/example_app/ $ cf push github-consumer $ cf create-service github-repo public github-repo-1 -$ cf bind-service github-repo-1 github-consumer +$ cf bind-service github-consumer github-repo-1 $ cf services # can be used to verify the binding was created $ cf restart github-consumer ``` From 0f54cabea5358f243d74605518af548d84358bb0 Mon Sep 17 00:00:00 2001 From: Andrew Wittrock Date: Mon, 10 May 2021 15:59:09 -0700 Subject: [PATCH 25/37] Update to Ruby 2.6.7 - [Support of Ruby 2.4 has ended](https://www.ruby-lang.org/en/news/2020/04/05/support-of-ruby-2-4-has-ended/) --- .travis.yml | 2 +- example_app/.ruby-version | 2 +- example_app/Gemfile | 2 +- example_app/Gemfile.lock | 4 ++-- service_broker/.ruby-version | 2 +- service_broker/Dockerfile | 2 +- service_broker/Gemfile | 2 +- service_broker/Gemfile.lock | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index c942660..4666be7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ branches: - master language: ruby rvm: -- 2.4.2 +- 2.6.7 before_script: - chmod +x ci.sh script: ./ci.sh diff --git a/example_app/.ruby-version b/example_app/.ruby-version index 8e8299d..e261122 100644 --- a/example_app/.ruby-version +++ b/example_app/.ruby-version @@ -1 +1 @@ -2.4.2 +2.6.7 diff --git a/example_app/Gemfile b/example_app/Gemfile index a428b93..866a865 100644 --- a/example_app/Gemfile +++ b/example_app/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '2.4.2' +ruby '2.6.7' gem 'sinatra' gem 'rack-flash3' diff --git a/example_app/Gemfile.lock b/example_app/Gemfile.lock index 945c46f..8188d2c 100644 --- a/example_app/Gemfile.lock +++ b/example_app/Gemfile.lock @@ -82,7 +82,7 @@ DEPENDENCIES sinatra RUBY VERSION - ruby 2.4.2p198 + ruby 2.6.7p197 BUNDLED WITH - 1.15.4 + 1.17.2 diff --git a/service_broker/.ruby-version b/service_broker/.ruby-version index 8e8299d..e261122 100644 --- a/service_broker/.ruby-version +++ b/service_broker/.ruby-version @@ -1 +1 @@ -2.4.2 +2.6.7 diff --git a/service_broker/Dockerfile b/service_broker/Dockerfile index 6abc98f..f31951f 100644 --- a/service_broker/Dockerfile +++ b/service_broker/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.4.2 +FROM ruby:2.6.7 RUN mkdir /sb COPY . /sb WORKDIR /sb diff --git a/service_broker/Gemfile b/service_broker/Gemfile index 1d96ff0..ae2c70f 100644 --- a/service_broker/Gemfile +++ b/service_broker/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '2.4.2' +ruby '2.6.7' gem 'sinatra' gem 'json' diff --git a/service_broker/Gemfile.lock b/service_broker/Gemfile.lock index fd32ad6..b88cd77 100644 --- a/service_broker/Gemfile.lock +++ b/service_broker/Gemfile.lock @@ -61,7 +61,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 2.4.2p198 + ruby 2.6.7p197 BUNDLED WITH - 1.15.4 + 1.17.2 From b22ee07b74dfccb2a740221b50d4e6b44107172a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 May 2021 17:21:49 +0000 Subject: [PATCH 26/37] Bump json from 2.1.0 to 2.3.0 in /service_broker Bumps [json](https://github.com/flori/json) from 2.1.0 to 2.3.0. - [Release notes](https://github.com/flori/json/releases) - [Changelog](https://github.com/flori/json/blob/master/CHANGES.md) - [Commits](https://github.com/flori/json/compare/v2.1.0...v2.3.0) Signed-off-by: dependabot[bot] --- service_broker/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service_broker/Gemfile.lock b/service_broker/Gemfile.lock index b88cd77..74e3cbc 100644 --- a/service_broker/Gemfile.lock +++ b/service_broker/Gemfile.lock @@ -9,7 +9,7 @@ GEM faraday (0.13.1) multipart-post (>= 1.2, < 3) hashdiff (0.3.6) - json (2.1.0) + json (2.3.0) metaclass (0.0.4) method_source (0.9.0) minitest (5.10.3) From 82a9cd8ef00d380d30753b627a61ee1af58fb725 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 May 2021 17:21:56 +0000 Subject: [PATCH 27/37] Bump rake from 12.1.0 to 12.3.3 in /example_app Bumps [rake](https://github.com/ruby/rake) from 12.1.0 to 12.3.3. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rake/compare/v12.1.0...v12.3.3) Signed-off-by: dependabot[bot] --- example_app/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example_app/Gemfile.lock b/example_app/Gemfile.lock index 8188d2c..e625fc6 100644 --- a/example_app/Gemfile.lock +++ b/example_app/Gemfile.lock @@ -46,7 +46,7 @@ GEM rack rack-test (0.7.0) rack (>= 1.0, < 3) - rake (12.1.0) + rake (12.3.3) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) From c60e1bf9324f6e8c38bd7258c7993aa2747800de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 16:26:49 +0000 Subject: [PATCH 28/37] Bump rack from 2.0.3 to 2.2.3 in /service_broker Bumps [rack](https://github.com/rack/rack) from 2.0.3 to 2.2.3. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.0.3...2.2.3) Signed-off-by: dependabot[bot] --- service_broker/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service_broker/Gemfile.lock b/service_broker/Gemfile.lock index b88cd77..fc52c7d 100644 --- a/service_broker/Gemfile.lock +++ b/service_broker/Gemfile.lock @@ -23,7 +23,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.0.0) - rack (2.0.3) + rack (2.2.3) rack-protection (2.0.0) rack rack-test (0.7.0) From 3a3a16ad6fb710982d8cbcfe72058c9f0fee7f63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 16:27:06 +0000 Subject: [PATCH 29/37] Bump rake from 12.1.0 to 12.3.3 in /service_broker Bumps [rake](https://github.com/ruby/rake) from 12.1.0 to 12.3.3. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rake/compare/v12.1.0...v12.3.3) Signed-off-by: dependabot[bot] --- service_broker/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service_broker/Gemfile.lock b/service_broker/Gemfile.lock index fc52c7d..afc563b 100644 --- a/service_broker/Gemfile.lock +++ b/service_broker/Gemfile.lock @@ -28,7 +28,7 @@ GEM rack rack-test (0.7.0) rack (>= 1.0, < 3) - rake (12.1.0) + rake (12.3.3) safe_yaml (1.0.4) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) From 1945b8a367dd2face82f628ad57269116378a2d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 16:27:10 +0000 Subject: [PATCH 30/37] Bump rack from 2.0.3 to 2.2.3 in /example_app Bumps [rack](https://github.com/rack/rack) from 2.0.3 to 2.2.3. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.0.3...2.2.3) Signed-off-by: dependabot[bot] --- example_app/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example_app/Gemfile.lock b/example_app/Gemfile.lock index e625fc6..eca57d1 100644 --- a/example_app/Gemfile.lock +++ b/example_app/Gemfile.lock @@ -39,7 +39,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.0.0) - rack (2.0.3) + rack (2.2.3) rack-flash3 (1.0.5) rack rack-protection (2.0.0) From 4419db71261aaf40295274a92e4adc6f3c3b8ef9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 16:28:50 +0000 Subject: [PATCH 31/37] Bump nokogiri from 1.8.1 to 1.11.3 in /example_app Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.1 to 1.11.3. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.1...v1.11.3) Signed-off-by: dependabot[bot] --- example_app/Gemfile.lock | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/example_app/Gemfile.lock b/example_app/Gemfile.lock index eca57d1..8fb0c0b 100644 --- a/example_app/Gemfile.lock +++ b/example_app/Gemfile.lock @@ -25,20 +25,22 @@ GEM metaclass (0.0.4) method_source (0.9.0) mini_mime (0.1.4) - mini_portile2 (2.3.0) + mini_portile2 (2.5.1) minitest (5.10.3) mocha (1.3.0) metaclass (~> 0.0.1) multipart-post (2.0.0) mustermann (1.0.1) - nokogiri (1.8.1) - mini_portile2 (~> 2.3.0) + nokogiri (1.11.3) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) pry (0.11.1) coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.0.0) + racc (1.5.2) rack (2.2.3) rack-flash3 (1.0.5) rack From 7025c632e654622bc350476a17cb0be5fce2af30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 16:34:06 +0000 Subject: [PATCH 32/37] Bump sinatra from 2.0.0 to 2.0.2 in /service_broker Bumps [sinatra](https://github.com/sinatra/sinatra) from 2.0.0 to 2.0.2. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v2.0.0...v2.0.2) Signed-off-by: dependabot[bot] --- service_broker/Gemfile.lock | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/service_broker/Gemfile.lock b/service_broker/Gemfile.lock index afc563b..1441585 100644 --- a/service_broker/Gemfile.lock +++ b/service_broker/Gemfile.lock @@ -16,7 +16,8 @@ GEM mocha (1.3.0) metaclass (~> 0.0.1) multipart-post (2.0.0) - mustermann (1.0.1) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) pry (0.11.1) @@ -24,22 +25,23 @@ GEM method_source (~> 0.9.0) public_suffix (3.0.0) rack (2.2.3) - rack-protection (2.0.0) + rack-protection (2.0.2) rack rack-test (0.7.0) rack (>= 1.0, < 3) rake (12.3.3) + ruby2_keywords (0.0.4) safe_yaml (1.0.4) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) - sinatra (2.0.0) + sinatra (2.0.2) mustermann (~> 1.0) rack (~> 2.0) - rack-protection (= 2.0.0) + rack-protection (= 2.0.2) tilt (~> 2.0) sshkey (1.9.0) - tilt (2.0.8) + tilt (2.0.10) webmock (3.0.1) addressable (>= 2.3.6) crack (>= 0.3.2) From 5709724277f66fd0fb6349f3068458134e5f9f3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 21:38:30 +0000 Subject: [PATCH 33/37] Bump ffi from 1.9.18 to 1.15.0 in /example_app Bumps [ffi](https://github.com/ffi/ffi) from 1.9.18 to 1.15.0. - [Release notes](https://github.com/ffi/ffi/releases) - [Changelog](https://github.com/ffi/ffi/blob/master/CHANGELOG.md) - [Commits](https://github.com/ffi/ffi/compare/1.9.18...v1.15.0) Signed-off-by: dependabot[bot] --- example_app/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example_app/Gemfile.lock b/example_app/Gemfile.lock index 8fb0c0b..0cb3e58 100644 --- a/example_app/Gemfile.lock +++ b/example_app/Gemfile.lock @@ -17,7 +17,7 @@ GEM coderay (1.1.2) faraday (0.13.1) multipart-post (>= 1.2, < 3) - ffi (1.9.18) + ffi (1.15.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) From a07faf38984e93fd385da92d77f28220b209f6bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 21:38:59 +0000 Subject: [PATCH 34/37] Bump sinatra from 2.0.0 to 2.0.2 in /example_app Bumps [sinatra](https://github.com/sinatra/sinatra) from 2.0.0 to 2.0.2. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v2.0.0...v2.0.2) Signed-off-by: dependabot[bot] --- example_app/Gemfile.lock | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/example_app/Gemfile.lock b/example_app/Gemfile.lock index 8fb0c0b..cb6f01a 100644 --- a/example_app/Gemfile.lock +++ b/example_app/Gemfile.lock @@ -30,7 +30,8 @@ GEM mocha (1.3.0) metaclass (~> 0.0.1) multipart-post (2.0.0) - mustermann (1.0.1) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) nokogiri (1.11.3) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -44,7 +45,7 @@ GEM rack (2.2.3) rack-flash3 (1.0.5) rack - rack-protection (2.0.0) + rack-protection (2.0.2) rack rack-test (0.7.0) rack (>= 1.0, < 3) @@ -54,16 +55,17 @@ GEM ffi (>= 0.5.0, < 2) rerun (0.11.0) listen (~> 3.0) + ruby2_keywords (0.0.4) ruby_dep (1.5.0) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) - sinatra (2.0.0) + sinatra (2.0.2) mustermann (~> 1.0) rack (~> 2.0) - rack-protection (= 2.0.0) + rack-protection (= 2.0.2) tilt (~> 2.0) - tilt (2.0.8) + tilt (2.0.10) xpath (2.1.0) nokogiri (~> 1.3) From 35c3e9d630d28431d5a429d25c7377f645b955be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 May 2021 02:50:30 +0000 Subject: [PATCH 35/37] Bump nokogiri from 1.11.3 to 1.11.4 in /example_app Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.3 to 1.11.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.3...v1.11.4) Signed-off-by: dependabot[bot] --- example_app/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example_app/Gemfile.lock b/example_app/Gemfile.lock index b0b5425..7f9a337 100644 --- a/example_app/Gemfile.lock +++ b/example_app/Gemfile.lock @@ -32,7 +32,7 @@ GEM multipart-post (2.0.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) - nokogiri (1.11.3) + nokogiri (1.11.4) mini_portile2 (~> 2.5.0) racc (~> 1.4) octokit (4.7.0) From ca570231110c0306e2eb066d37d58a90091d5c77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:53:22 +0000 Subject: [PATCH 36/37] Bump addressable from 2.5.2 to 2.8.0 in /example_app Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.5.2 to 2.8.0. - [Release notes](https://github.com/sporkmonger/addressable/releases) - [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md) - [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.5.2...addressable-2.8.0) --- updated-dependencies: - dependency-name: addressable dependency-type: indirect ... Signed-off-by: dependabot[bot] --- example_app/Gemfile.lock | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/example_app/Gemfile.lock b/example_app/Gemfile.lock index 7f9a337..0ffbabf 100644 --- a/example_app/Gemfile.lock +++ b/example_app/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) capybara (2.15.1) addressable mini_mime (>= 0.1.3) @@ -15,8 +15,23 @@ GEM minitest (>= 4) cf-app-utils (0.6) coderay (1.1.2) - faraday (0.13.1) + faraday (1.5.1) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) ffi (1.15.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -29,7 +44,7 @@ GEM minitest (5.10.3) mocha (1.3.0) metaclass (~> 0.0.1) - multipart-post (2.0.0) + multipart-post (2.1.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) nokogiri (1.11.4) @@ -40,7 +55,7 @@ GEM pry (0.11.1) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (3.0.0) + public_suffix (4.0.6) racc (1.5.2) rack (2.2.3) rack-flash3 (1.0.5) @@ -57,9 +72,9 @@ GEM listen (~> 3.0) ruby2_keywords (0.0.4) ruby_dep (1.5.0) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) sinatra (2.0.2) mustermann (~> 1.0) rack (~> 2.0) From 67fa3dd950dc0878afa166e776973e03739d63c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Jul 2021 18:04:17 +0000 Subject: [PATCH 37/37] Bump addressable from 2.5.2 to 2.8.0 in /service_broker Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.5.2 to 2.8.0. - [Release notes](https://github.com/sporkmonger/addressable/releases) - [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md) - [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.5.2...addressable-2.8.0) --- updated-dependencies: - dependency-name: addressable dependency-type: indirect ... Signed-off-by: dependabot[bot] --- service_broker/Gemfile.lock | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/service_broker/Gemfile.lock b/service_broker/Gemfile.lock index 4eeb808..9edadfa 100644 --- a/service_broker/Gemfile.lock +++ b/service_broker/Gemfile.lock @@ -1,13 +1,28 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) coderay (1.1.2) crack (0.4.3) safe_yaml (~> 1.0.0) - faraday (0.13.1) + faraday (1.5.1) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) hashdiff (0.3.6) json (2.3.0) metaclass (0.0.4) @@ -15,7 +30,7 @@ GEM minitest (5.10.3) mocha (1.3.0) metaclass (~> 0.0.1) - multipart-post (2.0.0) + multipart-post (2.1.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) octokit (4.7.0) @@ -23,7 +38,7 @@ GEM pry (0.11.1) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (3.0.0) + public_suffix (4.0.6) rack (2.2.3) rack-protection (2.0.2) rack @@ -32,9 +47,9 @@ GEM rake (12.3.3) ruby2_keywords (0.0.4) safe_yaml (1.0.4) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) sinatra (2.0.2) mustermann (~> 1.0) rack (~> 2.0)