Merge pull request #572 from 3scale/ruby-3.3

THREESCALE-12075: Upgrade to Ruby 3.3

Author: mayorova

.circleci/config.yml

@@ -31,7 +31,7 @@ jobs:
     working_directory: /opt/app-root/src
     docker:
       # A Zync image tagged manually for CI tests
-      - image: quay.io/3scale/zync:ci-builder-libyaml
+      - image: quay.io/3scale/zync:ci-builder-ruby-3.3
       - image: << parameters.postgresql_image >>
     environment:
         RAILS_ENV: test
@@ -48,7 +48,6 @@ jobs:
       - run:
           name: bundle install
           command: |
-            gem install bundler --version=$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tr -d ' '| tail -n 1) --no-document
             bundle config --local force_ruby_platform true
             bundle config set --local deployment 'true'
             bundle config set --local path 'vendor/bundle'

.rubocop.yml

@@ -5,7 +5,7 @@ require:
 AllCops:
   DisabledByDefault: true
   NewCops: disable
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.3
   UseCache: true
 
 Rails:

.tool-versions.sample

@@ -0,0 +1 @@
+ruby 3.3.1

Dockerfile

@@ -1,14 +1,14 @@
 FROM registry.access.redhat.com/ubi9:9.6
 
 ENV RUBY_MAJOR_VERSION=3 \
-    RUBY_MINOR_VERSION=1 \
+    RUBY_MINOR_VERSION=3 \
     APP_ROOT=/opt/app-root/src
 ENV RUBY_VERSION="${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}"
 
 USER root
 
 RUN dnf -y module enable ruby:${RUBY_VERSION} \
-    && dnf install --setopt=skip_missing_names_on_install=False,tsflags=nodocs -y shared-mime-info make automake gcc gcc-c++ postgresql git ruby-devel rubygem-irb rubygem-rdoc glibc-devel libpq-devel libyaml-devel \
+    && dnf install --setopt=skip_missing_names_on_install=False,tsflags=nodocs -y shared-mime-info make automake gcc gcc-c++ postgresql git ruby-devel rubygem-irb rubygem-rdoc glibc-devel libpq-devel libyaml-devel xz \
     && dnf clean all \
     && rm -rf /var/cache/yum
 

Gemfile

@@ -8,7 +8,7 @@ end
 
 gem 'rails', '~> 7.1.6'
 gem 'zeitwerk', '~> 2.6.18' # keep zeitwerk 2.6 until Ruby is 3.2 or higher
-gem 'pg', '>= 0.20'
+gem 'pg', '~> 1.6.2'
 
 # Use Puma as the app server
 gem 'puma', '~> 5.2'

Gemfile.lock

@@ -95,14 +95,14 @@ GEM
     base64 (0.3.0)
     benchmark (0.5.0)
     bigdecimal (3.3.1)
-    binding_of_caller (1.0.0)
-      debug_inspector (>= 0.0.1)
+    binding_of_caller (1.0.1)
+      debug_inspector (>= 1.2.0)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
     bugsnag (6.19.0)
       concurrent-ruby (~> 1.0)
     builder (3.3.0)
-    byebug (11.1.3)
+    byebug (12.0.0)
     cgi (0.5.0)
     codecov (0.4.3)
       simplecov (>= 0.15, < 0.22)
@@ -113,47 +113,47 @@ GEM
       rexml
     crass (1.0.6)
     date (3.5.0)
-    debug_inspector (1.1.0)
+    debug_inspector (1.2.0)
     docile (1.3.5)
     drb (2.2.3)
-    dry-configurable (0.13.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.6)
-    dry-container (0.11.0)
-      concurrent-ruby (~> 1.0)
-    dry-core (0.9.1)
+    dry-configurable (1.3.0)
+      dry-core (~> 1.1)
+      zeitwerk (~> 2.6)
+    dry-core (1.1.0)
       concurrent-ruby (~> 1.0)
+      logger
       zeitwerk (~> 2.6)
-    dry-inflector (0.3.0)
+    dry-inflector (1.2.0)
     dry-initializer (3.0.4)
-    dry-logic (1.3.0)
+    dry-logic (1.6.0)
+      bigdecimal
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.9, >= 0.9)
+      dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-struct (1.5.2)
-      dry-core (~> 0.9, >= 0.9)
-      dry-types (~> 1.6)
+    dry-struct (1.8.0)
+      dry-core (~> 1.1)
+      dry-types (~> 1.8, >= 1.8.2)
       ice_nine (~> 0.11)
       zeitwerk (~> 2.6)
-    dry-types (1.6.1)
+    dry-types (1.8.3)
+      bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.9, >= 0.9)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.3, >= 1.3)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
     erb (4.0.4)
       cgi (>= 0.3.3)
     erubi (1.13.1)
-    excon (0.100.0)
+    excon (0.112.0)
     faraday (1.3.0)
       faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
     faraday-net_http (1.0.1)
     globalid (1.3.0)
       activesupport (>= 6.1)
-    hashdiff (1.0.1)
+    hashdiff (1.2.1)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
@@ -164,19 +164,19 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.16.0)
-    jsonpath (0.9.9)
+    jsonpath (1.1.5)
       multi_json
-      to_regexp (~> 0.2.1)
     jwt (2.2.2)
-    k8s-ruby (0.14.0)
-      dry-configurable (~> 0.13.0)
-      dry-struct (<= 1.6.0)
-      dry-types (<= 1.7.0)
+    k8s-ruby (0.17.2)
+      base64
+      dry-configurable
+      dry-struct
+      dry-types
       excon (~> 0.71)
-      hashdiff (~> 1.0.0)
-      jsonpath (~> 0.9.5)
-      recursive-open-struct (~> 1.1.3)
-      yajl-ruby (~> 1.4.0)
+      hashdiff (~> 1.0)
+      jsonpath (~> 1.1)
+      recursive-open-struct (~> 1.1, >= 1.1.3)
+      yajl-ruby (~> 1.4)
       yaml-safe_load_stream3
     language_server-protocol (3.17.0.5)
     license_finder (7.0.1)
@@ -216,7 +216,7 @@ GEM
       ruby-progressbar
     minitest-stub-const (0.6)
     msgpack (1.7.1)
-    multi_json (1.15.0)
+    multi_json (1.18.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mustermann (2.0.2)
@@ -241,25 +241,26 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
+    ostruct (0.6.3)
     parallel (1.27.0)
     parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
-    pg (1.2.3)
+    pg (1.6.2)
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
     prism (1.6.0)
     prometheus-client (2.1.0)
-    pry (0.13.1)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    pry-rails (0.3.9)
-      pry (>= 0.10.4)
-    pry-rescue (1.5.0)
+    pry-byebug (3.11.0)
+      byebug (~> 12.0)
+      pry (>= 0.13, < 0.16)
+    pry-rails (0.3.11)
+      pry (>= 0.13.0)
+    pry-rescue (1.6.0)
       interception (>= 0.5)
       pry (>= 0.12.0)
     pry-stack_explorer (0.6.1)
@@ -323,7 +324,8 @@ GEM
       erb
       psych (>= 4.0.0)
       tsort
-    recursive-open-struct (1.1.3)
+    recursive-open-struct (1.3.1)
+      ostruct
     regexp_parser (2.11.3)
     reline (0.6.3)
       io-console (~> 0.5)
@@ -376,7 +378,6 @@ GEM
     thor (1.4.0)
     tilt (2.0.11)
     timeout (0.4.4)
-    to_regexp (0.2.1)
     tomlrb (2.0.3)
     tsort (0.2.0)
     tzinfo (2.0.6)
@@ -433,7 +434,7 @@ DEPENDENCIES
   minitest-reporters
   minitest-stub-const
   oauth2
-  pg (>= 0.20)
+  pg (~> 1.6.2)
   prometheus-client (~> 2.1.0)
   pry-byebug
   pry-rails
@@ -458,4 +459,4 @@ DEPENDENCIES
   zeitwerk (~> 2.6.18)
 
 BUNDLED WITH
-   2.3.27
+   2.5.22

INSTALL.md

@@ -13,7 +13,7 @@ To run Zync you need access to a running [PostgreSQL](https://www.postgresql.org
 manager, as a container or run it remotely.
 
 The minimum requirement for the machine running Zync is to have
- - Ruby 3.1
+ - Ruby 3.3
  - `psql` client tool - needed when running for `db:setup`
  - `libpq-devel` - needed to build `pg` gem during `bundle install`.