deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 12:21:35 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Minor locations/sshPublicKeys cleanup (#571)

Browse Source 
* Minor locations/sshPublicKeys cleanup

Make options names internally consistent and consistent with other commands.

Drop publicsshkeys, too may choices

Change title to SSH Public Keys to match Google's title

* Simplify UserAttributes
This commit is contained in:
Ross Scroggs
2017-09-15 19:20:52 -07:00
committed by Jay Lee
parent 86297a08bd
commit a72ef287e3
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/GamCommands.txt
View File

@@ -380,13 +380,16 @@ Named items
is2svenforced|
is2svenrolled|
lastlogintime|
locations|location|
noneditablealiases|aliases|nicknames|
notes|note|
organizations|organization|
orgunitpath|org|ou|
phones|phone|
posixaccounts|posix|
primaryemail|username|
relations|relation|
ssh|sshkeys|sshpublickeys|
suspended|
thumbnailphotourl|photo|photourl|
websites|website|
@@ -541,7 +544,7 @@ Item attributes
field <FieldName> (type bool|date|double|email|int64|phone|string) [multivalued|multivalue] [indexed] [restricted] [range <Number> <Number>] endfield
<UserAttributes> ::=
(address|addresses clear|(type work|home|other|(custom <String>) [unstructured|formatted <String>] [pobox <String>] [extendedaddress <String>] [streetaddress <String>]
(address clear|(type work|home|other|(custom <String>) [unstructured|formatted <String>] [pobox <String>] [extendedaddress <String>] [streetaddress <String>]
[locality <String>] [region <String>] [postalcode <String>] [country <String>] [countrycode <String>] notprimary|primary))|
(admin <Boolean>)|
(agreed2terms|agreedtoterms <Boolean>)|
@@ -549,23 +552,26 @@ Item attributes
(crypt|sha|sha1|sha-1|md5|nohash)|
(customerid <String>)|
(email|primaryemail|username <EmailAddress>)|
(emails|otheremail|otheremails clear|(work|home|other|<String> <String>))|
(externalid|externalids clear|(account|customer|network|organization|<String> <String>))|
(otheremail clear|(work|home|other|<String> <String>))|
(externalid clear|(account|customer|network|organization|<String> <String>))|
(firstname|givenname <String>)|
(gal|includeinglobaladdresslist <Boolean>)|
(im|ims clear|(type work|home|other|(custom <String>) protocol aim|gtalk|icq|jabber|msn|net_meeting|qq|skype|yahoo|(custom_protocol <String>) <String> [notprimary|primary]))|
(im clear|(type work|home|other|(custom <String>) protocol aim|gtalk|icq|jabber|msn|net_meeting|qq|skype|yahoo|(custom_protocol <String>) <String> [notprimary|primary]))|
(ipwhitelisted <Boolean>)|
(lastname|familyname <String>)|
(note|notes clear|([text_plain|text_html] <String>|(file <FileName> [charset <Charset>])))|
(organization|organizations clear|([type domain_only|school|unknown|work] [customtype <String>] [name <String>] [title <String>] [department <String>] [symbol <String>]
(location clear|(type default|desk|<String> area <String> [building|buildingid <String>] [floor|floorname <String>] [section|floorsection <String>] [desk|deskcode <String>] endlocation))|
(note clear|([text_plain|text_html] <String>|(file <FileName> [charset <Charset>])))|
(organization clear|([type domain_only|school|unknown|work] [customtype <String>] [name <String>] [title <String>] [department <String>] [symbol <String>]
[costcenter <String>] [location <String>] [description <String>] [domain <String>] notprimary|primary))|
(org|ou|orgunitpath <OrgUnitPath>)
(password random|<String>)|
(phone|phones clear|([type work|home|other|work_fax|home_fax|other_fax|main|company_main|assistant|mobile|work_mobile|pager|work_pager|car|radio|callback|isdn|telex|tty_tdd|grand_central|(custom <String>)]
(phone clear|([type work|home|other|work_fax|home_fax|other_fax|main|company_main|assistant|mobile|work_mobile|pager|work_pager|car|radio|callback|isdn|telex|tty_tdd|grand_central|(custom <String>)]
[value <String>] notprimary|primary))|
(relation|relations clear|(spouse|child|mother|father|parent|brother|sister|friend|relative|domestic_partner|manager|assistant|referred_by|partner|<String> <String>))|
(posix clear|(username <String> uid <Integer> gid <Integer> [system|systemid <String>] [home|homedirectory <String>] [shell <String>] [gecos <String>] [primary <Boolean>] endposix))|
(relation clear|(spouse|child|mother|father|parent|brother|sister|friend|relative|domestic_partner|manager|assistant|referred_by|partner|<String> <String>))|
(sshkeys clear|(key <String> [expires <Integer>] endssh))|
(suspended <Boolean>)|
(website|websites clear|(home_page|blog|profile|work|home|other|ftp|reservations|app_install_page|<String> <URL> [notprimary|primary]))|
(website clear|(home_page|blog|profile|work|home|other|ftp|reservations|app_install_page|<String> <URL> [notprimary|primary]))|
(<SchemaName>.<FieldName> [multivalued|multivalue|value|multinonempty [type work|home|other|(custom <String>)]] <String>)
gam version [check] [simple]

10
src/gam.py
View File

@@ -6767,7 +6767,7 @@ def getUserAttributes(i, cd, updateCmd=False):
note[u'value'] = sys.argv[i].replace(u'\\n', u'\n')
i += 1
body[u'notes'] = note
elif myarg == u'location':
elif myarg in [u'location', u'locations']:
i += 1
if checkClearBodyList(i, body, u'locations'):
i += 1
@@ -6803,7 +6803,7 @@ def getUserAttributes(i, cd, updateCmd=False):
print u'ERROR: %s is not a valid argument for user location details. Make sure user location details end with an endlocation argument'
sys.exit(3)
appendItemToBodyList(body, u'locations', location)
elif myarg in [u'ssh', u'sshpublickeys', u'sshkeys']:
elif myarg in [u'ssh', u'sshkeys', u'sshpublickeys']:
i += 1
if checkClearBodyList(i, body, u'sshPublicKeys'):
i += 1
@@ -6824,7 +6824,7 @@ def getUserAttributes(i, cd, updateCmd=False):
print u'ERROR: %s is not a valid argument for user ssh details. Make sure user ssh details end with an endssh argument'
sys.exit(3)
appendItemToBodyList(body, u'sshPublicKeys', ssh)
elif myarg in [u'posix', u'posixaccount']:
elif myarg in [u'posix', u'posixaccounts']:
i += 1
if checkClearBodyList(i, body, u'posixAccounts'):
i += 1
@@ -8614,7 +8614,7 @@ def doGetUserInfo(user_email=None):
print utils.convertUTF8(u' %s: %s' % (key, location[key]))
print u''
if u'sshPublicKeys' in user:
print u'Public SSH Keys:'
print u'SSH Public Keys:'
for sshkey in user[u'sshPublicKeys']:
for key in sshkey:
print utils.convertUTF8(u' %s: %s' % (key, sshkey[key]))
@@ -9724,7 +9724,7 @@ USER_ARGUMENT_TO_PROPERTY_MAP = {
u'relations': [u'relations',],
u'ssh': [u'sshPublicKeys',],
u'sshkeys': [u'sshPublicKeys',],
u'publicsshkeys': [u'sshPublicKeys',],
u'sshpublickeys': [u'sshPublicKeys',],
u'suspended': [u'suspended', u'suspensionReason',],
u'thumbnailphotourl': [u'thumbnailPhotoUrl',],
u'username': [u'primaryEmail',],