summaryrefslogtreecommitdiff
path: root/internal/command/shared
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-09-11 23:01:40 +1000
committerIgor Drozdov <idrozdov@gitlab.com>2019-10-23 11:07:22 +0300
commit1bade9e198f08437ad150e63dc751edb862a6f51 (patch)
treeddc792be9340130c00cbac2faa30a1da1ccf7428 /internal/command/shared
parent412ed17cc66d876c46ee8df3767066ca0e676f28 (diff)
downloadgitlab-shell-1bade9e198f08437ad150e63dc751edb862a6f51.tar.gz
More consistent console messages (golang)
Diffstat (limited to 'internal/command/shared')
-rw-r--r--internal/command/shared/accessverifier/accessverifier.go6
-rw-r--r--internal/command/shared/accessverifier/accessverifier_test.go2
-rw-r--r--internal/command/shared/disallowedcommand/disallowedcommand.go2
3 files changed, 4 insertions, 6 deletions
diff --git a/internal/command/shared/accessverifier/accessverifier.go b/internal/command/shared/accessverifier/accessverifier.go
index 3aaf98d..5d2d709 100644
--- a/internal/command/shared/accessverifier/accessverifier.go
+++ b/internal/command/shared/accessverifier/accessverifier.go
@@ -2,11 +2,11 @@ package accessverifier
import (
"errors"
- "fmt"
"gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/internal/config"
+ "gitlab.com/gitlab-org/gitlab-shell/internal/console"
"gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier"
)
@@ -39,7 +39,5 @@ func (c *Command) Verify(action commandargs.CommandType, repo string) (*Response
}
func (c *Command) displayConsoleMessages(messages []string) {
- for _, msg := range messages {
- fmt.Fprintf(c.ReadWriter.ErrOut, "> GitLab: %v\n", msg)
- }
+ console.DisplayInfoMessages(messages, c.ReadWriter.ErrOut)
}
diff --git a/internal/command/shared/accessverifier/accessverifier_test.go b/internal/command/shared/accessverifier/accessverifier_test.go
index 39c2a66..cfcf4a8 100644
--- a/internal/command/shared/accessverifier/accessverifier_test.go
+++ b/internal/command/shared/accessverifier/accessverifier_test.go
@@ -77,6 +77,6 @@ func TestConsoleMessages(t *testing.T) {
cmd.Args = &commandargs.Shell{GitlabKeyId: "1"}
cmd.Verify(action, repo)
- require.Equal(t, "> GitLab: console\n> GitLab: message\n", errBuf.String())
+ require.Equal(t, "remote: \nremote: console\nremote: message\nremote: \n", errBuf.String())
require.Empty(t, outBuf.String())
}
diff --git a/internal/command/shared/disallowedcommand/disallowedcommand.go b/internal/command/shared/disallowedcommand/disallowedcommand.go
index 3c98bcc..794944f 100644
--- a/internal/command/shared/disallowedcommand/disallowedcommand.go
+++ b/internal/command/shared/disallowedcommand/disallowedcommand.go
@@ -3,5 +3,5 @@ package disallowedcommand
import "errors"
var (
- Error = errors.New("> GitLab: Disallowed command")
+ Error = errors.New("Disallowed command")
)