Merge pull request #266 from cyberark/bump-ruby-version

Bump ruby version

.rubocop.yml

@@ -5,4 +5,4 @@ AllCops:
     - 'vendor/**/*'
     - 'spec/fixtures/**/*'
     - 'tmp/**/*'
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7

CHANGELOG.md

@@ -5,14 +5,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-
-## [1.2.4] - 2022-02-14
 ### Security
 - Upgraded rails components to 5.2.6.2 and puma to 5.6.2 to resolve CVE-2022-23633 and 
   CVE-2022-23634 [cyberark/conjur-service-broker#270](https://github.com/cyberark/conjur-service-broker/pull/270)
 - Updated puma to 5.5.1
   [cyberark/conjur-service-broker#267](https://github.com/cyberark/conjur-service-broker/pull/267)
 
+### Fixed
+- Unpin the Ruby Buildpack in the service broker's `manifest.yml` and update the pinned
+  Ruby version in the service broker's `Gemfile` to `~> 2.7`. This captures the idea that
+  the service broker works for all 2.x Ruby versions from 2.7 and up, anything less has reached end of life.
+  [cyberark/conjur-service-broker#266](https://github.com/cyberark/conjur-service-broker/pull/266)
+
 ## [1.2.3] - 2021-12-31
 ### Changed
 - Updated to go 1.17 and conjur-api-go 0.8.1

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5.8
+FROM ruby:2.7
 MAINTAINER CyberArk Software Ltd.
 
 RUN apt-get update && \
@@ -24,4 +24,3 @@ RUN bundle config build.nokogiri --use-system-libraries && \
 RUN bundle install --no-deployment --frozen --system --without development test
 
 COPY . /app/
-

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM ruby:2.5.8
+FROM ruby:2.7
 MAINTAINER CyberArk Software Ltd.
 
 # This is a Dockerfile for the Service Broker image that is used in

Dockerfile.test

@@ -1,4 +1,4 @@
-FROM ruby:2.5.8
+FROM ruby:2.7
 MAINTAINER CyberArk Software Ltd.
 
 # This is a Dockerfile for a Service Broker test client image. The repository

Gemfile

@@ -9,14 +9,14 @@ end
 # nicely with RVM and we should be explicit since Ruby is such a fundamental
 # part of a Rails project. The Ruby version is also locked in place by the
 # Docker base image so it won't be updated with fuzzy matching.
-ruby '2.5.8'
+ruby '~> 2.7'
 
 gem 'conjur-api', '~> 5.3.4'
 gem 'activesupport', '~> 5.2.6'
 gem 'railties', '~> 5.2.6'
 gem 'actionview', '~> 5.2.6'
 gem 'rack', '~> 2.2.3'
-gem 'json-schema', '~> 2.8'
+gem 'json-schema', '2.8.0'
 gem 'listen', '>= 3.0.5', '< 3.2'
 
 # Use Puma as the app server

Gemfile.lock

@@ -21,29 +21,31 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aruba (1.0.4)
+    aruba (1.1.2)
+      bundler (>= 1.17, < 3.0)
       childprocess (>= 2.0, < 5.0)
-      contracts (~> 0.16.0)
-      cucumber (>= 2.4, < 6.0)
+      contracts (>= 0.16.0, < 0.18.0)
+      cucumber (>= 2.4, < 7.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
     builder (3.2.4)
-    bundler-audit (0.7.0.1)
+    bundler-audit (0.9.0.1)
       bundler (>= 1.2.0, < 3)
-      thor (>= 0.18, < 2)
+      thor (~> 1.0)
     byebug (11.1.3)
-    childprocess (4.0.0)
+    childprocess (4.1.0)
     ci_reporter (2.0.0)
       builder (>= 2.1.2)
     ci_reporter_rspec (1.0.0)
       ci_reporter (~> 2.0)
       rspec (>= 2.14, < 4)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
-    conjur-api (5.3.4)
-      activesupport
+    conjur-api (5.3.7)
+      activesupport (>= 4.2)
+      addressable (~> 2.0)
       rest-client
-    contracts (0.16.0)
+    contracts (0.16.1)
     crass (1.0.6)
     cucumber (2.99.0)
       builder (>= 2.1.2)
@@ -56,23 +58,23 @@ GEM
     cucumber-core (1.5.0)
       gherkin (~> 4.0)
     cucumber-wire (0.0.1)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     erubi (1.10.0)
-    ffi (1.14.2)
+    ffi (1.15.5)
     gherkin (4.1.3)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
-    i18n (1.9.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     json-schema (2.8.0)
       addressable (>= 2.4)
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    license_finder (6.10.0)
+    license_finder (6.15.0)
       bundler
       rubyzip (>= 1, < 3)
       thor (~> 1.0.1)
@@ -87,19 +89,17 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
-    mini_portile2 (2.6.1)
+    mime-types-data (3.2022.0105)
+    mini_portile2 (2.8.0)
     minitest (5.15.0)
     multi_json (1.15.0)
     multi_test (0.1.2)
     netrc (0.11.0)
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
-      racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -126,39 +126,40 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (13.0.6)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rexml (3.2.5)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rspec_junit_formatter (0.4.1)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.4)
+    rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     ruby_dep (1.5.0)
-    rubyzip (2.3.0)
+    rubyzip (2.3.2)
     spring (2.1.1)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
@@ -170,14 +171,13 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.8)
     with_env (1.1.0)
-    xml-simple (1.1.8)
+    xml-simple (1.1.9)
+      rexml
 
 PLATFORMS
   ruby
-  x86_64-darwin-16
-  x86_64-darwin-18
 
 DEPENDENCIES
   actionview (~> 5.2.6)
@@ -188,7 +188,7 @@ DEPENDENCIES
   ci_reporter_rspec (~> 1)
   conjur-api (~> 5.3.4)
   cucumber (~> 2)
-  json-schema (~> 2.8)
+  json-schema (= 2.8.0)
   json_spec (~> 1.1.5)
   license_finder
   listen (>= 3.0.5, < 3.2)
@@ -204,7 +204,7 @@ DEPENDENCIES
   spring-watcher-listen (~> 2.0.0)
 
 RUBY VERSION
-   ruby 2.5.8p224
+   ruby 2.7.5p203
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

manifest.yml

@@ -2,5 +2,4 @@
 applications:
 - name: conjur-service-broker
   command: ./bin/start-service-broker.sh
-  buildpacks:
-    - https://github.com/cloudfoundry/ruby-buildpack.git#v1.8.37
+