pash: Change component where bugs are file when Mercurial accounts are disabled because of inactivity. Move from Moc Service Request to LDAP. bug 1532963 r=sheehan
authorLudovic Hirlimann <ludovic@mozilla.com>
Thu, 07 Mar 2019 14:45:05 +0000
changeset 6875 33ee1b57476c
parent 6874 6160c590b717
child 6876 68f59905d10e
push id3424
push usercosheehan@mozilla.com
push dateThu, 07 Mar 2019 14:45:51 +0000
treeherderversion-control-tools@33ee1b57476c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssheehan
bugs1532963
pash: Change component where bugs are file when Mercurial accounts are disabled because of inactivity. Move from Moc Service Request to LDAP. bug 1532963 r=sheehan Before this change, when an account is expired the message displayed says to open a bug in Moc Service request. Moc is no more , changing the message to file a bug in the LDAP component. Differential Revision: https://phabricator.services.mozilla.com/D22466
hgserver/pash/pash.py
hgserver/tests/test-pash-auth.t
--- a/hgserver/pash/pash.py
+++ b/hgserver/pash/pash.py
@@ -28,18 +28,18 @@ HG_ACCESS_DISABLED = '''
 A SSH connection has been established, your account (%s)
 was found in LDAP, and your account has been configured for Mercurial
 access.
 
 However, Mercurial access is currently disabled on your account.
 This commonly occurs due to account inactivity (you need to SSH
 into hg.mozilla.org every few months to keep your account active).
 
-To restore Mercurial access, please file a MOC Service Request
-bug (http://tinyurl.com/njcfhma) and request hg access be restored
+To restore Mercurial access, please file a LDAP
+bug (https://tinyurl.com/yxufmrro) and request hg access be restored
 for %s.
 '''.lstrip()
 
 AUTOLAND_USER = 'bind-autoland@mozilla.com'
 
 
 def source_environment(path):
     """Source a file with environment variables.
--- a/hgserver/tests/test-pash-auth.t
+++ b/hgserver/tests/test-pash-auth.t
@@ -355,18 +355,18 @@ hgAccountEnabled=FALSE shows account dis
   A SSH connection has been established, your account (hgdisabled@example.com)
   was found in LDAP, and your account has been configured for Mercurial
   access.
   
   However, Mercurial access is currently disabled on your account.
   This commonly occurs due to account inactivity (you need to SSH
   into hg.mozilla.org every few months to keep your account active).
   
-  To restore Mercurial access, please file a MOC Service Request
-  bug (http://tinyurl.com/njcfhma) and request hg access be restored
+  To restore Mercurial access, please file a LDAP
+  bug (https://tinyurl.com/yxufmrro) and request hg access be restored
   for hgdisabled@example.com.
 
 Failure to connect to LDAP mirror locks us out
 What happens here is nscd caches the valid passwd entry lookup for the user.
 However, the SSH key lookup via LDAP fails and this manifests as no public keys
 available.
 
   $ hgmo exec hgssh /set-ldap-property url ldap://localhost:6000