Commit 02088137 authored by Ash McKenzie's avatar Ash McKenzie

Use write_stderr instead of $stderr.puts

parent 3a79ac9d
require 'base64' require 'base64'
require_relative '../http_helper' require_relative '../http_helper'
require_relative '../console_helper'
module Action module Action
class Custom class Custom
include HTTPHelper include HTTPHelper
include ConsoleHelper
class BaseError < StandardError; end class BaseError < StandardError; end
class MissingPayloadError < BaseError; end class MissingPayloadError < BaseError; end
...@@ -105,7 +107,7 @@ module Action ...@@ -105,7 +107,7 @@ module Action
end end
def format_gitlab_output(str) def format_gitlab_output(str)
str.split("\n").map { |line| "> GitLab: #{line}" }.join("\n") format_for_stderr(str.split("\n")).join("\n")
end end
def validate! def validate!
......
...@@ -6,8 +6,11 @@ require 'pathname' ...@@ -6,8 +6,11 @@ require 'pathname'
require_relative 'gitlab_net' require_relative 'gitlab_net'
require_relative 'gitlab_metrics' require_relative 'gitlab_metrics'
require_relative 'action' require_relative 'action'
require_relative 'console_helper'
class GitlabShell # rubocop:disable Metrics/ClassLength class GitlabShell # rubocop:disable Metrics/ClassLength
include ConsoleHelper
class AccessDeniedError < StandardError; end class AccessDeniedError < StandardError; end
class DisallowedCommandError < StandardError; end class DisallowedCommandError < StandardError; end
class InvalidRepositoryPathError < StandardError; end class InvalidRepositoryPathError < StandardError; end
...@@ -82,18 +85,18 @@ class GitlabShell # rubocop:disable Metrics/ClassLength ...@@ -82,18 +85,18 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
true true
rescue GitlabNet::ApiUnreachableError rescue GitlabNet::ApiUnreachableError
$stderr.puts "GitLab: Failed to authorize your Git request: internal API unreachable" write_stderr('Failed to authorize your Git request: internal API unreachable')
false false
rescue AccessDeniedError => ex rescue AccessDeniedError => ex
$logger.warn('Access denied', command: origin_cmd, user: log_username) $logger.warn('Access denied', command: origin_cmd, user: log_username)
$stderr.puts "GitLab: #{ex.message}" write_stderr(ex.message)
false false
rescue DisallowedCommandError rescue DisallowedCommandError
$logger.warn('Denied disallowed command', command: origin_cmd, user: log_username) $logger.warn('Denied disallowed command', command: origin_cmd, user: log_username)
$stderr.puts "GitLab: Disallowed command" write_stderr('Disallowed command')
false false
rescue InvalidRepositoryPathError rescue InvalidRepositoryPathError
$stderr.puts "GitLab: Invalid repository path" write_stderr('Invalid repository path')
false false
rescue Action::Custom::BaseError => ex rescue Action::Custom::BaseError => ex
$logger.warn('Custom action error', exception: ex.class, message: ex.message, $logger.warn('Custom action error', exception: ex.class, message: ex.message,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment