Display the username instead of fullname

When running `ssh git@gitlab.example.com` we used to reply with the
full name. But it might actually be more useful to display the
username. This is unique and can help support identifying issues.

Closes #131

3 files changed, 8 insertions, 8 deletions

diff --git a/VERSION b/VERSION
index a8a1887..1996c50 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.1.2
+7.1.3
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index b38fefe..0221624 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -18,7 +18,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
   API_COMMANDS = %w(2fa_recovery_codes).freeze
   GL_PROTOCOL = 'ssh'.freeze
 
-  attr_accessor :key_id, :gl_repository, :repo_name, :command, :git_access, :username
+  attr_accessor :key_id, :gl_repository, :repo_name, :command, :git_access
   attr_reader :repo_path
 
   def initialize(key_id)
@@ -197,7 +197,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
   end
 
   def username
-    user && user['name'] || 'Anonymous'
+    @username ||= user && user['username'] || 'Anonymous'
   end
 
   # User identifier to be used in log messages.
diff --git a/spec/gitlab_shell_spec.rb b/spec/gitlab_shell_spec.rb
index c3d4466..0e8999b 100644
--- a/spec/gitlab_shell_spec.rb
+++ b/spec/gitlab_shell_spec.rb
@@ -167,7 +167,7 @@ describe GitlabShell do
 
       it "should use usernames if configured to do so" do
         GitlabConfig.any_instance.stub(audit_usernames: true)
-        $logger.should_receive(:info).with("executing git command", hash_including(user: 'John Doe'))
+        $logger.should_receive(:info).with("executing git command", hash_including(user: 'testuser'))
       end
     end
 
@@ -202,7 +202,7 @@ describe GitlabShell do
 
       it "should use usernames if configured to do so" do
         GitlabConfig.any_instance.stub(audit_usernames: true)
-        $logger.should_receive(:info).with("executing git command", hash_including(user: 'John Doe'))
+        $logger.should_receive(:info).with("executing git command", hash_including(user: 'testuser'))
       end
     end
 
@@ -248,7 +248,7 @@ describe GitlabShell do
 
       it "should use usernames if configured to do so" do
         GitlabConfig.any_instance.stub(audit_usernames: true)
-        $logger.should_receive(:info).with("executing git command", hash_including(user: 'John Doe'))
+        $logger.should_receive(:info).with("executing git command", hash_including(user: 'testuser'))
       end
     end
 
@@ -275,7 +275,7 @@ describe GitlabShell do
 
       it "should use usernames if configured to do so" do
         GitlabConfig.any_instance.stub(audit_usernames: true)
-        $logger.should_receive(:info).with("executing git command", hash_including(user: 'John Doe'))
+        $logger.should_receive(:info).with("executing git command", hash_including(user: 'testuser'))
       end
     end
 
@@ -452,7 +452,7 @@ describe GitlabShell do
     before do
       Kernel.stub(:exec)
       shell.gl_repository = gl_repository
-      shell.username = gl_username
+      shell.instance_variable_set(:@username, gl_username)
     end
 
     it "uses Kernel::exec method" do