Merge pull request #3 from compliance-innovations/feature/support-opensearch-2

Support OpenSearch 2 by removing deprecated mapping types

Author: mauricebolhuis

.github/workflows/2.4.yml

@@ -25,9 +25,9 @@ jobs:
         sudo sysctl -w vm.swappiness=1
         sudo sysctl -w fs.file-max=262144
         sudo sysctl -w vm.max_map_count=262144
-    - uses: opensearch-project/opensearch-ruby/.github/actions/opensearch@1.x
+    - uses: opensearch-project/opensearch-ruby/.github/actions/opensearch@main
       with:
-        cluster-version: 1
+        cluster-version: 2
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.4

.github/workflows/2.5.yml

@@ -25,9 +25,9 @@ jobs:
         sudo sysctl -w vm.swappiness=1
         sudo sysctl -w fs.file-max=262144
         sudo sysctl -w vm.max_map_count=262144
-    - uses: opensearch-project/opensearch-ruby/.github/actions/opensearch@1.x
+    - uses: opensearch-project/opensearch-ruby/.github/actions/opensearch@main
       with:
-        cluster-version: 1
+        cluster-version: 2
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.5

.github/workflows/2.6.yml

@@ -25,9 +25,9 @@ jobs:
         sudo sysctl -w vm.swappiness=1
         sudo sysctl -w fs.file-max=262144
         sudo sysctl -w vm.max_map_count=262144
-    - uses: opensearch-project/opensearch-ruby/.github/actions/opensearch@1.x
+    - uses: opensearch-project/opensearch-ruby/.github/actions/opensearch@main
       with:
-        cluster-version: 1
+        cluster-version: 2
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.6

.github/workflows/2.7.yml

@@ -25,9 +25,9 @@ jobs:
         sudo sysctl -w vm.swappiness=1
         sudo sysctl -w fs.file-max=262144
         sudo sysctl -w vm.max_map_count=262144
-    - uses: opensearch-project/opensearch-ruby/.github/actions/opensearch@1.x
+    - uses: opensearch-project/opensearch-ruby/.github/actions/opensearch@main
       with:
-        cluster-version: 1
+        cluster-version: 2
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.7

.github/workflows/jruby.yml

@@ -25,9 +25,9 @@ jobs:
         sudo sysctl -w vm.swappiness=1
         sudo sysctl -w fs.file-max=262144
         sudo sysctl -w vm.max_map_count=262144
-    - uses: opensearch-project/opensearch-ruby/.github/actions/opensearch@1.x
+    - uses: opensearch-project/opensearch-ruby/.github/actions/opensearch@main
       with:
-        cluster-version: 1
+        cluster-version: 2
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: jruby-9.3

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.0
+
+* Support OpenSearch 2 by removing deprecated type and include_type_name parameters
+
 ## 0.1.1
 
 * Pin opensearch-ruby to '~> 1.1' because OpenSearch 2 is not supported yet

Gemfile

@@ -18,7 +18,7 @@
 source 'https://rubygems.org'
 
 gem "rake", "~> 12"
-gem "opensearch-ruby", '~> 1.0'
+gem "opensearch-ruby", '~> 2.0'
 gem "pry"
 gem "ansi"
 gem "cane"

README.md

@@ -43,11 +43,11 @@ The libraries are compatible with Ruby 2.4 and higher.
 
 We follow Ruby’s own maintenance policy and officially support all currently maintained versions per [Ruby Maintenance Branches](https://www.ruby-lang.org/en/downloads/branches/).
 
-The version numbers follow the OpenSearch major versions. Currently the `main` branch is compatible with version `1.x` of the OpenSearch stack.
+The version numbers follow the OpenSearch major versions. Currently the `main` branch is compatible with version `2.x` of the OpenSearch stack.
 
 | Rubygem       |   | OpenSearch    |
 |:-------------:|:-:| :-----------: |
-| main          | → | 1.x           |
+| main          | → | 2.x           |
 
 ## Usage
 

opensearch-model/README.md

@@ -12,7 +12,7 @@ The library version numbers follow the OpenSearch major versions. The `main` bra
 
 | Rubygem       |   | OpenSearch    |
 |:-------------:|:-:| :-----------: |
-| main          | → | 1.x           |
+| main          | → | 2.x           |
 
 ## Installation
 
@@ -523,10 +523,10 @@ class Indexer
     case operation.to_s
       when /index/
         record = Article.find(record_id)
-        Client.index  index: 'articles', type: 'article', id: record.id, body: record.__opensearch__.as_indexed_json
+        Client.index  index: 'articles', id: record.id, body: record.__opensearch__.as_indexed_json
       when /delete/
         begin
-          Client.delete index: 'articles', type: 'article', id: record_id
+          Client.delete index: 'articles', id: record_id
         rescue OpenSearch::Transport::Transport::Errors::NotFound
           logger.debug "Article not found, ID: #{record_id}"
         end

opensearch-model/examples/activerecord_article.rb

@@ -64,7 +64,6 @@ class Article < ActiveRecord::Base
 
 client.indices.delete index: 'articles' rescue nil
 client.bulk index: 'articles',
-            type:  'article',
             body:  Article.all.as_json.map { |a| { index: { _id: a.delete('id'), data: a } } },
             refresh: true