summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-04-02 17:11:15 +1100
committerAsh McKenzie <amckenzie@gitlab.com>2019-04-04 13:32:30 +1100
commit5cd13175c94912651202a61ab755cfead33a3ee9 (patch)
treeb69113a89dc6f80cafaca5dfaa0dc9c63873bb2f /lib
parent02088137c28f7b822a7d979f985ca38f3e0583ef (diff)
downloadgitlab-shell-5cd13175c94912651202a61ab755cfead33a3ee9.tar.gz
Using ConsoleHelper::write_stderr
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab_access_status.rb10
-rw-r--r--lib/gitlab_shell.rb2
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/gitlab_access_status.rb b/lib/gitlab_access_status.rb
index dc577f4..22e11a2 100644
--- a/lib/gitlab_access_status.rb
+++ b/lib/gitlab_access_status.rb
@@ -3,12 +3,14 @@ require 'json'
class GitAccessStatus
HTTP_MULTIPLE_CHOICES = '300'.freeze
- attr_reader :message, :gl_repository, :gl_project_path, :gl_id, :gl_username, :gitaly, :git_protocol, :git_config_options, :payload
+ attr_reader :message, :gl_repository, :gl_project_path, :gl_id, :gl_username,
+ :gitaly, :git_protocol, :git_config_options, :payload,
+ :gl_console_messages
def initialize(status, status_code, message, gl_repository: nil,
gl_project_path: nil, gl_id: nil,
gl_username: nil, gitaly: nil, git_protocol: nil,
- git_config_options: nil, payload: nil)
+ git_config_options: nil, payload: nil, gl_console_messages: [])
@status = status
@status_code = status_code
@message = message
@@ -20,6 +22,7 @@ class GitAccessStatus
@gitaly = gitaly
@git_protocol = git_protocol
@payload = payload
+ @gl_console_messages = gl_console_messages
end
def self.create_from_json(json, status_code)
@@ -34,7 +37,8 @@ class GitAccessStatus
git_config_options: values["git_config_options"],
gitaly: values["gitaly"],
git_protocol: values["git_protocol"],
- payload: values["payload"])
+ payload: values["payload"],
+ gl_console_messages: values["gl_console_messages"])
end
def allowed?
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index c615805..303f4d5 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -66,6 +66,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
@username = access_status.gl_username
@git_config_options = access_status.git_config_options
@gl_id = access_status.gl_id if defined?(@who)
+
+ write_stderr(access_status.gl_console_messages)
elsif !defined?(@gl_id)
# We're processing an API command like 2fa_recovery_codes, but
# don't have a @gl_id yet, that means we're in the "username"