Merge pull request #347 from 3scale/ruby-3.0.2

THREESCALE-8989 ruby 3.0.X

.circleci/config.yml

@@ -21,7 +21,7 @@ jobs:
 
     docker:
       # specify the version you desire here
-       - image: quay.io/3scale/apisonator-ci:20221222
+      - image: quay.io/3scale/apisonator-ci:20230418-02
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -36,8 +36,8 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-          - v2-rbenv-dependencies-20221222-{{ checksum ".ruby-version" }}
-          - v2-dependencies-v2-{{ checksum "Gemfile.lock" }}
+          - v3-rbenv-dependencies-20230418-{{ checksum ".ruby-version" }}
+          - v3-dependencies-v3-{{ checksum "Gemfile.lock" }}
 
       - run:
           name: rbenv update
@@ -47,23 +47,27 @@ jobs:
       - save_cache:
           paths:
             - ~/.rbenv
-          key: v2-rbenv-dependencies-20221222-{{ checksum ".ruby-version" }}
+          key: v3-rbenv-dependencies-20230418-{{ checksum ".ruby-version" }}
 
       - run:
           name: bundle install
           command: |
+            # required for the license_finder
+            # The Gemfile.lock specifies nokogiri (1.14.3)
+            # but bundler would install native gem instead if not forced
+            bundle config set --local force_ruby_platform true
             bundle_install_rubies
 
       - save_cache:
           paths:
             - ~/.rbenv/versions
-          key: v2-dependencies-v2-{{ checksum "Gemfile.lock" }}
+          key: v3-dependencies-v3-{{ checksum "Gemfile.lock" }}
 
       #run tests!
       - run:
-          name: Run tests on Ruby 2.7
+          name: Run tests on Ruby 3.0.2
           command: |
-            TEST_RUBY_VERSION=2.7 script/ci
+            TEST_RUBY_VERSION=3.0.2 script/ci
 
       #- run:
       #    name: Run tests on all Rubies

.dependency_decisions.yml

@@ -1,17 +1,17 @@
 ---
-- - :whitelist
+- - :permit
   - MIT
   - :who: 3scale Engineering
     :why:
     :versions: []
     :when: 2016-08-16 09:25:15.635515271 Z
-- - :whitelist
+- - :permit
   - Apache 2.0
   - :who: 3scale Engineering
     :why:
     :versions: []
     :when: 2016-08-16 09:26:31.814319646 Z
-- - :whitelist
+- - :permit
   - MIT-LICENSE
   - :who: 3scale Engineering
     :why: It's the same as MIT
@@ -30,37 +30,37 @@
     :why: It's this project.
     :versions: []
     :when: 2016-08-18 15:18:39.314149125 Z
-- - :whitelist
+- - :permit
   - BSD
   - :who: Jeff Kaufmann and Richard Fontana (Red Hat Legal)
     :why:
     :versions: []
     :when: 2016-11-23 11:02:51.564502000 Z
-- - :whitelist
+- - :permit
   - New BSD
   - :who: Jeff Kaufmann and Richard Fontana (Red Hat Legal)
     :why:
     :versions: []
     :when: 2016-11-23 11:03:04.247155000 Z
-- - :whitelist
+- - :permit
   - ruby
   - :who: Jeff Kaufmann and Richard Fontana (Red Hat Legal)
     :why:
     :versions: []
     :when: 2016-11-23 11:03:15.526798000 Z
-- - :whitelist
+- - :permit
   - Simplified BSD
   - :who: Jeff Kaufmann and Richard Fontana (Red Hat Legal)
     :why:
     :versions: []
     :when: 2016-11-23 11:03:33.341497000 Z
-- - :whitelist
+- - :permit
   - LGPLv2+
   - :who: Jeff Kaufmann and Richard Fontana (Red Hat Legal)
     :why:
     :versions: []
     :when: 2016-11-23 11:04:13.584885000 Z
-- - :whitelist
+- - :permit
   - 2-clause BSDL
   - :who: Jeff Kaufmann and Richard Fontana (Red Hat Legal)
     :why:

.ruby-version

@@ -1 +1 @@
-2.7.4
+3.0.2

Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/3scale/apisonator-ci:20221222
+FROM quay.io/3scale/apisonator-ci:20230418-02
 MAINTAINER Eguzki Astiz Lezaun <[email protected]>
 
 ARG APP_HOME

Dockerfile.ci

@@ -1,7 +1,7 @@
 FROM registry.access.redhat.com/ubi9:9.1.0
 MAINTAINER Eguzki Astiz Lezaun <[email protected]>
 
-ARG CIRCLECI_TOOLS="git openssh-clients tar gzip ca-certificates glibc-locale-source glibc-langpack-en"
+ARG CIRCLECI_TOOLS="git openssh-clients tar xz gzip ca-certificates glibc-locale-source glibc-langpack-en"
 # set localtime to UTC and install basic build tools
 RUN (ln -s /usr/share/zoneinfo/UTC /etc/localtime 2> /dev/null || true) \
     && dnf update -y \
@@ -247,7 +247,7 @@ RUN sudo chown -R "${USER_NAME}": /tmp/apisonator \
     && rbenv_update_env
 
 # specify all versions to be installed, partial versions also understood
-ARG RUBY_VERSIONS="2.7"
+ARG RUBY_VERSIONS="3.0.2"
 RUN cd /tmp/apisonator \
     && ruby_versions ${RUBY_VERSIONS}
 

Gemfile

@@ -25,7 +25,7 @@ group :test do
   gem 'nokogiri',      '~> 1.14.3'
   gem 'pkg-config',    '~> 1.1.7'
   gem 'resque_unit',   '~> 0.4.4', source: 'https://rubygems.org'
-  gem 'test-unit',     '~> 3.2.6'
+  gem 'test-unit',     '~> 3.5'
   gem 'resque_spec',   '~> 0.17.0'
   gem 'timecop',       '~> 0.9.1'
   gem 'rspec',         '~> 3.7.0', require: nil
@@ -38,7 +38,7 @@ group :development do
   gem 'source2swagger', git: 'https://github.com/3scale/source2swagger', branch: 'backend'
   gem 'pry',      '~> 0.14'
   gem 'pry-doc',  '~> 1.1'
-  gem 'license_finder', '~> 5'
+  gem 'license_finder', '~> 7.0'
 end
 
 group :development, :test do
@@ -57,16 +57,17 @@ gem 'rake', '~> 13.0'
 gem 'builder', '= 3.2.3'
 # Use a patched resque to allow reusing their Airbrake Failure class
 gem 'resque', git: 'https://github.com/3scale/resque', branch: '3scale'
-gem 'redis-namespace', '~>1.8.0'
+gem 'redis-namespace', '~>1.8'
 gem 'rack', '~> 2.2.6'
-gem 'sinatra', '~> 2.0.3'
-gem 'sinatra-contrib', '~> 2.0.3'
+gem 'sinatra', '~> 2.2.4'
+gem 'sinatra-contrib', '~> 2.2.4'
 # Optional external error logging services
 gem 'bugsnag', '~> 6', require: nil
 gem 'yabeda-prometheus', '~> 0.5.0'
-gem 'async-redis', '~> 0.5.1'
+gem 'async-redis', '~> 0.7.0'
 gem 'async-pool', '~> 0.3.12'
 gem 'falcon', '~> 0.35'
+gem 'webrick', '~> 1.8'
 
 # Use a patched redis-rb that fixes an issue when trying to connect with
 # sentinels and avoids retrying calls when there's a timeout to prevent