Merge pull request #68 from hathitrust/DEV-1478_db_credentials_from_ENV

DEV-1478 hathifiles: update which env vars it uses

Gemfile.lock

@@ -7,10 +7,10 @@ GIT
 
 GIT
   remote: https://github.com/hathitrust/hathifiles_database.git
-  revision: 254667029a039557748431a547333eaa315d1f7b
+  revision: 0939c84c8af95757fc00ea9be16f7247709643ee
   branch: main
   specs:
-    hathifiles_database (0.4.1)
+    hathifiles_database (0.5.0)
       date_named_file
       dotenv
       ettin
@@ -246,7 +246,6 @@ DEPENDENCIES
   fast_jsonparser
   filter!
   hathifiles_database!
-  httpclient
   marc
   milemarker
   mysql2

README.md

@@ -1,4 +1,4 @@
-[![Tests](https://github.com/hathitrust/hathifiles/actions/workflows/ci.yml/badge.svg)](https://github.com/hathitrust/hathifiles/actions/workflows/ci.yml)
+[![Test Status](https://github.com/hathitrust/hathifiles/actions/workflows/tests.yml/badge.svg)](https://github.com/hathitrust/hathifiles/actions/workflows/tests.yml)
 [![Coverage Status](https://coveralls.io/repos/github/hathitrust/hathifiles/badge.svg?branch=main)](https://coveralls.io/github/hathitrust/hathifiles?branch=main)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
 

config/environments/production.yml

@@ -1,10 +1,3 @@
-database:
-  opts:
-    adapter: 'mysql2'
-    host: <%= ENV['DB_HOST'] %>
-    database: <%= ENV['DB_DATABASE'] %>
-    user: <%= ENV['DB_USER'] %>
-    password: <%= ENV['DB_PASSWORD'] %>
 hathifiles_web_path: <%= ENV['HATHIFILES_WEB_PATH'] %>
 zephir_dir: <%= ENV['ZEPHIR_DIR'] %>
 hathifiles_dir: <%= ENV['HATHIFILES_DIR'] %>

docker-compose.yml

@@ -20,7 +20,10 @@ services:
       mariadb: *healthy
       pushgateway: *healthy
     environment:
-      MYSQL_CONNECTION_STRING: "mysql2://ht_rights:ht_rights@mariadb/ht"
+      MARIADB_HT_RO_USERNAME: ht_rights
+      MARIADB_HT_RO_PASSWORD: ht_rights
+      MARIADB_HT_RO_HOST: mariadb
+      MARIADB_HT_RO_DATABASE: ht
       PUSHGATEWAY: http://pushgateway:9091
 
   mariadb:

lib/hathifiles.rb

@@ -2,7 +2,6 @@
 
 require_relative "bib_record"
 require_relative "collections_database/collections"
-require_relative "database"
 require_relative "hathifile_history/records"
 require_relative "hathifile_history/record"
 require_relative "hathifile_history/htid_history_entry"

lib/services.rb

@@ -2,15 +2,23 @@
 
 require "canister"
 require "sequel"
-require "database"
 require "collections_database/collections"
 require "sdr_num_prefixes"
 require "logger"
 
 Services = Canister.new
 
 Services.register(:db) do
-  Database.new
+  # Read-only connection to database for verifying rights DB vs .rights files
+  # as well as hathifiles tables.
+  Sequel.connect(
+    adapter: "mysql2",
+    user: ENV["MARIADB_HT_RO_USERNAME"],
+    password: ENV["MARIADB_HT_RO_PASSWORD"],
+    host: ENV["MARIADB_HT_RO_HOST"],
+    database: ENV["MARIADB_HT_RO_DATABASE"],
+    encoding: "utf8mb4"
+  )
 end
 
 Services.register(:collections) do