Extract method that fetchesremote CI/CD included config

3 files changed, 12 insertions, 13 deletions

diff --git a/lib/gitlab/ci/config/external/file/remote.rb b/lib/gitlab/ci/config/external/file/remote.rb
index a19c7639b5a..291fe87849c 100644
--- a/lib/gitlab/ci/config/external/file/remote.rb
+++ b/lib/gitlab/ci/config/external/file/remote.rb
@@ -10,20 +10,20 @@ module Gitlab
             attr_reader :location
 
             def content
-              return @content if defined?(@content)
-
-              @content = strong_memoize(:content) do
-                begin
-                  Gitlab::HTTP.get(location)
-                rescue Gitlab::HTTP::Error, Timeout::Error, SocketError, Gitlab::HTTP::BlockedUrlError
-                  nil
-                end
-              end
+              strong_memoize(:content) { fetch_remote_content }
             end
 
             def error_message
               "Remote file '#{location}' is not valid."
             end
+
+            private
+
+            def fetch_remote_content
+              Gitlab::HTTP.get(location)
+            rescue Gitlab::HTTP::Error, Timeout::Error, SocketError, Gitlab::HTTP::BlockedUrlError
+              nil
+            end
           end
         end
       end
diff --git a/lib/gitlab/ci/config/external/processor.rb b/lib/gitlab/ci/config/external/processor.rb
index 32890f84de9..4f07494925a 100644
--- a/lib/gitlab/ci/config/external/processor.rb
+++ b/lib/gitlab/ci/config/external/processor.rb
@@ -6,7 +6,6 @@ module Gitlab
       module External
         class Processor
           IncludeError = Class.new(StandardError)
-          FileError = Class.new(IncludeError)
 
           def initialize(values, project, sha)
             @values = values
@@ -32,7 +31,7 @@ module Gitlab
 
           def validate_external_file(external_file)
             unless external_file.valid?
-              raise FileError, external_file.error_message
+              raise IncludeError, external_file.error_message
             end
           end
 
diff --git a/spec/lib/gitlab/ci/config/external/processor_spec.rb b/spec/lib/gitlab/ci/config/external/processor_spec.rb
index 0196e11628d..ede6e769cfe 100644
--- a/spec/lib/gitlab/ci/config/external/processor_spec.rb
+++ b/spec/lib/gitlab/ci/config/external/processor_spec.rb
@@ -20,7 +20,7 @@ describe Gitlab::Ci::Config::External::Processor do
 
       it 'should raise an error' do
         expect { processor.perform }.to raise_error(
-          described_class::FileError,
+          described_class::IncludeError,
           "Local file '/lib/gitlab/ci/templates/non-existent-file.yml' is not valid."
         )
       end
@@ -36,7 +36,7 @@ describe Gitlab::Ci::Config::External::Processor do
 
       it 'should raise an error' do
         expect { processor.perform }.to raise_error(
-          described_class::FileError,
+          described_class::IncludeError,
           "Remote file '#{remote_file}' is not valid."
         )
       end