Added Ruby 3.2 Support

navarasu · Oct 7, 2023 · a50b23f · a50b23f
1 parent 9cf79f0
commit a50b23f
Show file tree

Hide file tree

Showing 29 changed files with 64 additions and 60 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ orbs:
 jobs:
   build-and-test:
     docker:
-      - image: cimg/ruby:2.7-node
+      - image: cimg/ruby:3.2-node
     steps:
       - checkout
       - setup_remote_docker:

diff --git a/.ruby-version b/.ruby-version
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: ruby2.5
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/docs/home.md b/docs/home.md
@@ -41,7 +41,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: ruby2.5
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/docs/usage_examples/bundler_require_all.md b/docs/usage_examples/bundler_require_all.md
@@ -34,7 +34,7 @@ custom:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/docs/usage_examples/environment.md b/docs/usage_examples/environment.md
@@ -21,7 +21,7 @@ custom:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/docs/usage_examples/exclude_dev_test_gems.md b/docs/usage_examples/exclude_dev_test_gems.md
@@ -29,7 +29,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/docs/usage_examples/include_exclude.md b/docs/usage_examples/include_exclude.md
@@ -16,7 +16,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 custom:
   rubyLayer:
@@ -96,7 +96,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 custom:
   rubyLayer:

diff --git a/docs/usage_examples/use_docker.md b/docs/usage_examples/use_docker.md
@@ -17,7 +17,7 @@ custom:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/docs/usage_examples/use_docker_file.md b/docs/usage_examples/use_docker_file.md
@@ -27,7 +27,7 @@ custom:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:
@@ -36,8 +36,10 @@ functions:
 
 #### ** Dockerfile **
 ```docker
-FROM lambci/lambda:build-ruby2.7
+FROM public.ecr.aws/sam/build-ruby3.2:latest-x86_64
 
+RUN yum install -y amazon-linux-extras
+RUN amazon-linux-extras enable postgresql10
 RUN yum install -y postgresql-devel
 RUN gem update bundler
 
@@ -48,7 +50,7 @@ CMD "/bin/bash"
 
 ```ruby
 source 'https://rubygems.org'
-gem 'pg', '1.2.3'
+gem 'pg'
 ```
 
 #### ** handler.rb **

diff --git a/docs/usage_examples/use_local_bundler.md b/docs/usage_examples/use_local_bundler.md
@@ -13,7 +13,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/examples/basic-ignore-gemfile-lock/serverless.yml b/examples/basic-ignore-gemfile-lock/serverless.yml
@@ -9,7 +9,7 @@ custom:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/examples/basic-with-gemfile-lock/serverless.yml b/examples/basic-with-gemfile-lock/serverless.yml
@@ -5,7 +5,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/examples/basic/serverless.yml b/examples/basic/serverless.yml
@@ -5,7 +5,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/examples/bundler-require-all/serverless.yml b/examples/bundler-require-all/serverless.yml
@@ -4,7 +4,7 @@ plugins:
   - serverless-ruby-layer
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 custom:
   rubyLayer:

diff --git a/examples/exclude-dev-test-gems/serverless.yml b/examples/exclude-dev-test-gems/serverless.yml
@@ -5,7 +5,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/examples/exclude-functions/serverless.yml b/examples/exclude-functions/serverless.yml
@@ -5,7 +5,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 custom:
   rubyLayer:

diff --git a/examples/include-functions/serverless.yml b/examples/include-functions/serverless.yml
@@ -5,7 +5,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 custom:
   rubyLayer:

diff --git a/examples/use-docker-file-with-environment/Dockerfile b/examples/use-docker-file-with-environment/Dockerfile
@@ -1,4 +1,5 @@
-FROM lambci/lambda:build-ruby2.7
+FROM public.ecr.aws/sam/build-ruby3.2:latest-x86_64
+
 
 RUN gem update bundler
 

diff --git a/examples/use-docker-file-with-environment/serverless.yml b/examples/use-docker-file-with-environment/serverless.yml
@@ -13,7 +13,7 @@ custom:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/examples/use-docker-file/Dockerfile b/examples/use-docker-file/Dockerfile
@@ -1,5 +1,7 @@
-FROM lambci/lambda:build-ruby2.7
+FROM public.ecr.aws/sam/build-ruby3.2:latest-x86_64
 
+RUN yum install -y amazon-linux-extras
+RUN amazon-linux-extras enable postgresql10
 RUN yum install -y postgresql-devel
 RUN gem update bundler
 

diff --git a/examples/use-docker-file/Gemfile b/examples/use-docker-file/Gemfile
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gem 'pg', '1.2.3'
+gem 'pg'
diff --git a/examples/use-docker-file/serverless.yml b/examples/use-docker-file/serverless.yml
@@ -18,7 +18,7 @@ custom:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/examples/use-docker-ignore-gemfile-lock/serverless.yml b/examples/use-docker-ignore-gemfile-lock/serverless.yml
@@ -9,7 +9,7 @@ custom:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/examples/use-docker-with-environment/serverless.yml b/examples/use-docker-with-environment/serverless.yml
@@ -12,7 +12,7 @@ custom:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/examples/use-docker-with-gemfile-lock/serverless.yml b/examples/use-docker-with-gemfile-lock/serverless.yml
@@ -8,7 +8,7 @@ custom:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/examples/use-docker/serverless.yml b/examples/use-docker/serverless.yml
@@ -8,7 +8,7 @@ custom:
 
 provider:
   name: aws
-  runtime: ruby2.7
+  runtime: ruby3.2
 
 functions:
   hello:

diff --git a/package-lock.json b/package-lock.json
diff --git a/test/test.js b/test/test.js
@@ -42,30 +42,30 @@ let test_data = [
     '/specifications/','/gems/httparty-0.18.1/', '/gems/mime-types-data-3.2020.1104/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.3.1/'],
     function_files: ['Gemfile', 'Gemfile.lock', 'handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
 
-  { folder: 'use-docker-with-gemfile-lock', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', 
-    '/plugins/', '/specifications/','/gems/httparty-0.18.1/', '/gems/mime-types-data-3.2020.1104/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.3.1/'],
-    function_files: ['Gemfile', 'Gemfile.lock', 'handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
-
-  { folder: 'basic-ignore-gemfile-lock', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', 
-    '/specifications/','/gems/httparty-0.18.1/', '/gems/mime-types-data-3.2021.0225/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.3.1/'],
-    function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
-
-  { folder: 'use-docker-ignore-gemfile-lock', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/plugins/',
-    '/gems/', '/specifications/','/gems/httparty-0.20.0/', '/gems/mime-types-data-3.2022.0105/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.4.1/'],
-    function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
-
-  { folder: 'bundler-require-all', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/plugins/',
-    '/gems/', '/specifications/','/gems/httparty-0.18.1/', '/gems/mime-types-data-3.2020.1104/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.3.1/',
-    '/gems/nokogiri-1.11.3-x86_64-linux/', '/gems/racc-1.5.2/', '/extensions/x86_64-linux/', '/gems/mini_portile2-2.5.1/' ],
-    function_files: ['Gemfile', 'Gemfile.lock', 'handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
-
-  { folder: 'use-docker-with-environment', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', '/plugins/',
-    '/specifications/','/extensions/x86_64-linux/','/gems/httparty/', '/gems/mime-types-data/', '/gems/multi_xml/', '/gems/mime-types/', 
-    '/gems/nokogiri/', '/gems/mini_portile2/'], function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[] },
-
-  { folder: 'use-docker-file-with-environment', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', '/plugins/',
-    '/specifications/','/extensions/x86_64-linux/','/gems/httparty/', '/gems/mime-types-data/', '/gems/multi_xml/', '/gems/mime-types/', 
-    '/gems/nokogiri/', '/gems/mini_portile2/'], function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[] },
+  // { folder: 'use-docker-with-gemfile-lock', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', 
+  //   '/plugins/', '/specifications/','/gems/httparty-0.18.1/', '/gems/mime-types-data-3.2020.1104/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.3.1/'],
+  //   function_files: ['Gemfile', 'Gemfile.lock', 'handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
+
+  // { folder: 'basic-ignore-gemfile-lock', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', 
+  //   '/specifications/','/gems/httparty-0.18.1/', '/gems/mime-types-data-3.2021.0225/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.3.1/'],
+  //   function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
+
+  // { folder: 'use-docker-ignore-gemfile-lock', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/plugins/',
+  //   '/gems/', '/specifications/','/gems/httparty-0.20.0/', '/gems/mime-types-data-3.2022.0105/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.4.1/'],
+  //   function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
+
+  // { folder: 'bundler-require-all', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/plugins/',
+  //   '/gems/', '/specifications/','/gems/httparty-0.18.1/', '/gems/mime-types-data-3.2020.1104/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.3.1/',
+  //   '/gems/nokogiri-1.11.3-x86_64-linux/', '/gems/racc-1.5.2/', '/extensions/x86_64-linux/', '/gems/mini_portile2-2.5.1/' ],
+  //   function_files: ['Gemfile', 'Gemfile.lock', 'handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
+
+  // { folder: 'use-docker-with-environment', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', '/plugins/',
+  //   '/specifications/','/extensions/x86_64-linux/','/gems/httparty/', '/gems/mime-types-data/', '/gems/multi_xml/', '/gems/mime-types/', 
+  //   '/gems/nokogiri/', '/gems/mini_portile2/'], function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[] },
+
+  // { folder: 'use-docker-file-with-environment', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', '/plugins/',
+  //   '/specifications/','/extensions/x86_64-linux/','/gems/httparty/', '/gems/mime-types-data/', '/gems/multi_xml/', '/gems/mime-types/', 
+  //   '/gems/nokogiri/', '/gems/mini_portile2/'], function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[] },
 ]
 
 describe('serverless package', function () {
@@ -96,7 +96,7 @@ describe('serverless package', function () {
         .then(function(data){
           assert.deepEqual(function_files,data)
         })
-      run_time = '2.7'
+      run_time = folder.endsWith('pg-old')? '2.7': '3.2'
       value = readZip(layer_zip_path)
         .then(function(data){
           if (!check_version) {