[MediaWiki-commits] [Gerrit] labstore: Remove redundant calls to lower() for user names - change (operations/puppet)

[Rush (Code Review)]

Rush has submitted this change and it was merged.

Change subject: labstore: Remove redundant calls to lower() for user names
..


labstore: Remove redundant calls to lower() for user names

create-dbusers lowered the case for user names, probably as an
artefact of previously (incorrectly) looking up the wiki user name
which always starts with a capital letter.  Shell user names however
are guaranteed to be lower case, and if they were not, mangling them
would be wrong.  Thus this change removes the calls to lower().

Additionally, this change rewrites the logic for stripping the project
prefix from service group names to not treat the project name as a
regular expression.

Change-Id: Ib0ef575324ad2cf8199295d0a67bea6ab78fb078
---
M modules/labstore/files/create-dbusers
1 file changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Rush: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/labstore/files/create-dbusers 
b/modules/labstore/files/create-dbusers
index 8c0695d..0e95812 100755
--- a/modules/labstore/files/create-dbusers
+++ b/modules/labstore/files/create-dbusers
@@ -18,7 +18,6 @@
 import ldap3
 import pymysql
 import yaml
-import re
 import os
 import string
 import random
@@ -48,11 +47,10 @@
 def homedir(self):
 prefix = '/srv/project/%s' % self.project
 if self.kind == 'user':
-return os.path.join(prefix, 'home', self.name.lower())
+return os.path.join(prefix, 'home', self.name)
 else:
 return os.path.join(
-prefix, 'project',
-re.sub(r'^%s\.' % self.project, '', self.name.lower())
+prefix, 'project', self.name[len(self.project) + 1:]
 )
 
 def __repr__(self):

-- 
To view, visit https://gerrit.wikimedia.org/r/295455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0ef575324ad2cf8199295d0a67bea6ab78fb078
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labstore: Remove redundant calls to lower() for user names - change (operations/puppet)

[Tim Landscheidt (Code Review)]

Hello Andrew Bogott, Yuvipanda, Chasemp,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/295455

to review the following change.

Change subject: labstore: Remove redundant calls to lower() for user names
..

labstore: Remove redundant calls to lower() for user names

create-dbusers lowered the case for user names, probably as an
artefact of previously (incorrectly) looking up the wiki user name
which always starts with a capital letter.  Shell user names however
are guaranteed to be lower case, and if they were not, mangling them
would be wrong.  Thus this change removes the calls to lower().

Additionally, this change rewrites the logic for stripping the project
prefix from service group names to not treat the project name as a
regular expression.

Change-Id: Ib0ef575324ad2cf8199295d0a67bea6ab78fb078
---
M modules/labstore/files/create-dbusers
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/295455/1

diff --git a/modules/labstore/files/create-dbusers 
b/modules/labstore/files/create-dbusers
index 8c0695d..0e95812 100755
--- a/modules/labstore/files/create-dbusers
+++ b/modules/labstore/files/create-dbusers
@@ -18,7 +18,6 @@
 import ldap3
 import pymysql
 import yaml
-import re
 import os
 import string
 import random
@@ -48,11 +47,10 @@
 def homedir(self):
 prefix = '/srv/project/%s' % self.project
 if self.kind == 'user':
-return os.path.join(prefix, 'home', self.name.lower())
+return os.path.join(prefix, 'home', self.name)
 else:
 return os.path.join(
-prefix, 'project',
-re.sub(r'^%s\.' % self.project, '', self.name.lower())
+prefix, 'project', self.name[len(self.project) + 1:]
 )
 
 def __repr__(self):

-- 
To view, visit https://gerrit.wikimedia.org/r/295455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0ef575324ad2cf8199295d0a67bea6ab78fb078
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits