Adjust config usage #34

Rails 7 simplifies usage of custom configuration loaded with `config_for`. This change makes use of these simplifications.
betadots · Jun 2, 2022 · 2035370 · 2035370
1 parent 5ccf243
commit 2035370
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/app/models/hiera_data.rb b/app/models/hiera_data.rb
@@ -81,7 +81,7 @@ def lookup_options(facts)
   private
 
   def config_dir
-    @config_dir ||= Rails.configuration.hdm["config_dir"]
+    @config_dir ||= Rails.configuration.hdm.config_dir
   end
 
   def config

diff --git a/app/models/hiera_data/config.rb b/app/models/hiera_data/config.rb
@@ -11,7 +11,7 @@ def initialize(base_path)
     private
 
     def load_content
-      full_path = @base_path.join(Rails.configuration.hdm["hiera_config_file"] || "hiera.yaml")
+      full_path = @base_path.join(Rails.configuration.hdm.hiera_config_file || "hiera.yaml")
       defaults = Puppet::Pops::Lookup::HieraConfigV5::DEFAULT_CONFIG_HASH
       config = if File.exist?(full_path)
                  parsed_file = YAML.load(File.read(full_path))

diff --git a/app/models/hiera_data/data_file.rb b/app/models/hiera_data/data_file.rb
@@ -47,7 +47,7 @@ def setup_git_location
     end
 
     def matching_git_location
-      Rails.configuration.hdm["git_data"]&.find do |git_data|
+      Rails.configuration.hdm.git_data&.find do |git_data|
         replaces_datadir = Interpolation
           .interpolate_facts(path: git_data[:datadir], facts: @facts)
         replaces_datadir << "/" unless replaces_datadir.last == "/"

diff --git a/app/models/hierarchy.rb b/app/models/hierarchy.rb
@@ -57,7 +57,7 @@ def eyaml?
 
   def encryption_possible?
     eyaml? &&
-      Rails.configuration.hdm['allow_encryption'] &&
+      Rails.configuration.hdm.allow_encryption &&
       @encryptable
   end
 

diff --git a/app/models/value.rb b/app/models/value.rb
@@ -19,7 +19,7 @@ def file_present?
   end
 
   def file_writable?
-    !Rails.configuration.hdm['read_only'] && @file_writable
+    !Rails.configuration.hdm.read_only && @file_writable
   end
 
   def key_present?

diff --git a/app/services/puppet_db_client.rb b/app/services/puppet_db_client.rb
@@ -38,7 +38,7 @@ def environments
     end
 
     def client
-      connection_hash = Rails.configuration.hdm["puppet_db"].with_indifferent_access
+      connection_hash = Rails.configuration.hdm.puppet_db
 
       PuppetDB::Client.new(connection_hash)
     end