Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc32

1 files changed, 31 insertions, 4 deletions

diff --git a/lib/gitlab/static_site_editor/config/file_config.rb b/lib/gitlab/static_site_editor/config/file_config.rb
index f647c85e1c8..315c603c1dd 100644
--- a/lib/gitlab/static_site_editor/config/file_config.rb
+++ b/lib/gitlab/static_site_editor/config/file_config.rb
@@ -3,11 +3,38 @@
 module Gitlab
   module StaticSiteEditor
     module Config
+      #
+      # Base GitLab Static Site Editor Configuration facade
+      #
       class FileConfig
-        def data
-          {
-            static_site_generator: 'middleman'
-          }
+        ConfigError = Class.new(StandardError)
+
+        def initialize(yaml)
+          content_hash = content_hash(yaml)
+          @global = Entry::Global.new(content_hash)
+          @global.compose!
+        rescue Gitlab::Config::Loader::FormatError => e
+          raise FileConfig::ConfigError, e.message
+        end
+
+        def valid?
+          @global.valid?
+        end
+
+        def errors
+          @global.errors
+        end
+
+        def to_hash_with_defaults
+          # NOTE: The current approach of simply mapping all the descendents' keys and values ('config')
+          #       into a flat hash may need to be enhanced as we add more complex, non-scalar entries.
+          @global.descendants.map { |descendant| [descendant.key, descendant.config] }.to_h
+        end
+
+        private
+
+        def content_hash(yaml)
+          Gitlab::Config::Loader::Yaml.new(yaml).load!
         end
       end
     end