gam7 7.12.0__py3-none-any.whl → 7.12.2__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of gam7 might be problematic. Click here for more details.

Files changed (6) hide show
  1. gam/__init__.py +16 -5
  2. {gam7-7.12.0.dist-info → gam7-7.12.2.dist-info}/METADATA +1 -1
  3. {gam7-7.12.0.dist-info → gam7-7.12.2.dist-info}/RECORD +6 -6
  4. {gam7-7.12.0.dist-info → gam7-7.12.2.dist-info}/WHEEL +0 -0
  5. {gam7-7.12.0.dist-info → gam7-7.12.2.dist-info}/entry_points.txt +0 -0
  6. {gam7-7.12.0.dist-info → gam7-7.12.2.dist-info}/licenses/LICENSE +0 -0
gam/__init__.py CHANGED
@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
25
25
  """
26
26
 
27
27
  __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
28
- __version__ = '7.12.00'
28
+ __version__ = '7.12.02'
29
29
  __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
30
30
 
31
31
  #pylint: disable=wrong-import-position
@@ -6246,6 +6246,7 @@ def getItemsToModify(entityType, entity, memberRoles=None, isSuspended=None, isA
6246
6246
  result = callGAPIpages(cd.users(), 'list', 'users',
6247
6247
  pageMessage=getPageMessage(),
6248
6248
  throwReasons=[GAPI.BAD_REQUEST, GAPI.RESOURCE_NOT_FOUND, GAPI.FORBIDDEN],
6249
+ retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
6249
6250
  customer=GC.Values[GC.CUSTOMER_ID],
6250
6251
  query=query, orderBy='email', fields='nextPageToken,users(primaryEmail,archived)',
6251
6252
  maxResults=GC.Values[GC.USER_MAX_RESULTS])
@@ -6270,6 +6271,7 @@ def getItemsToModify(entityType, entity, memberRoles=None, isSuspended=None, isA
6270
6271
  result = callGAPIpages(cd.users(), 'list', 'users',
6271
6272
  pageMessage=getPageMessageForWhom(),
6272
6273
  throwReasons=[GAPI.BAD_REQUEST, GAPI.RESOURCE_NOT_FOUND, GAPI.DOMAIN_NOT_FOUND, GAPI.FORBIDDEN],
6274
+ retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
6273
6275
  domain=domain,
6274
6276
  query=query, orderBy='email', fields='nextPageToken,users(primaryEmail,archived)',
6275
6277
  maxResults=GC.Values[GC.USER_MAX_RESULTS])
@@ -6448,6 +6450,7 @@ def getItemsToModify(entityType, entity, memberRoles=None, isSuspended=None, isA
6448
6450
  pageMessage=pageMessage, messageAttribute='primaryEmail',
6449
6451
  throwReasons=[GAPI.INVALID_ORGUNIT, GAPI.ORGUNIT_NOT_FOUND,
6450
6452
  GAPI.INVALID_INPUT, GAPI.BAD_REQUEST, GAPI.RESOURCE_NOT_FOUND, GAPI.FORBIDDEN],
6453
+ retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
6451
6454
  customer=GC.Values[GC.CUSTOMER_ID], query=orgUnitPathQuery(ou, isSuspended), orderBy='email',
6452
6455
  fields=fields, maxResults=GC.Values[GC.USER_MAX_RESULTS])
6453
6456
  for users in feed:
@@ -6481,6 +6484,7 @@ def getItemsToModify(entityType, entity, memberRoles=None, isSuspended=None, isA
6481
6484
  pageMessage=getPageMessage(),
6482
6485
  throwReasons=[GAPI.INVALID_ORGUNIT, GAPI.ORGUNIT_NOT_FOUND,
6483
6486
  GAPI.INVALID_INPUT, GAPI.BAD_REQUEST, GAPI.RESOURCE_NOT_FOUND, GAPI.FORBIDDEN],
6487
+ retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
6484
6488
  customer=GC.Values[GC.CUSTOMER_ID], query=query, orderBy='email',
6485
6489
  fields='nextPageToken,users(primaryEmail,suspended,archived)',
6486
6490
  maxResults=GC.Values[GC.USER_MAX_RESULTS])
@@ -13321,6 +13325,7 @@ def getUserOrgUnits(cd, orgUnit, orgUnitId):
13321
13325
  pageMessage=getPageMessageForWhom(),
13322
13326
  throwReasons=[GAPI.INVALID_ORGUNIT, GAPI.ORGUNIT_NOT_FOUND,
13323
13327
  GAPI.INVALID_INPUT, GAPI.BAD_REQUEST, GAPI.RESOURCE_NOT_FOUND, GAPI.FORBIDDEN],
13328
+ retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
13324
13329
  customer=GC.Values[GC.CUSTOMER_ID], query=orgUnitPathQuery(orgUnit, None), orderBy='email',
13325
13330
  fields='nextPageToken,users(primaryEmail,orgUnitPath)', maxResults=GC.Values[GC.USER_MAX_RESULTS])
13326
13331
  userOrgUnits = {}
@@ -15329,6 +15334,7 @@ PLAN_NAME_MAP = {
15329
15334
  'annualmonthlypay': 'ANNUAL_MONTHLY_PAY',
15330
15335
  'annualyearlypay': 'ANNUAL_YEARLY_PAY',
15331
15336
  'flexible': 'FLEXIBLE',
15337
+ 'free': 'FREE',
15332
15338
  'trial': 'TRIAL',
15333
15339
  }
15334
15340
 
@@ -15412,7 +15418,7 @@ RENEWAL_TYPE_MAP = {
15412
15418
  # activate|suspend|startpaidservice|
15413
15419
  # (renewal auto_renew_monthly_pay|auto_renew_yearly_pay|cancel|renew_current_users_monthly_pay|renew_current_users_yearly_pay|switch_to_pay_as_you_go)|
15414
15420
  # (seats <Number>)|
15415
- # (plan annual_monthly_pay|annual_yearly_pay|flexible|trial [deal <String>] [purchaseorderid <String>] [seats <Number>])
15421
+ # (plan annual_monthly_pay|annual_yearly_pay|flexible|trial|free [deal <String>] [purchaseorderid <String>] [seats <Number>])
15416
15422
  def doUpdateResoldSubscription():
15417
15423
  def _getSeats():
15418
15424
  seats1 = getInteger(minVal=0)
@@ -17785,6 +17791,7 @@ def _doInfoOrgs(entityList):
17785
17791
  orgUnitPath = result['orgUnitPath']
17786
17792
  users = callGAPIpages(cd.users(), 'list', 'users',
17787
17793
  throwReasons=[GAPI.BAD_REQUEST, GAPI.INVALID_INPUT, GAPI.RESOURCE_NOT_FOUND, GAPI.FORBIDDEN],
17794
+ retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
17788
17795
  customer=GC.Values[GC.CUSTOMER_ID], query=orgUnitPathQuery(orgUnitPath, isSuspended), orderBy='email',
17789
17796
  fields='nextPageToken,users(primaryEmail,orgUnitPath)', maxResults=GC.Values[GC.USER_MAX_RESULTS])
17790
17797
  printEntitiesCount(entityType, None)
@@ -18052,6 +18059,7 @@ def doPrintOrgs():
18052
18059
  pageMessage=pageMessage,
18053
18060
  throwReasons=[GAPI.INVALID_ORGUNIT, GAPI.ORGUNIT_NOT_FOUND,
18054
18061
  GAPI.INVALID_INPUT, GAPI.BAD_REQUEST, GAPI.RESOURCE_NOT_FOUND, GAPI.FORBIDDEN],
18062
+ retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
18055
18063
  customer=GC.Values[GC.CUSTOMER_ID], query=orgUnitPathQuery(orgUnitPath, None), orderBy='email',
18056
18064
  fields='nextPageToken,users(orgUnitPath,suspended)', maxResults=GC.Values[GC.USER_MAX_RESULTS])
18057
18065
  for users in feed:
@@ -18341,6 +18349,7 @@ def doCheckOrgUnit():
18341
18349
  pageMessage=pageMessage,
18342
18350
  throwReasons=[GAPI.INVALID_ORGUNIT, GAPI.ORGUNIT_NOT_FOUND,
18343
18351
  GAPI.INVALID_INPUT, GAPI.BAD_REQUEST, GAPI.RESOURCE_NOT_FOUND, GAPI.FORBIDDEN],
18352
+ retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
18344
18353
  customer=GC.Values[GC.CUSTOMER_ID], query=orgUnitPathQuery(orgUnitPath, None),
18345
18354
  fields='nextPageToken,users(orgUnitPath)', maxResults=GC.Values[GC.USER_MAX_RESULTS])
18346
18355
  for users in feed:
@@ -18906,7 +18915,7 @@ def doPrintAliases():
18906
18915
  throwReasons=[GAPI.INVALID_ORGUNIT, GAPI.INVALID_INPUT, GAPI.DOMAIN_NOT_FOUND,
18907
18916
  GAPI.RESOURCE_NOT_FOUND, GAPI.FORBIDDEN, GAPI.BAD_REQUEST,
18908
18917
  GAPI.UNKNOWN_ERROR, GAPI.FAILED_PRECONDITION],
18909
- retryReasons=[GAPI.UNKNOWN_ERROR, GAPI.FAILED_PRECONDITION],
18918
+ retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS+[GAPI.UNKNOWN_ERROR, GAPI.FAILED_PRECONDITION],
18910
18919
  query=query, orderBy='email',
18911
18920
  fields=f'nextPageToken,users({",".join(userFields)})',
18912
18921
  maxResults=GC.Values[GC.USER_MAX_RESULTS], **kwargs)
@@ -19005,7 +19014,7 @@ def doPrintAddresses():
19005
19014
  pageMessage=getPageMessage(showFirstLastItems=True), messageAttribute='primaryEmail',
19006
19015
  throwReasons=[GAPI.RESOURCE_NOT_FOUND, GAPI.FORBIDDEN, GAPI.BAD_REQUEST,
19007
19016
  GAPI.UNKNOWN_ERROR, GAPI.FAILED_PRECONDITION],
19008
- retryReasons=[GAPI.UNKNOWN_ERROR, GAPI.FAILED_PRECONDITION],
19017
+ retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS+[GAPI.UNKNOWN_ERROR, GAPI.FAILED_PRECONDITION],
19009
19018
  orderBy='email', fields=f'nextPageToken,users({",".join(userFields)})',
19010
19019
  maxResults=GC.Values[GC.USER_MAX_RESULTS], **kwargs)
19011
19020
  except (GAPI.unknownError, GAPI.failedPrecondition) as e:
@@ -44338,6 +44347,7 @@ def undeleteUsers(entityList):
44338
44347
  try:
44339
44348
  deleted_users = callGAPIpages(cd.users(), 'list', 'users',
44340
44349
  throwReasons=[GAPI.BAD_REQUEST, GAPI.RESOURCE_NOT_FOUND, GAPI.FORBIDDEN],
44350
+ retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
44341
44351
  customer=GC.Values[GC.CUSTOMER_ID], showDeleted=True, orderBy='email',
44342
44352
  maxResults=GC.Values[GC.USER_MAX_RESULTS])
44343
44353
  except (GAPI.badRequest, GAPI.resourceNotFound, GAPI.forbidden):
@@ -45590,7 +45600,7 @@ def doPrintUsers(entityList=None):
45590
45600
  throwReasons=[GAPI.DOMAIN_NOT_FOUND, GAPI.INVALID_ORGUNIT, GAPI.INVALID_INPUT,
45591
45601
  GAPI.BAD_REQUEST, GAPI.RESOURCE_NOT_FOUND, GAPI.FORBIDDEN,
45592
45602
  GAPI.UNKNOWN_ERROR, GAPI.FAILED_PRECONDITION],
45593
- retryReasons=[GAPI.UNKNOWN_ERROR, GAPI.FAILED_PRECONDITION],
45603
+ retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS+[GAPI.UNKNOWN_ERROR, GAPI.FAILED_PRECONDITION],
45594
45604
  query=query, fields=fields,
45595
45605
  showDeleted=showDeleted, orderBy=orderBy, sortOrder=sortOrder, viewType=viewType,
45596
45606
  projection=schemaParms['projection'], customFieldMask=schemaParms['customFieldMask'],
@@ -45796,6 +45806,7 @@ def doPrintUserCountsByOrgUnit():
45796
45806
  result = callGAPIpages(cd.users(), 'list', 'users',
45797
45807
  pageMessage=pageMessage,
45798
45808
  throwReasons=[GAPI.BAD_REQUEST, GAPI.RESOURCE_NOT_FOUND, GAPI.DOMAIN_NOT_FOUND, GAPI.FORBIDDEN],
45809
+ retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
45799
45810
  orderBy='email', fields='nextPageToken,users(orgUnitPath,archived,suspended)',
45800
45811
  maxResults=GC.Values[GC.USER_MAX_RESULTS], **kwargs)
45801
45812
  except (GAPI.badRequest, GAPI.resourceNotFound, GAPI.forbidden, GAPI.domainNotFound):
{gam7-7.12.0.dist-info → gam7-7.12.2.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: gam7
3
- Version: 7.12.0
3
+ Version: 7.12.2
4
4
  Summary: CLI tool to manage Google Workspace
5
5
  Project-URL: Homepage, https://github.com/GAM-team/GAM
6
6
  Project-URL: Issues, https://github.com/GAM-team/GAM/issues
{gam7-7.12.0.dist-info → gam7-7.12.2.dist-info}/RECORD RENAMED
@@ -1,4 +1,4 @@
1
- gam/__init__.py,sha256=cfEdXRwmH_k_LxC_K1fUb_f3U6QJEbdeRgifNbIml-E,3552775
1
+ gam/__init__.py,sha256=iszpo2XMLNsqk9Kx5sfNY2EnpiGc3R8L7d0IwQqwRxo,3553770
2
2
  gam/__main__.py,sha256=amz0-959ph6zkZKqjaar4n60yho-T37w6qWI36qx0CA,1049
3
3
  gam/cacerts.pem,sha256=82Ak7btW_2XvocLUvAwPmpx8Chi0oqtZUG1gseLK_t4,50235
4
4
  gam/cbcm-v1.1beta1.json,sha256=xO5XloCQQULmPbFBx5bckdqmbLFQ7sJ2TImhE1ysDIY,19439
@@ -65,8 +65,8 @@ gam/googleapiclient/discovery_cache/base.py,sha256=yCDPtxnbNN-p5_9fzBacC6P3wcUPl
65
65
  gam/googleapiclient/discovery_cache/file_cache.py,sha256=sim3Mg4HgRYo3vX75jvcKy_aV568EvIrtBfvfbw-044,4774
66
66
  gam/iso8601/__init__.py,sha256=Z2PsYbXgAH5a5xzUvgczCboPzqWpm65kRcIngCnhViU,1218
67
67
  gam/iso8601/iso8601.py,sha256=Li2FHZ4sBTWuthuQhyCvmvj0j6At8JbGzkSv2fc2RHU,4384
68
- gam7-7.12.0.dist-info/METADATA,sha256=XGDLloTgzF7PTJqG9PtCxSkocS0hiVMMb3Pgugr3OL4,2978
69
- gam7-7.12.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
70
- gam7-7.12.0.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
71
- gam7-7.12.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
72
- gam7-7.12.0.dist-info/RECORD,,
68
+ gam7-7.12.2.dist-info/METADATA,sha256=1uQ-hd0J-fSVQzRmTvnnwE4fobPuaEOWu5x5zf5oOeM,2978
69
+ gam7-7.12.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
70
+ gam7-7.12.2.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
71
+ gam7-7.12.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
72
+ gam7-7.12.2.dist-info/RECORD,,
{gam7-7.12.0.dist-info → gam7-7.12.2.dist-info}/WHEEL RENAMED
File without changes