diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-11-27 13:42:10 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-11-27 13:46:33 -0800 |
| commit | b4f6fbd8cba3e7678462e68e6fc63df23b763187 (patch) | |
| tree | 96e36c8cd09c8ccda11e28a05b56ec45f5128087 | |
| parent | e77f89e167a5e3568df3ff9a01b10b4263bcaa01 (diff) | |
| download | gitlab-shell-sh-fix-circular-dependency-errors.tar.gz | |
Remove circular dependency between HTTPHelper and GitlabNetsh-fix-circular-dependency-errors
HttpHelper depended on exceptions defined in GitLabNet, but GitLabNet
included HttpHelper. Specs in Ruby 2.5 were breaking as a result of
Action::Custom not able to reference constants in GitLabNet:
https://gitlab.com/gitlab-org/gitlab-shell/-/jobs/126362702.
Closes https://gitlab.com/gitlab-org/gitlab-shell/issues/169
| -rw-r--r-- | lib/gitlab_net.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab_net/errors.rb | 4 | ||||
| -rw-r--r-- | lib/http_helper.rb | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index bba68f3..cae3bdb 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -10,9 +10,6 @@ require_relative 'http_helper' class GitlabNet # rubocop:disable Metrics/ClassLength include HTTPHelper - class ApiUnreachableError < StandardError; end - class NotFound < StandardError; end - CHECK_TIMEOUT = 5 API_INACCESSIBLE_MESSAGE = 'API is not accessible'.freeze diff --git a/lib/gitlab_net/errors.rb b/lib/gitlab_net/errors.rb new file mode 100644 index 0000000..f32b3d8 --- /dev/null +++ b/lib/gitlab_net/errors.rb @@ -0,0 +1,4 @@ +class GitlabNet + class ApiUnreachableError < StandardError; end + class NotFound < StandardError; end +end diff --git a/lib/http_helper.rb b/lib/http_helper.rb index b2a6211..c66df53 100644 --- a/lib/http_helper.rb +++ b/lib/http_helper.rb @@ -1,5 +1,6 @@ require_relative 'httpunix' require_relative 'gitlab_logger' +require_relative 'gitlab_net/errors' module HTTPHelper READ_TIMEOUT = 300 |