Merge d7e650f into d748c39

Gemfile

@@ -17,7 +17,7 @@ gem 'rack-timeout', '~> 0.5.1'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.1.0', require: false
 
-gem 'dor-services', '~> 7.0'
+gem 'dor-services', '~> 8.0'
 gem 'okcomputer' # for monitoring
 gem 'rsolr', '~> 2.0'
 

Gemfile.lock

@@ -86,16 +86,11 @@ GEM
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
     capistrano-shared_configs (0.2.2)
-    cocina-models (0.1.2)
-      dry-struct (~> 1.0)
-      dry-types (~> 1.1)
-      zeitwerk (~> 2.1)
     concurrent-ruby (1.1.5)
     config (2.0.0)
       activesupport (>= 4.2)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-schema (~> 1.0)
-    confstruct (0.2.7)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -118,14 +113,12 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dor-rights-auth (1.4.0)
       nokogiri
-    dor-services (7.2.4)
+    dor-services (8.1.1)
       active-fedora (>= 8.7.0, < 9)
       activesupport (~> 5.1)
-      confstruct (~> 0.2.7)
       deprecation (~> 0)
       dor-rights-auth (~> 1.0, >= 1.2.0)
-      dor-services-client (>= 1.5.0, < 3.0.0)
-      dor-workflow-client (~> 3.0)
+      dor-workflow-client (~> 3.8)
       druid-tools (>= 0.4.1)
       json (>= 1.8.1)
       nokogiri (~> 1.6)
@@ -134,18 +127,10 @@ GEM
       rest-client (>= 1.7, < 3)
       retries (~> 0.0.5)
       rsolr (>= 1.0.3, < 3)
-      ruby-cache (~> 0.3.0)
       rubydora (~> 2.1)
       solrizer (~> 3.0)
       stanford-mods (>= 2.3.1)
       stanford-mods-normalizer (~> 0.1)
-    dor-services-client (2.6.2)
-      activesupport (>= 4.2, < 7)
-      cocina-models (~> 0.1.0)
-      faraday (~> 0.15)
-      moab-versioning (~> 4.0)
-      nokogiri (~> 1.8)
-      zeitwerk (~> 2.1)
     dor-workflow-client (3.11.1)
       activesupport (>= 3.2.1, < 7)
       deprecation (>= 0.99.0)
@@ -178,11 +163,6 @@ GEM
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)
       dry-types (~> 1.2)
-    dry-struct (1.1.1)
-      dry-core (~> 0.4, >= 0.4.3)
-      dry-equalizer (~> 0.2)
-      dry-types (~> 1.0)
-      ice_nine (~> 0.11)
     dry-types (1.2.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
@@ -214,7 +194,6 @@ GEM
       domain_name (~> 0.5)
     i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
     iso-639 (0.2.8)
     jaro_winkler (1.5.4)
     json (2.2.0)
@@ -234,12 +213,6 @@ GEM
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.13.0)
-    moab-versioning (4.3.0)
-      confstruct
-      druid-tools (>= 1.0.0)
-      json
-      nokogiri
-      nokogiri-happymapper
     mods (2.4.1)
       edtf
       iso-639
@@ -255,8 +228,6 @@ GEM
     nio4r (2.5.2)
     nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
-    nokogiri-happymapper (0.8.1)
-      nokogiri (~> 1.5)
     nom-xml (1.1.0)
       activesupport (>= 3.2.18)
       i18n
@@ -360,7 +331,6 @@ GEM
       rubocop (>= 0.72.0)
     rubocop-rspec (1.37.0)
       rubocop (>= 0.68.1)
-    ruby-cache (0.3.0)
     ruby-progressbar (1.10.1)
     rubydora (2.1.0)
       activemodel (>= 4.2.10)
@@ -431,7 +401,7 @@ DEPENDENCIES
   config
   coveralls
   dlss-capistrano (~> 3.0)
-  dor-services (~> 7.0)
+  dor-services (~> 8.0)
   erubis
   faraday
   honeybadger (~> 3.0)

config/environment.rb

@@ -3,8 +3,5 @@
 # Load the Rails application.
 require_relative 'application'
 
-# load the dor-services config
-require Rails.root.join('config', 'dor_config')
-
 # Initialize the Rails application.
 Rails.application.initialize!

config/initializers/config.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Config.setup do |config|
+  config.const_name = 'Settings'
+  config.use_env = true
+  config.env_prefix = 'SETTINGS'
+  config.env_separator = '__'
+  # config.env_converter = :downcase
+end

config/initializers/dor_config.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+Dor.configure do
+  ssl do
+    cert_file Settings.SSL.CERT_FILE
+    key_file Settings.SSL.KEY_FILE
+    key_pass Settings.SSL.KEY_PASS
+  end
+
+  fedora do
+    url Settings.FEDORA_URL
+  end
+
+  solr do
+    url Settings.SOLRIZER_URL
+  end
+
+  workflow do
+    url Settings.WORKFLOW_URL
+    logfile Settings.WORKFLOW.LOGFILE
+    shift_age Settings.WORKFLOW.SHIFT_AGE
+  end
+
+  suri do
+    mint_ids     Settings.SURI.MINT_IDS
+    id_namespace Settings.SURI.ID_NAMESPACE
+    url          Settings.SURI.URL
+    user         Settings.SURI.USER
+    pass         Settings.SURI.PASS
+  end
+
+  stacks do
+    document_cache_host         Settings.STACKS.DOCUMENT_CACHE_HOST
+    local_workspace_root        Settings.STACKS.LOCAL_WORKSPACE_ROOT
+  end
+end

config/settings.yml

@@ -17,11 +17,6 @@ INDEXER:
   # the interval at which the indexer log is rotated
   LOG_ROTATION_INTERVAL: 'daily'
 
-# Metadata
-METADATA:
-  EXIST_URL: 'https://user:password@metadata.example.com/exist/rest'
-  CATALOG_URL: 'https://catalog.example.com/catalog/mods'
-
 # SSL
 SSL:
   CERT_FILE: 'cert_name.crt'
@@ -30,16 +25,9 @@ SSL:
 
 # Stacks
 STACKS:
-  DOCUMENT_CACHE_STORAGE_ROOT: '/foo/document_cache'
   DOCUMENT_CACHE_HOST: 'cache.example.com'
-  DOCUMENT_CACHE_USER: 'user'
   LOCAL_WORKSPACE_ROOT: '/foo/workspace'
   STORAGE_ROOT: '/bar'
-  HOST: 'stacks.example.com'
-  USER: 'user'
-
-# Stomp
-STOMP_CLIENT_ID: 'fedora_stomper'
 
 # Suri
 SURI:
@@ -57,8 +45,6 @@ WORKFLOW:
 MESSAGE_QUEUES: []
 
 # URLs
-DOR_SERVICES_URL: 'https://user:password@dor-services.example.com'
 FEDORA_URL: 'https://user:password@fedora.example.com:1000/fedora'
 SOLRIZER_URL: 'https://solr.example.com/solr/collection'
-STATUS_INDEXER_URL: 'https://status.example.com/render/?format=json&other=params'
 WORKFLOW_URL: 'https://workflow.example.com/workflow'