resolve comments

lib/auth/init.go

@@ -711,8 +711,8 @@ func generateAuthority(ctx context.Context, asrv *Server, caID types.CertAuthID)
 }
 
 var secondFactorUpgradeInstructions = `
-Teleport v16 removed support for local authentication without a second
-factor enabled. The auth_service should be updated to enable it.
+Teleport requires second factor authentication for local users.
+The auth_service configuration should be updated to enable it.
 
 auth_service:
   authentication:
@@ -722,7 +722,6 @@ auth_service:
 
 For more information:
 - https://goteleport.com/docs/access-controls/guides/webauthn/
-- https://goteleport.com/docs/changelog/
 `
 
 func initializeAuthPreference(ctx context.Context, asrv *Server, newAuthPref types.AuthPreference) error {

lib/modules/modules.go

@@ -331,7 +331,7 @@ func GetModules() Modules {
 	return modules
 }
 
-var ErrCannotDisableSecondFactor = errors.New("cannot disable two-factor authentication")
+var ErrCannotDisableSecondFactor = errors.New("cannot disable multi-factor authentication")
 
 // ValidateResource performs additional resource checks.
 func ValidateResource(res types.Resource) error {

lib/modules/modules_test.go

@@ -60,7 +60,7 @@ func TestValidateAuthPreferenceOnCloud(t *testing.T) {
 
 	authPref.SetSecondFactor(constants.SecondFactorOff)
 	_, err = testServer.AuthServer.UpdateAuthPreference(ctx, authPref)
-	require.EqualError(t, err, "cannot disable two-factor authentication")
+	require.EqualError(t, err, modules.ErrCannotDisableSecondFactor.Error())
 }
 
 func TestValidateSessionRecordingConfigOnCloud(t *testing.T) {