Merge pull request #50 from navarasu/fix_38_add_pg_example

navarasu · web-flow · commit ddcdda76026f · 2021-05-15T09:42:18.000+05:30
#38 Added example for pg using ruby2.7 and updated testcases
diff --git a/README.md b/README.md
@@ -79,7 +79,7 @@ For more detailse refer the docs [here](https://navarasu.github.io/serverless-ru
 Using the custom configuration, the plugin can be utilized for below cases,
 * Using locally installed bundler for gems without any native extensions - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/basic) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_local_bundler)
 * Using Docker for gems with OS native C extensions or system libraries like `http`, `Nokogiri` - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_docker)
-* Preinstall OS packages (yum packages) for gems which requires OS native system libraries like `pg`, `mysql`, `RMagick` - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker-with-yums) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_docker_with_yums)
+* Preinstall OS packages (yum packages) for gems which requires OS native system libraries like `pg`, `mysql`, `RMagick` - [PG ruby2.5 Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker-with-yums-pg-ruby2-5) , [PG ruby2.7 Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker-with-yums-pg-ruby2-7) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_docker_with_yums)
 * Using Dockerfile for gems which with other OS Linux image or system libraries and utilities -  [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker-file) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_docker_file)
 * Include / Exclude specific functions from layer configuration - [Include Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/include-functions) , [Exclude Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/exclude-functions) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/include_exclude)
 * Exclude test and development related gems from layer  - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/exclude-dev-test-gems) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/exclude_dev_test_gems)
diff --git a/docs/home.md b/docs/home.md
@@ -79,7 +79,7 @@ For more detailse refer the docs [here](https://navarasu.github.io/serverless-ru
 Using the custom configuration, the plugin can be utilized for below cases,
 * Using locally installed bundler for gems without any native extensions - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/basic) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_local_bundler)
 * Using Docker for gems with OS native C extensions or system libraries like `http`, `Nokogiri` - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_docker)
-* Preinstall OS packages (yum packages) for gems which requires OS native system libraries like `pg`, `mysql`, `RMagick` - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker-with-yums) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_docker_with_yums)
+* Preinstall OS packages (yum packages) for gems which requires OS native system libraries like `pg`, `mysql`, `RMagick` - [PG ruby2.5 Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker-with-yums-pg-ruby2-5) , [PG ruby2.7 Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker-with-yums-pg-ruby2-7) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_docker_with_yums)
 * Using Dockerfile for gems which with other OS Linux image or system libraries and utilities -  [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker-file) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_docker_file)
 * Include / Exclude specific functions from layer configuration - [Include Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/include-functions) , [Exclude Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/exclude-functions) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/include_exclude)
 * Exclude test and development related gems from layer  - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/exclude-dev-test-gems) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/exclude_dev_test_gems)
diff --git a/docs/usage_examples/main.md b/docs/usage_examples/main.md
@@ -2,9 +2,11 @@
 ## Usage and Examples
 
 Using the custom configuration, the plugin can be utilized for below cases,
-* Using locally installed bundler for gems without any native extensions [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/basic) - [Docs](/use_local_bundler)
-* Using Docker for gems with C extensions or system libraries like `http`, `Nokogiri` - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use_docker) - [Docs](use_docker)
-* Preinstall OS packages (yum packages) for gems which requires OS native system libraries like `pg`, `mysql`, `RMagick` - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use_docker_with_yums) - [Docs](use_docker_with_yums)
-* Using Dockerfile for gems which requires other system libraries and configuration -  [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use_docker_file) - [Docs](use_docker_file)
+* Using locally installed bundler for gems without any native extensions - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/basic) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_local_bundler)
+* Using Docker for gems with OS native C extensions or system libraries like `http`, `Nokogiri` - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_docker)
+* Preinstall OS packages (yum packages) for gems which requires OS native system libraries like `pg`, `mysql`, `RMagick` - [PG ruby2.5 Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker-with-yums-pg-ruby2-5) , [PG ruby2.7 Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker-with-yums-pg-ruby2-7) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_docker_with_yums)
+* Using Dockerfile for gems which with other OS Linux image or system libraries and utilities -  [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/use-docker-file) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/use_docker_file)
+* Include / Exclude specific functions from layer configuration - [Include Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/include-functions) , [Exclude Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/exclude-functions) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/include_exclude)
 * Exclude test and development related gems from layer  - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/exclude-dev-test-gems) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/exclude_dev_test_gems)
 * Using `Bundler.require(:default)` to require all gems in handler.rb by respecting Gemfile.lock  - [Example](https://github.com/navarasu/serverless-ruby-layer/blob/master/examples/bundler-require-all) - [Docs](https://navarasu.github.io/serverless-ruby-layer/#/bundler_require_all)
+
diff --git a/docs/usage_examples/use_docker_with_yums.md b/docs/usage_examples/use_docker_with_yums.md
@@ -2,6 +2,7 @@
 
 ##  Preinstall yum packages for gems which requires OS native system libraries
 
+### Example to deploy pg using Ruby 2.7
 
 <!-- tabs:start -->
 
@@ -20,10 +21,16 @@ custom:
       - postgresql-devel
     native_libs:
       - /usr/lib64/libpq.so.5
+      - /usr/lib64/libldap_r-2.4.so.2
+      - /usr/lib64/liblber-2.4.so.2
+      - /usr/lib64/libsasl2.so.3
+      - /usr/lib64/libssl3.so
+      - /usr/lib64/libsmime3.so
+      - /usr/lib64/libnss3.so
 
 provider:
   name: aws
-  runtime: ruby2.5
+  runtime: ruby2.7
 
 functions:
   hello:
@@ -54,20 +61,84 @@ end
 <!-- tabs:end -->
 
 
+### Example to deploy pg using Ruby 2.5
+
+<!-- tabs:start -->
+
+#### ** serverless.yml **
+
+```yml
+service: using-docker-yums
+
+plugins:
+  - serverless-ruby-layer
+
+custom:
+  rubyLayer:
+    use_docker: true
+    docker_yums:
+      - postgresql-devel
+    native_libs:
+      - /usr/lib64/libpq.so.5
+
+provider:
+  name: aws
+  runtime: ruby2.5
+
+functions:
+  hello:
+    handler: handler.hello
+  ```
+
+#### ** Gemfile **
+
+```ruby
+source 'https://rubygems.org'
+gem 'pg'
+```
+
+#### ** handler.rb **
+
+```ruby
+require 'pg'
+
+def hello(event:, context:)
+  { statusCode: 200, body: {
+    "pg_version": PG.library_version
+    }
+  }
+end
+
+```
+
+<!-- tabs:end -->
 
 #### Checkout above Example here
 
 
 ```bash
   git clone https://github.com/navarasu/serverless-ruby.git
 ```
+*Ruby 2.7*
+
 ```bash
-  cd serverless-ruby/deploy_pg_gem
+  cd serverless-ruby/deploy_pg_gem_2-7
 
   sls plugin install -n serverless-ruby-layer
 
 ```
 
+*Ruby 2.5*
+
+```bash
+  cd serverless-ruby/deploy_pg_gem_2-5
+
+  sls plugin install -n serverless-ruby-layer
+
+```
+
+
+
 #### Deploy to AWS
 
 ```bash
@@ -81,4 +152,4 @@ Running `sls deploy` automatically deploys the required gems as in Gemfile to AW
 
 ```bash
  sls invoke -f hello
-```
+```
diff --git a/examples/use-docker-with-yums-pg-ruby2-5/Gemfile b/examples/use-docker-with-yums-pg-ruby2-5/Gemfile
diff --git a/examples/use-docker-with-yums-pg-ruby2-5/handler.rb b/examples/use-docker-with-yums-pg-ruby2-5/handler.rb
diff --git a/examples/use-docker-with-yums-pg-ruby2-5/serverless.yml b/examples/use-docker-with-yums-pg-ruby2-5/serverless.yml
@@ -1,4 +1,4 @@
-service: use-docker-with-yums 
+service: use-docker-with-yums-pg-ruby2-5
 
 plugins:
   - serverless-ruby-layer
diff --git a/examples/use-docker-with-yums-pg-ruby2-7/Gemfile b/examples/use-docker-with-yums-pg-ruby2-7/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'pg'
diff --git a/examples/use-docker-with-yums-pg-ruby2-7/handler.rb b/examples/use-docker-with-yums-pg-ruby2-7/handler.rb
@@ -0,0 +1,8 @@
+require 'pg'
+
+def hello(event:, context:)
+  { statusCode: 200, body: {
+    "pg_version": PG.library_version
+    }
+  }
+end
diff --git a/examples/use-docker-with-yums-pg-ruby2-7/serverless.yml b/examples/use-docker-with-yums-pg-ruby2-7/serverless.yml
@@ -0,0 +1,26 @@
+service: use-docker-with-yums-pg-ruby2-7
+
+plugins:
+  - serverless-ruby-layer
+
+custom:
+  rubyLayer:
+    use_docker: true
+    docker_yums:
+      - postgresql-devel
+    native_libs:
+      - /usr/lib64/libpq.so.5
+      - /usr/lib64/libldap_r-2.4.so.2
+      - /usr/lib64/liblber-2.4.so.2
+      - /usr/lib64/libsasl2.so.3
+      - /usr/lib64/libssl3.so
+      - /usr/lib64/libsmime3.so
+      - /usr/lib64/libnss3.so
+
+provider:
+  name: aws
+  runtime: ruby2.7
+
+functions:
+  hello:
+    handler: handler.hello
diff --git a/test/test.js b/test/test.js
@@ -15,10 +15,14 @@ let test_data = [
     '/gems/mini_portile2/', '/gems/nokogiri/', '/gems/public_suffix/', '/gems/rake/', '/gems/unf/', '/gems/unf_ext/' ],
     function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[] },
 
-  { folder: 'use-docker-with-yums', gem_zip_dirs: [ '/', '/build_info/', '/doc/', '/extensions/', '/gems/',
+  { folder: 'use-docker-with-yums-pg-ruby2-5', gem_zip_dirs: [ '/', '/build_info/', '/doc/', '/extensions/', '/gems/',
     '/specifications/', '/gems/pg/', '/extensions/x86_64-linux/', 'lib/', 'lib/libpq.so.5' ],
     function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[] },
 
+  { folder: 'use-docker-with-yums-pg-ruby2-7', gem_zip_dirs: [ '/', '/build_info/', '/doc/', '/extensions/', '/gems/', '/plugins/',
+    '/specifications/', '/gems/pg/', '/extensions/x86_64-linux/', 'lib/', 'lib/libpq.so.5', 'lib/liblber', 'lib/libldap_r', 'lib/libnss3.so', 'lib/libsasl2.so.3', 'lib/libsmime3.so', 'lib/libssl3.so' ],
+    function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[] },
+
   { folder: 'use-docker-file', gem_zip_dirs: [ '/', '/build_info/', '/doc/', '/extensions/', '/gems/',
     '/specifications/', '/gems/pg/', '/extensions/x86_64-linux/', 'lib/', 'lib/libpq.so.5' ],
     function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[] },
@@ -82,7 +86,7 @@ describe('serverless package', function () {
         .then(function(data){
           assert.deepEqual(function_files,data)
         })
-      run_time ='2.5'
+      run_time = folder.endsWith('2-7')? '2.7': '2.5'
       value = readZip(layer_zip_path)
         .then(function(data){
           if (!check_version) {
@@ -94,7 +98,7 @@ describe('serverless package', function () {
       assert.deepEqual(serverless_config['service']['layers']['gem']['package']['artifact'], path.resolve(layer_zip_path))
       cloud_resource = serverless_config['service']['provider']['compiledCloudFormationTemplate']['Resources']
       const {Content, ...others} = cloud_resource['GemLambdaLayer']['Properties']
-      assert.deepEqual(others,{CompatibleRuntimes: ['ruby2.5'],
+      assert.deepEqual(others,{CompatibleRuntimes: ['ruby'+run_time],
         Description: 'Ruby gem generated by serverless-ruby-bundler',
         LayerName: `${folder}-dev-ruby-bundle`
       })

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-service: use-docker-with-yums`
	`1`	`+service: use-docker-with-yums-pg-ruby2-5`
`2`	`2`
`3`	`3`	`plugins:`
`4`	`4`	`- serverless-ruby-layer`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+source 'https://rubygems.org'`
	`2`	`+gem 'pg'`