From a7bc9c7f8fefbe5d674e50c86f52e862fa427c46 Mon Sep 17 00:00:00 2001
From: jazairi <16103405+jazairi@users.noreply.github.com>
Date: Tue, 19 Dec 2023 08:11:36 -0500
Subject: [PATCH] Update opensearch

Why these changes are being introduced:

We had pinned opensearch to v2.1 in the gemfile due to an
upstream bug in more recent versions. That bug has been fixed,
so we can now update the gem.

Relevant ticket(s):

N/A.

How this addresses that need:

This removes the version specification for opensearch and
updates the gem.

Side effects of this change:

* The test suite now generates `test.sqlite3-shm` and
`test.sqlite3-war` files. I've updated the gitignore to ignore
these (and any suffixed `test.sqlite3` files).
* The psych gem has been updated, unrelated to the opensearch
update.
---
 .gitignore   |  3 +--
 Gemfile      |  2 +-
 Gemfile.lock | 13 ++++---------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 509fb93..66efeae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,7 @@
 /.bundle
 
 # Ignore the default SQLite database.
-/db/*.sqlite3
-/db/*.sqlite3-journal
+/db/*.sqlite3*
 
 # Ignore all logfiles and tempfiles.
 /log/*
diff --git a/Gemfile b/Gemfile
index 730317b..b270efe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'graphql'
 gem 'jwt'
 gem 'lograge'
 gem 'mitlibraries-theme', git: 'https://github.com/mitlibraries/mitlibraries-theme', tag: 'v1.0.2'
-gem 'opensearch-ruby', '~> 2.1'
+gem 'opensearch-ruby'
 gem 'puma'
 gem 'rack-attack'
 gem 'rack-cors'
diff --git a/Gemfile.lock b/Gemfile.lock
index e05c22f..bcf78f5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -236,14 +236,9 @@ GEM
     nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    opensearch-api (2.2.0)
-      multi_json
-    opensearch-ruby (2.1.0)
-      opensearch-api (~> 2.1)
-      opensearch-transport (~> 2.0)
-    opensearch-transport (2.1.0)
+    opensearch-ruby (3.1.0)
       faraday (>= 1.0, < 3)
-      multi_json
+      multi_json (>= 1.0)
     orm_adapter (0.5.0)
     parallel (1.24.0)
     parser (3.2.2.4)
@@ -252,7 +247,7 @@ GEM
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     pg (1.5.4)
-    psych (5.1.1.1)
+    psych (5.1.2)
       stringio
     public_suffix (5.0.4)
     puma (6.4.0)
@@ -434,7 +429,7 @@ DEPENDENCIES
   listen
   lograge
   mitlibraries-theme!
-  opensearch-ruby (~> 2.1)
+  opensearch-ruby
   pg
   puma
   rack-attack