Refactor common functionality. Introduce support for definitions

Author: chrisroberts

lib/sfn-parameters/infrastructure.rb

@@ -32,11 +32,47 @@ def after_config_update(*_)
       # @param stack_name [String]
       # @return [Smash]
       def load_file_for(stack_name)
-        root_path = config.fetch(:sfn_parameters, :directory, 'infrastructure')
         isolation_name = config.fetch(:sfn_parameters, :destination,
           ENV.fetch('SFN_PARAMETERS_DESTINATION', 'default')
         )
-        paths = Dir.glob(File.join(root_path, "#{isolation_name}{#{VALID_EXTENSIONS.join(',')}}")).map(&:to_s)
+        unpack_file(parameters_directory, isolation_name)
+      end
+
+      # Detect and expand defined definitions
+      #
+      # @param config [Smash] current configuration
+      # @return [Smash] expanded config
+      def expand_config_file(config)
+        new_config = config.to_smash
+        definitions = config.fetch(:definitions, [])
+        if(definitions.is_a?(Array))
+          definitions.each do |def_name|
+            definition = load_definition(def_name)
+            new_config.deep_merge!(definition)
+          end
+        end
+        new_config.keys.each do |key, value|
+          if(value.is_a?(Hash))
+            new_config[key] = expand_config_file(value)
+          end
+        end
+        new_config
+      end
+
+      # Define parameters directory for infrastructure based files
+      #
+      # @return [String]
+      def parameters_directory
+        config.fetch(:sfn_parameters, :directory, 'infrastructure')
+      end
+
+      # Read and unpack file
+      #
+      # @param directory [String] directory path
+      # @param name [String] file name without extension
+      # @return [Smash]
+      def unpack_file(directory, name)
+        paths = Dir.glob(File.join(directory, "#{name}{#{VALID_EXTENSIONS.join(',')}}")).map(&:to_s)
         if(paths.size > 1)
           raise ArgumentError.new "Multiple parameter file matches encountered! (#{paths.join(', ')})"
         elsif(paths.empty?)
@@ -46,6 +82,14 @@ def load_file_for(stack_name)
         end
       end
 
+      # Load defintion file of given name
+      #
+      # @param name [String] name of definition
+      # @return [Smash] definition contents
+      def load_definition(name)
+        unpack_file(File.join(parameters_directory, 'definitions'), name)
+      end
+
       # Process the given hash and set configuration values
       #
       # @param hash [Hash]

lib/sfn-parameters/stacks.rb

@@ -10,15 +10,14 @@ class ParametersStacks < ParametersInfrastructure
       # @param stack_name [String]
       # @return [Smash]
       def load_file_for(stack_name)
-        root_path = config.fetch(:sfn_parameters, :directory, 'stacks')
-        paths = Dir.glob(File.join(root_path, "#{stack_name}{#{VALID_EXTENSIONS.join(',')}}")).map(&:to_s)
-        if(paths.size > 1)
-          raise ArgumentError.new "Multiple parameter file matches encountered! (#{paths.join(', ')})"
-        elsif(paths.empty?)
-          Smash.new
-        else
-          unlock_content(Bogo::Config.new(paths.first).data)
-        end
+        unpack_file(parameters_directory, stack_name)
+      end
+
+      # Define parameters directory for stacks based files
+      #
+      # @return [String]
+      def parameters_directory
+        config.fetch(:sfn_parameters, :directory, 'stacks')
       end
 
     end