GAM 5.11

servicemanagement API to serviceusage API
Update GamCommands.txt (#1211 )
2026-06-05 14:51:39 +00:00 · 2020-06-17 14:21:49 -04:00 · 2020-06-17 13:30:08 -04:00 · 2020-06-06 09:35:24 -04:00 · 2020-06-05 13:37:44 -04:00 · 2020-06-04 15:59:06 -04:00
12 changed files with 211 additions and 1332 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,8 @@ dist: xenial

 env:
  global:
-    - BUILD_PYTHON_VERSION=3.8.2
-    - MIN_PYTHON_VERSION=3.8.2
+    - BUILD_PYTHON_VERSION=3.8.3
+    - MIN_PYTHON_VERSION=3.8.3
    - BUILD_OPENSSL_VERSION=1.1.1g
    - MIN_OPENSSL_VERSION=1.1.1g
    - PATCHELF_VERSION=0.10
@@ -39,7 +39,14 @@ cache:
    - $HOME/ssl

 jobs:
+  allow_failures:
+    - python: nightly
+  fast_finish: true
  include:
+    - os: linux
+      name: "Linux 64-bit Focal"
+      dist: focal
+      language: shell
    - os: linux
      name: "Linux 64-bit Bionic"
      dist: bionic
@@ -69,7 +76,11 @@ jobs:
      language: python
      python: 3.7
    - os: linux
-      name: "Python nightly Source Testing"
+      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
@@ -84,6 +95,10 @@ jobs:
      name: "MacOS 10.14"
      language: generic
      osx_image: xcode11.3
+    - os: osx
+      name: "MacOS 10.15"
+      language: generic
+      osx_image: xcode11.5
    - os: windows
      name: "Windows 64-bit"
      language: shell
@@ -215,7 +230,7 @@ script:
 - if [ "$e2e" = true ]; then $gam report admin start -3d todrive; fi
 - if ([ "$e2e" = true ] && [[ "$TRAVIS_JOB_NAME" != *"Testing" ]]); then
    for gamfile in gam-$GAMVERSION-*; do
-      fileid=$($gam user $gam_user add drivefile localfile $gamfile drivefilename $GAMVERSION-$TRAVIS_COMMIT-$gamfile parentid 1N2zbO33qzUQFsGM49-m9AQC1ijzd_ru1 returnidonly);
+      fileid=$($gam user $gam_user add drivefile localfile $gamfile drivefilename $GAMVERSION-${TRAVIS_COMMIT:0:7}-$gamfile parentid 1N2zbO33qzUQFsGM49-m9AQC1ijzd_ru1 returnidonly);
      $gam user $gam_user add drivefileacl $fileid anyone role reader withlink;
    done;
  fi
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -780,7 +780,7 @@ Specify a collection of Users by directly specifying them or by specifiying item
 <UserBasicAttribute> ::=
 	(agreed2terms|agreedtoterms <Boolean>)|
 	(changepassword|changepasswordatnextlogin <Boolean>)|
-	(crypt|sha|sha1|sha-1|md5|nohash)|
+	(base64-md5|base64-sha1|crypt|sha|sha1|sha-1|md5|nohash)|
 	(customerid <String>)|
 	(email|primaryemail|username <EmailAddress>)|
 	(firstname|givenname <String>)|
@@ -822,6 +822,7 @@ gam help

 gam batch <FileName>|- [charset <Charset>]
 gam csv <FileName>|- [charset <Charset>] gam <GAM argument list>
+gam csvtest <FileName>|- [charset <Charset>] gam <GAM argument list>

 You can make substitutions in <GAMArgumentList> with values from the CSV file.
 An argument containing exactly ~xxx is replaced by the value of field xxx from the CSV file
--- a/src/cloudprint-v2.json
+++ b/src/cloudprint-v2.json
@@ -1,486 +0,0 @@
-{
- "kind": "discovery#restDescription",
- "discoveryVersion": "v1",
- "id": "cloudprint:v2",
- "name": "cloudprint",
- "version": "v2",
- "revision": "20150605",
- "title": "Cloud Print API",
- "description": "Lets you access Cloud Print Printers",
- "ownerDomain": "google.com",
- "ownerName": "Google",
- "icons": {
-  "x16": "http://www.google.com/images/icons/product/search-16.gif",
-  "x32": "http://www.google.com/images/icons/product/search-32.gif"
- },
- "documentationLink": "https://developers.google.com/cloud-print",
- "protocol": "rest",
- "baseUrl": "https://www.google.com/",
- "basePath": "/cloudprint/",
- "rootUrl": "https://www.google.com/",
- "servicePath": "/cloudprint/",
- "parameters": {
-  "prettyPrint": {
-   "type": "boolean",
-   "description": "Returns response with indentations and line breaks.",
-   "default": "true",
-   "location": "query"
-  }
- },
- "auth": {
-  "oauth2": {
-   "scopes": {
-    "https://www.googleapis.com/auth/cloudprint": {
-     "description": "Manage Cloud Print"
-    }
-   }
-  }
- },
- "schemas": {
-  "Job": {
-   "id": "Job",
-   "type": "object",
-   "description": "Job Object",
-   "properties": {
-    "title": {
-     "type": "string",
-     "description": "Job Title"
-    },
-    "id": {
-     "type": "string",
-     "description": "Unique ID"
-    }
-   }
-  },
-  "Jobs": {
-   "id": "Jobs",
-   "type": "object",
-   "description": "List of Jobs.",
-   "properties": {
-    "jobs": {
-     "type": "array",
-     "description": "List of job objects.",
-     "items": {
-      "$ref": "Job"
-     }
-    }
-   }
-  },
-  "Printer": {
-   "id": "Printer",
-   "type": "object",
-   "description": "Printer Object",
-   "properties": {
-    "displayName": {
-     "type": "string",
-     "description": "Display Name"
-    },
-    "id": {
-     "type": "string",
-     "description": "Unique ID"
-    }
-   }
-  },
-  "Printers": {
-   "id": "Printers",
-   "type": "object",
-   "description": "List of Printers.",
-   "properties": {
-    "printers": {
-     "type": "array",
-     "description": "List of printer objects.",
-     "items": {
-      "$ref": "Printer"
-     }
-    }
-   }
-  }
- },
- "resources": {
-  "jobs": {
-   "methods": {
-    "delete": {
-     "id": "cloudprint.jobs.delete",
-     "path": "deletejob",
-     "httpMethod": "GET",
-     "parameters": {
-      "jobid": {
-       "type": "string",
-       "location": "query",
-       "required": "true"
-      }
-     }
-    },
-    "fetch": {
-     "id": "cloudprint.jobs.fetch",
-     "path": "fetch",
-     "httpMethod": "GET",
-     "parameters": {
-      "printerid": {
-       "type": "string",
-       "required": "true",
-       "location": "query"
-      }
-     },
-     "response": {
-      "$ref": "Jobs"
-     }
-    },
-    "getticket": {
-     "id": "cloudprint.jobs.getticket",
-     "path": "ticket",
-     "httpMethod": "GET",
-     "parameters": {
-      "jobid": {
-       "type": "string",
-       "required": "true",
-       "location": "query"
-      },
-      "use_cjt": {
-       "type": "boolean",
-       "required": "true",
-       "location": "query"
-      }
-     }
-    },
-    "list": {
-     "id": "cloudprint.jobs.list",
-     "path": "jobs",
-     "httpMethod": "GET",
-     "parameters": {
-      "printerid": {
-       "type": "string",
-       "location": "query"
-      },
-      "owner": {
-       "type": "string",
-       "location": "query"
-      },
-      "status": {
-       "type": "string",
-       "location": "query"
-      },
-      "q": {
-       "type": "string",
-       "location": "query"
-      },
-      "offset": {
-       "type": "string",
-       "location": "query"
-      },
-      "limit": {
-       "type": "string",
-       "location": "query"
-      },
-      "sortorder": {
-       "type": "string",
-       "location": "query"
-      }
-     },
-     "response": {
-      "$ref": "Jobs"
-     }
-    },
-    "update": {
-     "id": "cloudprint.jobs.update",
-     "path": "control",
-     "httpMethod": "GET",
-     "parameters": {
-      "jobid": {
-       "type": "string",
-       "required": "true",
-       "location": "query"
-      },
-      "semantic_state_diff": {
-       "type": "string",
-       "required": "true",
-       "location": "query"
-      }
-     },
-     "response": {
-      "$ref": "Jobs"
-     }
-    },
-    "resubmit": {
-     "id": "cloudprint.jobs.resubmit",
-     "path": "resubmit",
-     "httpMethod": "POST",
-     "description": "resubmit a job to new printer.",
-     "parameters": {
-      "printerid": {
-       "type": "string",
-       "required": "true",
-       "location": "query"
-      },
-      "jobid": {
-       "type": "string",
-       "required": "true",
-       "location": "query"
-      },
-      "ticket": {
-       "type": "string",
-       "location": "query"
-      }
-     },
-     "response": {
-      "$ref": "Job"
-     }
-    },
-    "submit": {
-     "id": "cloudprint.jobs.submit",
-     "path": "submit",
-     "httpMethod": "POST",
-     "description": "Send a print job to cloud print.",
-     "request": {
-      "printerid": {
-       "type": "string",
-       "required": "true",
-       "location": "query"
-      },
-      "title": {
-       "type": "string",
-       "location": "query"
-      },
-      "ticket": {
-       "type": "string",
-       "location": "query"
-      },
-      "content": {
-       "type": "string",
-       "location": "query"
-      },
-      "contentType": {
-       "type": "string",
-       "location": "query"
-      },
-      "tag": {
-       "type": "string",
-       "location": "query"
-      }
-     },
-     "response": {
-      "$ref": "Job"
-     }
-    }
-   }
-  },
-  "printers": {
-   "methods": {
-    "get": {
-     "id": "cloudprint.printers.get",
-     "path": "printer",
-     "httpMethod": "GET",
-     "parameters": {
-      "printerid": {
-       "type": "string",
-       "required": "true",
-       "location": "query"
-      },
-      "extra_fields": {
-       "type": "string",
-       "location": "query"
-      }
-     },
-     "response": {
-      "$ref": "Printer"
-     }
-    },
-    "list": {
-     "id": "cloudprint.printers.list",
-     "path": "search",
-     "httpMethod": "GET",
-     "description": "List all printers",
-     "parameters": {
-      "q": {
-       "type": "string",
-       "description": "Query list of printers",
-       "location": "query"
-      },
-      "type": {
-       "type": "string",
-       "description": "limit results to printers of type",
-       "location": "query"
-       },
-      "connection_status": {
-       "type": "string",
-       "description": "limit results to printers with this status",
-       "location": "query"
-      },
-      "extra_fields": {
-       "type": "string",
-       "description": "include extra fields",
-       "location": "query"
-      }
-     },
-     "response": {
-      "$ref": "Printers"
-     }
-    },
-    "share": {
-     "id": "cloudprint.printers.share",
-     "path": "share",
-     "httpMethod": "GET",
-     "description": "Share printer with user, group or domain",
-     "parameters": {
-      "printerid": {
-       "type": "string",
-       "required": "true",
-       "location": "query"
-      },
-      "scope": {
-       "type": "string",
-       "location": "query"
-      },
-      "role": {
-       "type": "string",
-       "location": "query"
-      },
-      "type": {
-        "type": "string",
-        "location": "query"
-      },
-      "skip_notification": {
-       "type": "boolean",
-       "location": "query"
-      },
-      "public": {
-       "type": "boolean",
-       "location": "query"
-      }
-     }
-    },
-    "unshare": {
-     "id": "cloudprint.printers.unshare",
-     "path": "unshare",
-     "httpMethod": "GET",
-     "description": "unshare printer with user, group or domain",
-     "parameters": {
-      "printerid": {
-       "type": "string",
-       "required": "true",
-       "location": "query"
-      },
-      "scope": {
-       "type": "string",
-       "location": "query"
-      },
-      "public": {
-       "type": "string",
-       "location": "query"
-      }
-     }
-    },
-    "delete": {
-     "id": "cloudprint.printers.delete",
-     "path": "delete",
-     "httpMethod": "GET",
-     "description": "delete a printer",
-     "parameters": {
-      "printerid": {
-       "type": "string",
-       "required": "true",
-       "location": "query"
-      }
-     }
-    },
-    "update": {
-     "id": "cloudprint.printers.update",
-     "path": "update",
-     "httpMethod": "GET",
-     "description": "update a printer",
-     "parameters": {
-      "isTosAccepted": {
-       "type": "boolean",
-       "location": "query"
-      },
-      "gcpVersion": {
-       "type": "string",
-       "location": "query"
-      },
-      "setupUrl": {
-       "type": "string",
-       "location": "query"
-      },
-      "supportUrl": {
-       "type": "string",
-       "location": "query"
-      },
-      "firmware": {
-       "type": "string",
-       "location": "query"
-      },
-      "currentQuota": {
-       "type": "string",
-       "location": "query"
-      },
-      "type": {
-       "type": "string",
-       "location": "query"
-      },
-      "public": {
-       "type": "boolean",
-       "location": "query"
-      },
-      "status": {
-       "type": "string",
-       "location": "query"
-      },
-      "proxy": {
-       "type": "string",
-       "location": "query"
-      },
-      "manufacturer": {
-       "type": "string",
-       "location": "query"
-      },
-      "defaultDisplayName": {
-       "type": "string",
-       "location": "query"
-      },
-      "displayName": {
-       "type": "string",
-       "location": "query"
-      },
-      "name": {
-       "type": "string",
-       "location": "query"
-      },
-      "uuid": {
-       "type": "string",
-       "location": "query"
-      },
-      "updateUrl": {
-       "type": "string",
-       "location": "query"
-      },
-      "ownerId": {
-       "type": "string",
-       "location": "query"
-      },
-      "model": {
-       "type": "string",
-       "location": "query"
-      },
-      "description": {
-       "type": "string",
-       "location": "query"
-      },
-      "printerid": {
-       "type": "string",
-       "required": "true",
-       "location": "query"
-      },
-      "quotaEnabled": {
-       "type": "boolean",
-       "location": "query"
-      },
-      "dailyQuota": {
-       "type": "string",
-       "location": "query"
-      }
-     }
-    }
-   }
-  }
- }
-}
--- a/src/gam-install.sh
+++ b/src/gam-install.sh
@@ -29,7 +29,7 @@ gamversion="latest"
 adminuser=""
 regularuser=""
 gam_glibc_vers="2.27 2.23"
-gam_macos_vers="10.14.6 10.13.6"
+gam_macos_vers="10.15.4 10.14.6 10.13.6"

 while getopts "hd:a:o:b:lp:u:r:v:" OPTION
 do
--- a/src/gam.spec
+++ b/src/gam.spec
@@ -7,11 +7,9 @@ from PyInstaller.utils.hooks import copy_metadata

 sys.modules['FixTk'] = None

-extra_files = [('cloudprint-v2.json', 'cloudprint-v2.json')]
-
 # dynamically determine where httplib2/cacerts.txt lives
 proot = os.path.dirname(importlib.import_module('httplib2').__file__)
-extra_files += [(os.path.join(proot, 'cacerts.txt'), 'httplib2')]
+extra_files = [(os.path.join(proot, 'cacerts.txt'), 'httplib2')]

 extra_files += copy_metadata('google-api-python-client')

--- a/src/gam/init.py
+++ b/src/gam/init.py
--- a/src/gam/gapi/calendar.py
+++ b/src/gam/gapi/calendar.py
@@ -269,7 +269,7 @@ def moveOrDeleteEvent(moveOrDelete):
    calendarId, cal = buildCalendarDataGAPIObject(sys.argv[2])
    if not cal:
        return
-    sendUpdates = None
+    sendUpdates = 'none'
    doit = False
    kwargs = {}
    i = 4
@@ -372,6 +372,7 @@ def getEventAttributes(i, calendarId, cal, body, action):
    # calendars are notified of changes
    sendUpdates = 'externalOnly'
    action = 'update' if body else 'add'
+    timeZone = None
    while i < len(sys.argv):
        myarg = sys.argv[i].lower().replace('_', '')
        if myarg in ['notifyattendees', 'sendnotifications', 'sendupdates']:
--- a/src/gam/gapi/directory/customer.py
+++ b/src/gam/gapi/directory/customer.py
@@ -14,11 +14,16 @@ def doGetCustomerInfo():
                              customerKey=GC_Values[GC_CUSTOMER_ID])
    print(f'Customer ID: {customer_info["id"]}')
    print(f'Primary Domain: {customer_info["customerDomain"]}')
-    result = gapi.call(cd.domains(),
-                       'get',
-                       customer=customer_info['id'],
-                       domainName=customer_info['customerDomain'],
-                       fields='verified')
+    try:
+        result = gapi.call(
+            cd.domains(),
+            'get',
+            customer=customer_info['id'],
+            domainName=customer_info['customerDomain'],
+            fields='verified',
+            throw_reasons=[gapi.errors.ErrorReason.DOMAIN_NOT_FOUND])
+    except gapi.errors.GapiDomainNotFoundError:
+        result = {'verified': False}
    print(f'Primary Domain Verified: {result["verified"]}')
    # If customer has changed primary domain customerCreationTime is date
    # of current primary being added, not customer create date.
@@ -66,22 +71,34 @@ def doGetCustomerInfo():
        customerId = None
    rep = gapi_reports.buildGAPIObject()
    usage = None
-    throw_reasons = [gapi.errors.ErrorReason.INVALID]
+    throw_reasons = [
+        gapi.errors.ErrorReason.INVALID, gapi.errors.ErrorReason.FORBIDDEN
+    ]
    while True:
        try:
-            usage = gapi.get_all_pages(rep.customerUsageReports(),
-                                       'get',
-                                       'usageReports',
-                                       throw_reasons=throw_reasons,
-                                       customerId=customerId,
-                                       date=tryDate,
-                                       parameters=parameters)
-            break
+            result = gapi.call(rep.customerUsageReports(),
+                               'get',
+                               throw_reasons=throw_reasons,
+                               customerId=customerId,
+                               date=tryDate,
+                               parameters=parameters)
        except gapi.errors.GapiInvalidError as e:
            tryDate = gapi_reports._adjust_date(str(e))
-    if not usage:
-        print('No user count data available.')
-        return
+            continue
+        except gapi.errors.GapiForbiddenError:
+            return
+        warnings = result.get('warnings', [])
+        fullDataRequired = ['accounts']
+        usage = result.get('usageReports')
+        has_reports = bool(usage)
+        fullData, tryDate = gapi_reports._check_full_data_available(
+            warnings, tryDate, fullDataRequired, has_reports)
+        if fullData < 0:
+            print('No user report available.')
+            sys.exit(1)
+        if fullData == 0:
+            continue
+        break
    print(f'User counts as of {tryDate}:')
    for item in usage[0]['parameters']:
        api_name = user_counts_map.get(item['name'])
--- a/src/gam/gapi/reports.py
+++ b/src/gam/gapi/reports.py
@@ -64,9 +64,7 @@ def showUsageParameters():
    if customerId == MY_CUSTOMER:
        customerId = None
    tryDate = datetime.date.today().strftime(YYYYMMDD_FORMAT)
-    partial_apps = []
-    all_parameters = []
-    one_day = datetime.timedelta(days=1)
+    all_parameters = set()
    i = 4
    while i < len(sys.argv):
        myarg = sys.argv[i].lower().replace('_', '')
@@ -76,38 +74,35 @@ def showUsageParameters():
        else:
            controlflow.invalid_argument_exit(sys.argv[i],
                                              'gam report usageparameters')
+    fullDataRequired = ['all']
    while True:
        try:
-            response = gapi.call(endpoint,
-                                 'get',
-                                 throw_reasons=throw_reasons,
-                                 date=tryDate,
-                                 customerId=customerId,
-                                 **kwargs)
-            partial_on_thisday = []
-            for warning in response.get('warnings', []):
-                for data in warning.get('data', []):
-                    if data.get('key') == 'application':
-                        partial_on_thisday.append(data['value'])
-            if partial_apps:
-                partial_apps = [
-                    app for app in partial_apps if app in partial_on_thisday
-                ]
-            else:
-                partial_apps = partial_on_thisday
-            for parameter in response['usageReports'][0]['parameters']:
-                name = parameter.get('name')
-                if name and name not in all_parameters:
-                    all_parameters.append(name)
-            if not partial_apps:
+            result = gapi.call(endpoint,
+                               'get',
+                               throw_reasons=throw_reasons,
+                               date=tryDate,
+                               customerId=customerId,
+                               fields='warnings,usageReports(parameters(name))',
+                               **kwargs)
+            warnings = result.get('warnings', [])
+            usage = result.get('usageReports')
+            has_reports = bool(usage)
+            fullData, tryDate = _check_full_data_available(
+                warnings, tryDate, fullDataRequired, has_reports)
+            if fullData < 0:
+                print('No usage parameters available.')
+                sys.exit(1)
+            if has_reports:
+                for parameter in usage[0]['parameters']:
+                    name = parameter.get('name')
+                    if name:
+                        all_parameters.add(name)
+            if fullData == 1:
                break
-            tryDate = (utils.get_yyyymmdd(tryDate, returnDateTime=True) - \
-                    one_day).strftime(YYYYMMDD_FORMAT)
        except gapi.errors.GapiInvalidError as e:
            tryDate = _adjust_date(str(e))
-    all_parameters.sort()
    csvRows = []
-    for parameter in all_parameters:
+    for parameter in sorted(all_parameters):
        csvRows.append({'parameter': parameter})
    display.write_csv_file(csvRows, titles,
                           f'{report.capitalize()} Report Usage Parameters',
@@ -321,7 +316,9 @@ def showReport():
            eventName = sys.argv[i + 1]
            i += 2
        elif myarg == 'user':
-            userKey = gam.normalizeEmailAddressOrUID(sys.argv[i + 1])
+            userKey = sys.argv[i + 1].lower()
+            if userKey != 'all':
+                userKey = gam.normalizeEmailAddressOrUID(sys.argv[i + 1])
            i += 2
        elif myarg in ['filter', 'filters']:
            filters = sys.argv[i + 1]
--- a/src/gam/utils.py
+++ b/src/gam/utils.py
@@ -320,6 +320,8 @@ URL_SHORTENER_ENDPOINT = 'https://gam-shortn.appspot.com/create'


 def shorten_url(long_url, httpc=None):
+    if GC_Defaults[GC_NO_SHORT_URLS]:
+        return long_url
    if not httpc:
        httpc = transport.create_http(timeout=10)
    headers = {'Content-Type': 'application/json', 'User-Agent': GAM_INFO}
--- a/src/gam/var.py
+++ b/src/gam/var.py
@@ -1,4 +1,5 @@
 """Variables common across modules"""
+# pylint: disable=too-many-lines
 import os
 import ssl
 import string
@@ -7,7 +8,7 @@ import platform
 import re

 GAM_AUTHOR = 'Jay Lee <jay0lee@gmail.com>'
-GAM_VERSION = '5.09'
+GAM_VERSION = '5.11'
 GAM_LICENSE = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'

 GAM_URL = 'https://git.io/gam'
@@ -25,12 +26,12 @@ GAM_PROJECT_FILEPATH = 'https://raw.githubusercontent.com/jay0lee/GAM/master/src
 true_values = ['on', 'yes', 'enabled', 'true', '1']
 false_values = ['off', 'no', 'disabled', 'false', '0']
 usergroup_types = [
-    'user', 'users', 'group', 'group_ns', 'grooup_susp', 'ou', 'org', 'ou_ns',
-    'org_ns', 'ou_susp', 'org_susp', 'ou_and_children', 'ou_and_child',
-    'ou_and_children_ns', 'ou_and_child_ns', 'ou_and_children_susp',
-    'ou_and_child_susp', 'query', 'queries', 'license', 'licenses', 'licence',
-    'licences', 'file', 'csv', 'csvfile', 'all', 'cros', 'cros_sn', 'crosquery',
-    'crosqueries', 'crosfile', 'croscsv', 'croscsvfile'
+    'user', 'users', 'group', 'group_ns', 'group_susp', 'group_inde', 'ou',
+    'org', 'ou_ns', 'org_ns', 'ou_susp', 'org_susp', 'ou_and_children',
+    'ou_and_child', 'ou_and_children_ns', 'ou_and_child_ns',
+    'ou_and_children_susp', 'ou_and_child_susp', 'query', 'queries', 'license',
+    'licenses', 'licence', 'licences', 'file', 'csv', 'csvfile', 'all', 'cros',
+    'cros_sn', 'crosquery', 'crosqueries', 'crosfile', 'croscsv', 'croscsvfile'
 ]
 ERROR_PREFIX = 'ERROR: '
 WARNING_PREFIX = 'WARNING: '
@@ -128,9 +129,12 @@ SKUS = {
        'displayName': 'G Suite Enterprise Archived'
    },
    '1010060001': {
-        'product': 'Google-Apps',
-        'aliases': ['d4e', 'driveenterprise', 'drive4enterprise'],
-        'displayName': 'Drive Enterprise'
+        'product': '101006',
+        'aliases': [
+            'gsuiteessentials', 'essentials', 'd4e', 'driveenterprise',
+            'drive4enterprise'
+        ],
+        'displayName': 'G Suite Essentials'
    },
    'Google-Drive-storage-20GB': {
        'product': 'Google-Drive-storage',
@@ -232,7 +236,6 @@ API_VER_MAPPING = {
    'appsactivity': 'v1',
    'calendar': 'v3',
    'classroom': 'v1',
-    'cloudprint': 'v2',
    'cloudresourcemanager': 'v2',
    'cloudresourcemanagerv1': 'v1',
    'datatransfer': 'datatransfer_v1',
@@ -249,6 +252,7 @@ API_VER_MAPPING = {
    'reports': 'reports_v1',
    'reseller': 'v1',
    'servicemanagement': 'v1',
+    'serviceusage': 'v1',
    'sheets': 'v4',
    'siteVerification': 'v1',
    'storage': 'v1',
@@ -1140,6 +1144,8 @@ GC_NO_BROWSER = 'no_browser'
 GC_OAUTH_BROWSER = 'oauth_browser'
 # Disable GAM API caching
 GC_NO_CACHE = 'no_cache'
+# Disable Short URLs
+GC_NO_SHORT_URLS = 'no_short_urls'
 # Disable GAM update check
 GC_NO_UPDATE_CHECK = 'no_update_check'
 # Number of threads for gam batch
@@ -1185,6 +1191,7 @@ GC_Defaults = {
    GC_DRIVE_DIR: '',
    GC_NO_BROWSER: False,
    GC_NO_CACHE: False,
+    GC_NO_SHORT_URLS: False,
    GC_NO_UPDATE_CHECK: False,
    GC_NUM_THREADS: 25,
    GC_OAUTH_BROWSER: False,
@@ -1264,6 +1271,9 @@ GC_VAR_INFO = {
    GC_NO_CACHE: {
        GC_VAR_TYPE: GC_TYPE_BOOLEAN
    },
+    GC_NO_SHORT_URLS: {
+        GC_VAR_TYPE: GC_TYPE_BOOLEAN
+    },
    GC_NO_UPDATE_CHECK: {
        GC_VAR_TYPE: GC_TYPE_BOOLEAN
    },
--- a/src/travis/linux-before-install.sh
+++ b/src/travis/linux-before-install.sh
@@ -34,8 +34,10 @@ else
    mkdir python
    echo "RUNNING: apt update..."
    sudo apt-get -qq --yes update > /dev/null
-    echo "RUNNING: apt dist-upgrade..."
-    sudo apt-get -qq --yes dist-upgrade > /dev/null
+    echo "RUNNING: apt upgrade..."
+    sudo apt-mark hold openssh-server
+    sudo apt-get --yes upgrade
+    sudo apt-get --yes --with-new-pkgs upgrade
    echo "Installing build tools..."
    sudo apt-get -qq --yes install build-essential
    echo "Installing deps for python3"
@@ -72,7 +74,8 @@ else
      echo "running configure with safe and unsafe"
      ./configure $safe_flags $unsafe_flags > /dev/null
    fi
-    make -j$cpucount PROFILE_TASK="-m test.regrtest --pgo -j$(( $cpucount * 2 ))" -s
+    #make -j$cpucount PROFILE_TASK="-m test.regrtest --pgo -j$(( $cpucount * 2 ))" -s
+    make -j$cpucount -s
    RESULT=$?
    echo "First make exited with $RESULT"
    if [ $RESULT != 0 ]; then
Author	SHA1	Message	Date
Jay Lee	73677544a3	GAM 5.11	2020-06-17 14:21:49 -04:00
Jay Lee	7c46d8548e	servicemanagement API to serviceusage API	2020-06-17 13:30:08 -04:00
Ross Scroggs	186381426a	Update GamCommands.txt (#1211 )	2020-06-06 09:35:24 -04:00
Ross Scroggs	af1e695661	Clean up csvtest (#1209 ) Let your formatter redo 13382/13386, I don't understand its rules	2020-06-05 13:37:44 -04:00
Jay Lee	4ccd51269a	Support base64-sha1 and base64-md5 user passwords This allows pulling md5 and sha-1 passwords stored in OpenLDAP format into G Suite. This example commands set user password to "helloworld". gam update user user@example.com password "{SHA}at+xg6SiyUovktq1redipHiJpaE=" base64-sha1	2020-06-04 15:59:06 -04:00
Jay Lee	560cfe225f	wMerge branch 'master' of https://github.com/jay0lee/GAM	2020-06-03 13:30:56 -04:00
Jay Lee	e9e4c3d333	Add a 'gam csvtest' command to help users understand CSV batch processing	2020-06-03 13:30:50 -04:00
Ross Scroggs	dbca6e3b88	Handle 0 users in update group (#1207 )	2020-06-01 16:05:26 -04:00
Jay Lee	ad465ed20c	MacOS XCode 11.5	2020-06-01 15:35:08 -04:00
Jay Lee	9370f7ce15	Merge branch 'master' of https://github.com/jay0lee/GAM	2020-06-01 13:45:13 -04:00
Jay Lee	d9151a866b	3.9 dev, allow Python 3.9 to fail, Focal is now passing	2020-06-01 13:44:12 -04:00
Ross Scroggs	7937fd00d4	Clean up group_inde (#1203 )	2020-05-26 15:09:15 -04:00
Eduardo	d2199a5b9c	include includeDerivedMembership option for group sync (#1198 ) * include includeDerivedMembership option in command gam course xxx sync students\|teachers group yyyy I add alternative option group_inde (INclude DErived) * Avoid interference of new includeDerivedMembership taers232c suggestion to avoid unexpected interference	2020-05-26 14:30:11 -04:00
Ross Scroggs	6e765325c1	Fix bug where user all was not properly recognized (#1202 )	2020-05-26 14:29:10 -04:00
Jay Lee	18119b3d64	disable secrets for focal	2020-05-26 09:56:41 -04:00
Jay Lee	378a7c2d6c	allow focal to fail	2020-05-24 09:09:18 -04:00
Jay Lee	1270a315b2	it wasn't the unsafe flags...	2020-05-21 10:18:36 -04:00
Jay Lee	931b2cc700	temp disable Python optimizations	2020-05-21 10:00:51 -04:00
Jay Lee	e145ac0ad1	hold on ssh-server	2020-05-21 09:19:52 -04:00
Jay Lee	ab8e882e94	focal	2020-05-21 09:03:16 -04:00
Jay Lee	b66d671b74	try upgrading pyinstaller commit	2020-05-21 08:29:55 -04:00
Jay Lee	f662a13778	another attempt to fix focal	2020-05-20 11:29:17 -04:00
Jay Lee	845aa122e1	unmute apt-get upgrade so it doesn't timeout	2020-05-20 11:07:59 -04:00
Jay Lee	bb19336d06	silence apt-get again	2020-05-20 10:52:53 -04:00
Jay Lee	774948cf9d	try apt-get upgrade instead of dist-upgrade	2020-05-20 10:27:18 -04:00
Jay Lee	e26e077c83	no apt-get dist-upgrade for focal	2020-05-20 10:17:02 -04:00
Jay Lee	f264ffd040	Merge branch 'master' of https://github.com/jay0lee/GAM	2020-05-20 10:02:07 -04:00
Jay Lee	7e16e4880b	Update .travis.yml	2020-05-20 09:53:49 -04:00
Ross Scroggs	dd1ee6ff44	Fix bug (#1196 ) ``` $ gam calendar testsimple@rdschool.org addevent start 2020-05-17T08:00:00-07:00 end 2020-05-17T09:00:00-07:00 recurrence "RRULE:FREQ=WEEKLY;WKST=SU;COUNT=13;BYDAY=MO" summary "Monday Morning Meeting" Traceback (most recent call last): File "/Users/Ross/Documents/GoogleApps/GAMO/gam.py", line 11, in <module> main(sys.argv) File "/Users/Ross/Documents/GoogleApps/GAMO/gam/__main__.py", line 45, in main sys.exit(gam.ProcessGAMCommand(sys.argv)) File "/Users/Ross/Documents/GoogleApps/GAMO/gam/__init__.py", line 14413, in ProcessGAMCommand gapi_calendar.addOrUpdateEvent('add') File "/Users/Ross/Documents/GoogleApps/GAMO/gam/gapi/calendar.py", line 350, in addOrUpdateEvent sendUpdates, body = getEventAttributes(i, calendarId, cal, body, action) File "/Users/Ross/Documents/GoogleApps/GAMO/gam/gapi/calendar.py", line 537, in getEventAttributes if not timeZone: UnboundLocalError: local variable 'timeZone' referenced before assignment ```	2020-05-16 09:56:48 -04:00
Jay Lee	90d628cc75	Remove deprecated CloudPrint commands	2020-05-15 18:35:48 -04:00
Jay Lee	d5a0b33f04	add MacOS 10.15 check	2020-05-15 08:16:21 -04:00
Ross Scroggs	470e7826f1	Set proper default value (#1194 )	2020-05-14 17:22:04 -04:00
Jay Lee	54e9ae568f	fix call to _check_full_data_available	2020-05-14 14:04:15 -04:00
Jay Lee	d2ae5173fc	move variable out of loop	2020-05-14 12:58:36 -04:00
Ross Scroggs	e9b5133151	Update gam report usageparameters to account for Google API change (#1191 ) * Update gam report usageparamaters to account for Google API change * Use _check_full_data_available in report usageparameters * Code cleanup * Code cleanup part 2 * Code cleanup part 3	2020-05-14 12:55:38 -04:00
Jay Lee	7959d35f3f	Fix listing of G Suite Essentials SKU	2020-05-14 10:19:50 -04:00
Jay Lee	b42dfb2021	Merge branch 'master' of https://github.com/jay0lee/GAM	2020-05-14 09:39:58 -04:00
Jay Lee	b68b773b95	Handle G Suite Essentials unverified domain better	2020-05-14 09:38:21 -04:00
Jay Lee	e89a926d53	MacOS 10.15 Travis build	2020-05-14 09:31:46 -04:00
Jay Lee	6132c03893	Update .travis.yml	2020-05-14 07:17:22 -04:00
Ross Scroggs	2db54fc67a	expirationTime on ACL must be set in an update (#1189 )	2020-05-13 13:53:36 -04:00
Jay Lee	96095453d5	GAM 5.10	2020-05-13 13:01:37 -04:00
Jay Lee	32c02c36c9	Allow disabling short URLs with noshorturls.txt file	2020-05-13 13:00:51 -04:00
Jay Lee	1eb7ce3896	fix gam info counts	2020-05-13 12:26:06 -04:00
Jay Lee	da4f29049b	fix handling of empty usage reports. Fixes #1188	2020-05-13 09:02:13 -04:00