Merge branch...

Merge branch '504-remove-the-session-duration-information-from-the-output-of-2fa_verify-command' into 'main'

Resolve "Remove the session duration information from the output of `2fa_verify` command"

See merge request gitlab-org/gitlab-shell!445

internal/command/twofactorverify/twofactorverify.go

@@ -46,7 +46,7 @@ func (c *Command) verifyOTP(ctx context.Context, otp string) error {
 
 	err = client.VerifyOTP(ctx, c.Args, otp)
 	if err == nil {
-		fmt.Fprint(c.ReadWriter.Out, "\nOTP validation successful. Git operations are allowed for the next 15 minutes.\n")
+		fmt.Fprint(c.ReadWriter.Out, "\nOTP validation successful. Git operations are now allowed.\n")
 	} else {
 		fmt.Fprintf(c.ReadWriter.Out, "\nOTP validation failed.\n%v\n", err)
 	}

internal/command/twofactorverify/twofactorverify_test.go

@@ -74,7 +74,7 @@ func TestExecute(t *testing.T) {
 			arguments: &commandargs.Shell{GitlabKeyId: "1"},
 			answer:    "123456\n",
 			expectedOutput: question +
-				"OTP validation successful. Git operations are allowed for the next 15 minutes.\n",
+				"OTP validation successful. Git operations are now allowed.\n",
 		},
 		{
 			desc:           "With bad response",

spec/gitlab_shell_two_factor_verify_spec.rb

@@ -75,7 +75,7 @@ describe 'bin/gitlab-shell 2fa_verify' do
 
       stdin.puts('123456')
 
-      expect(stdout.flush.read).to eq("\nOTP validation successful. Git operations are allowed for the next 15 minutes.\n")
+      expect(stdout.flush.read).to eq("\nOTP validation successful. Git operations are now allowed.\n")
     end
   end
 end