Upgrade PyInstaller and hopefully fix Linux binary sizes

Licensing API seems to throw lots of errors on large batch and we weren't retrying temp errors. For now just stick with serial methods.

.travis.yml

@@ -10,7 +10,7 @@ env:
     - BUILD_OPENSSL_VERSION=1.1.1h
     - MIN_OPENSSL_VERSION=1.1.1h
     - PATCHELF_VERSION=0.11
-    - PYINSTALLER_COMMIT=ad39eb8df209d02636399ffdc44521a97886cf8c
+    - PYINSTALLER_COMMIT=7aa19839c171d898b5cf957739083c4bb901607e
 cache:
   directories:
     - $HOME/.cache/pip
@@ -64,14 +64,14 @@ jobs:
       name: "Python 3.9 dev Source Testing"
       language: python
       python: 3.9-dev
-    - os: linux
-      name: "Python trunk nightly Source Testing"
-      language: python
-      python: nightly
-    - os: linux
-      name: "Python PyPi Source Testing"
-      language: python
-      python: pypy3
+#    - os: linux
+#      name: "Python trunk nightly Source Testing"
+#      language: python
+#      python: nightly
+#    - os: linux
+#      name: "Python PyPi Source Testing"
+#      language: python
+#      python: pypy3
     - os: osx
       name: "MacOS 10.13"
       language: generic

src/GamCommands.txt

@@ -1027,7 +1027,10 @@ The following attributes are equivalent:
 	(colorindex|colorid <EventColorIndex>)
 	(description <String>)|
 	(end (allday <Date>)|<Time>)|
+	(guestscaninviteothers <Boolean>)|
 	guestscantinviteothers|
+	(guestscanmodify <Boolean>)|
+	(guestscanseeothers <Boolean>)|
 	guestscantseeothers|
 	hangoutsmeet|
 	(location <String>)|

src/gam/gapi/cloudidentity/groups.py

@@ -1,5 +1,3 @@
-import csv
-
 import gam
 from gam.var import *
 from gam import controlflow
@@ -9,7 +7,6 @@ from gam import utils
 from gam.gapi import errors as gapi_errors
 from gam.gapi import cloudidentity as gapi_cloudidentity
 from gam.gapi.directory import customer as gapi_directory_customer
-from gam.gapi.directory import groups as gapi_directory_groups
 
 
 def create():
@@ -583,14 +580,13 @@ def update():
                 name = membership_email_to_id(ci, parent, users_email[0])
                 addRoles = []
                 removeRoles = []
-                new_role = {'role': role}
                 current_roles = gapi.call(ci.groups().memberships(),
                                           'get',
                                           name=name,
                                           fields='roles').get('roles', [])
                 current_roles = [role['name'] for role in current_roles]
                 for crole in current_roles:
-                    if crole != ROLE_MEMBER and crole != role:
+                    if crole not in {ROLE_MEMBER, role}:
                         removeRoles.append(crole)
                 if role not in current_roles:
                     addRoles.append({'name': role})

src/gam/gapi/directory/asps.py

@@ -1,7 +1,6 @@
 import sys
 
 from gam.var import *
-from gam import controlflow
 from gam import gapi
 from gam.gapi import directory as gapi_directory
 from gam import utils

src/gam/gapi/directory/groups.py

@@ -221,11 +221,11 @@ def info_member():
     cd = gapi_directory.build()
     memberKey = gam.normalizeEmailAddressOrUID(sys.argv[3])
     groupKey = gam.normalizeEmailAddressOrUID(sys.argv[4])
-    info = gapi.call(cd.members(),
-                     'get',
-                     memberKey=memberKey,
-                     groupKey=groupKey)
-    display.print_json(info)
+    member_info = gapi.call(cd.members(),
+                            'get',
+                            memberKey=memberKey,
+                            groupKey=groupKey)
+    display.print_json(member_info)
 
 
 GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP = {
@@ -1146,7 +1146,7 @@ def update():
                 i += 2
             elif myarg == 'admincreated':
                 use_cd_api = True
-                cd_body['adminCreated'] = getBoolean(sys.argv[i + 1], myarg)
+                cd_body['adminCreated'] = gam.getBoolean(sys.argv[i + 1], myarg)
                 i += 2
             elif myarg == 'getbeforeupdate':
                 gs_get_before_update = True
@@ -1242,5 +1242,3 @@ def getGroupAttrValue(myarg, value, gs_object, gs_body, function):
             gs_body[attrib] = value
             return
     controlflow.invalid_argument_exit(myarg, f'gam {function} group')
-
-

src/gam/gapi/directory/mobiledevices.py

@@ -23,16 +23,16 @@ def delete():
 def info():
     cd = gapi_directory.build()
     resourceId = sys.argv[3]
-    info = gapi.call(cd.mobiledevices(),
-                     'get',
-                     customerId=GC_Values[GC_CUSTOMER_ID],
-                     resourceId=resourceId)
+    device_info = gapi.call(cd.mobiledevices(),
+                            'get',
+                            customerId=GC_Values[GC_CUSTOMER_ID],
+                            resourceId=resourceId)
     if 'deviceId' in info:
-        info['deviceId'] = info['deviceId'].encode('unicode-escape').decode(
+        device_info['deviceId'] = device_info['deviceId'].encode('unicode-escape').decode(
             UTF8)
     attrib = 'securityPatchLevel'
-    if attrib in info and int(info[attrib]):
-        info[attrib] = utils.formatTimestampYMDHMS(info[attrib])
+    if attrib in info and int(device_info[attrib]):
+        device_info[attrib] = utils.formatTimestampYMDHMS(device_info[attrib])
     display.print_json(info)
 
 
@@ -161,7 +161,7 @@ def print_():
 
 
 def update():
-    cd = gapi_directory.build
+    cd = gapi_directory.build()
     resourceIds = sys.argv[3]
     match_users = None
     doit = False
@@ -235,5 +235,3 @@ def update():
                               resourceId=device['resourceId'],
                               body=body,
                               customerId=GC_Values[GC_CUSTOMER_ID])
-
-

src/gam/gapi/directory/orgunits.py

@@ -7,7 +7,6 @@ from gam import display
 from gam import gapi
 from gam.gapi import directory as gapi_directory
 from gam.gapi import errors as gapi_errors
-from gam import utils
 
 
 def create():
@@ -229,12 +228,12 @@ def update():
     if sys.argv[4].lower() in ['move', 'add']:
         entity_type = sys.argv[5].lower()
         if entity_type in usergroup_types:
-            users = getUsersToModify(entity_type=entity_type,
-                                     entity=sys.argv[6])
+            users = gam.getUsersToModify(entity_type=entity_type,
+                                         entity=sys.argv[6])
         else:
             entity_type = 'users'
-            users = getUsersToModify(entity_type=entity_type,
-                                     entity=sys.argv[5])
+            users = gam.getUsersToModify(entity_type=entity_type,
+                                         entity=sys.argv[5])
         if (entity_type.startswith('cros')) or (
             (entity_type == 'all') and (sys.argv[6].lower() == 'cros')):
             for l in range(0, len(users), 50):
@@ -253,7 +252,7 @@ def update():
             for user in users:
                 i += 1
                 sys.stderr.write(
-                    f' moving {user} to {orgUnitPath}{currentCountNL(i, count)}'
+                    f' moving {user} to {orgUnitPath}{gam.currentCountNL(i, count)}'
                 )
                 try:
                     gapi.call(cd.users(),
@@ -377,7 +376,7 @@ def getTopLevelOrgId(cd, orgUnitPath):
 
 def getOrgUnitId(orgUnit, cd=None):
     if cd is None:
-        cd = buildGAPIObject('directory')
+        cd = gapi_directory.build()
     orgUnit = getOrgUnitItem(orgUnit)
     if orgUnit[:3] == 'id:':
         return (orgUnit, orgUnit)

src/gam/gapi/directory/privileges.py

@@ -15,7 +15,7 @@ def flatten_privilege_list(privs, parent=None):
                                               parent=priv['privilegeName'])
             priv['children'] = ' '.join(
                 [child['privilegeName'] for child in children])
-            del (priv['childPrivileges'])
+            del priv['childPrivileges']
         flat_privs = flat_privs + children
         flat_privs.append(priv)
     return flat_privs

src/gam/gapi/directory/users.py

@@ -28,5 +28,3 @@ def turn_off_2sv(users):
                   'turnOff',
                   soft_errors=True,
                   userKey=user)
-
-

src/gam/gapi/licensing.py

@@ -35,6 +35,7 @@ def user_lic_result(request_id, response, exception):
                 soft_errors=True)
         print(f'ERROR: {request_id}: {http_status} - {reason} {message}')
 
+
 def create(users, sku=None):
     lic = build()
     if not sku:
@@ -45,17 +46,15 @@ def create(users, sku=None):
     if len(sys.argv) > 6 and sys.argv[i].lower() in ['product', 'productid']:
         productId = sys.argv[i+1]
         i += 2
-    lbatch = lic.new_batch_http_request(callback=user_lic_result)
     for user in users:
-        print(f'Adding license {sku_name} from user {user}')
-        body = {'userId': user}
-        lbatch.add(lic.licenseAssignments().insert(
-            productId=productId, skuId=skuId, body=body), request_id=user)
-        if len(lbatch._order) == 1000:
-          lbatch.execute()
-          lbatch = lic.new_batch_http_request(callback=user_lic_result)
-    if len(lbatch._order) > 0:
-        lbatch.execute()
+        print(f'Adding license {sku_name} from to {user}')
+        gapi.call(lic.licenseAssignments(),
+                  'insert',
+                  soft_errors=True,
+                  productId=productId,
+                  skuId=skuId,
+                  body={'userId': user})
+
 
 def delete(users, sku=None):
     lic = build()
@@ -67,16 +66,15 @@ def delete(users, sku=None):
     if len(sys.argv) > 6 and sys.argv[i].lower() in ['product', 'productid']:
         productId = sys.argv[i+1]
         i += 2
-    lbatch = lic.new_batch_http_request(callback=user_lic_result)
     for user in users:
-        print(f'Removing license {sku_name} from user {user}')
-        lbatch.add(lic.licenseAssignments().delete(
-            productId=productId, skuId=skuId, userId=user), request_id=user)
-        if len(lbatch._order) == 1000:
-          lbatch.execute()
-          lbatch = lic.new_batch_http_request(callback=user_lic_result)
-    if len(lbatch._order) > 0:
-        lbatch.execute()
+         print(f'Removing license {sku_name} from user {user}')
+         gapi.call(lic.licenseAssignments(),
+                   'delete',
+                   soft_errors=True,
+                   productId=productId,
+                   skuId=skuId,
+                   userId=user)
+
 
 def sync(users):
     sku = sys.argv[5]
@@ -113,18 +111,15 @@ def update(users, sku=None, old_sku=None):
             )
         _, old_sku = getProductAndSKU(old_sku)
     old_sku_name = _formatSKUIdDisplayName(old_sku)
-    lbatch = lic.new_batch_http_request(callback=user_lic_result)
     for user in users:
         print(f'Changing user {user} from license {old_sku_name} to {sku_name}')
-        body = {'skuId': skuId}
-        lbatch.add(lic.licenseAssignments().patch(
-            productId=productId, skuId=old_sku, userId=user, body=body),
-            request_id=user)
-        if len(lbatch._order) == 1000:
-          lbatch.execute()
-          lbatch = lic.new_batch_http_request(callback=user_lic_result)
-    if len(lbatch._order) > 0:
-        lbatch.execute()
+        gapi.call(lic.licenseAssignments(),
+                  'patch',
+                  soft_errors=True,
+                  productId=productId,
+                  skuId=old_sku,
+                  userId=user,
+                  body={'skuId': skuId})
 
 
 def print_(returnFields=None,

src/gam/gapi/reports.py

@@ -11,6 +11,7 @@ from gam import controlflow
 from gam import display
 from gam import gapi
 from gam import utils
+from gam.gapi.directory import orgunits as gapi_directory_orgunits
 
 
 def build():
@@ -178,7 +179,7 @@ def showUsage():
             skip_day_numbers = [dow.index(d) for d in skipdaynames if d in dow]
             i += 2
         elif report == 'user' and myarg in ['orgunit', 'org', 'ou']:
-            _, orgUnitId = gam.getOrgUnitId(sys.argv[i + 1])
+            _, orgUnitId = gapi_directory_orgunits.getOrgUnitId(sys.argv[i + 1])
             i += 2
         elif report == 'user' and myarg in usergroup_types:
             users = gam.getUsersToModify(myarg, sys.argv[i + 1])
@@ -296,7 +297,7 @@ def showReport():
             tryDate = utils.get_yyyymmdd(sys.argv[i + 1])
             i += 2
         elif myarg in ['orgunit', 'org', 'ou']:
-            _, orgUnitId = gam.getOrgUnitId(sys.argv[i + 1])
+            _, orgUnitId = gapi_directory_orgunits.getOrgUnitId(sys.argv[i + 1])
             i += 2
         elif myarg == 'fulldatarequired':
             fullDataRequired = []

src/gam/var.py

@@ -8,7 +8,7 @@ import platform
 import re
 
 GAM_AUTHOR = 'Jay Lee <jay0lee@gmail.com>'
-GAM_VERSION = '5.21'
+GAM_VERSION = '5.22'
 GAM_LICENSE = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 GAM_URL = 'https://git.io/gam'