Merge branch 'zj-validation-initializer' into 'master'

Remove method call to deprecated method

See merge request gitlab-org/gitlab-ce!18815

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/gitlab/gitaly_client/storage_settings.rb b/lib/gitlab/gitaly_client/storage_settings.rb
index 8668caf0c55..9a576e463e3 100644
--- a/lib/gitlab/gitaly_client/storage_settings.rb
+++ b/lib/gitlab/gitaly_client/storage_settings.rb
@@ -5,6 +5,14 @@ module Gitlab
     # directly.
     class StorageSettings
       DirectPathAccessError = Class.new(StandardError)
+      InvalidConfigurationError = Class.new(StandardError)
+
+      INVALID_STORAGE_MESSAGE = <<~MSG.freeze
+        Storage is invalid because it has no `path` key.
+
+        For source installations, update your config/gitlab.yml Refer to gitlab.yml.example for an updated example.
+        If you're using the Gitlab Development Kit, you can update your configuration running `gdk reconfigure`.
+      MSG
 
       # This class will give easily recognizable NoMethodErrors
       Deprecated = Class.new
@@ -12,7 +20,8 @@ module Gitlab
       attr_reader :legacy_disk_path
 
       def initialize(storage)
-        raise "expected a Hash, got a #{storage.class.name}" unless storage.is_a?(Hash)
+        raise InvalidConfigurationError, "expected a Hash, got a #{storage.class.name}" unless storage.is_a?(Hash)
+        raise InvalidConfigurationError, INVALID_STORAGE_MESSAGE unless storage.has_key?('path')
 
         # Support a nil 'path' field because some of the circuit breaker tests use it.
         @legacy_disk_path = File.expand_path(storage['path'], Rails.root) if storage['path']