From 587fed282da6f9d48c880525e92271a47e2a9c29 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Wed, 4 Jul 2018 15:51:38 -0400
Subject: [PATCH] accept simpler values for collaborative, Identity SKU

---
 src/gam.py | 30 ++++++++++++++----------------
 src/var.py | 19 +++++++++++++++++++
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/gam.py b/src/gam.py
index b9355529..22d664aa 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -7719,24 +7719,22 @@ def doCreateUser():
 def GroupIsAbuseOrPostmaster(emailAddr):
   return emailAddr.startswith(u'abuse@') or emailAddr.startswith(u'postmaster@')
 
-COLLABORATIVE_INBOX_ATTRIBUTES = [
-  u'whoCanAddReferences',
-  u'whoCanAssignTopics',
-  u'whoCanEnterFreeFormTags',
-  u'whoCanMarkDuplicate',
-  u'whoCanMarkFavoriteReplyOnAnyTopic',
-  u'whoCanMarkFavoriteReplyOnOwnTopic',
-  u'whoCanMarkNoResponseNeeded',
-  u'whoCanModifyTagsAndCategories',
-  u'whoCanTakeTopics',
-  u'whoCanUnassignTopic',
-  u'whoCanUnmarkFavoriteReplyOnAnyTopic',
-  ]
-
 def getGroupAttrValue(myarg, value, gs_object, gs_body, function):
   if myarg == u'collaborative':
-    for attrName in COLLABORATIVE_INBOX_ATTRIBUTES:
-      gs_body[attrName] = value
+    value = value.upper()
+    if value in ['MEMBERS']:
+      value = 'ALL_MEMBERS'
+    elif value in ['OWNERS']:
+      value = 'OWNERS_ONLY'
+    elif value in ['MANAGERS']:
+      value = u'OWNERS_AND_MANAGERS'
+    elif value in ['MANAGERSONLY']:
+      value = u'MANAGERS_ONLY'
+    for attrName, attrValue in COLLABORATIVE_INBOX_ATTRIBUTES.items():
+      if attrValue == u'acl':
+        gs_body[attrName] = value
+      else:
+        gs_body[attrName] = attrValue
     return
   for (attrib, params) in gs_object[u'schemas'][u'Groups'][u'properties'].items():
     if attrib in [u'kind', u'etag', u'email']:
diff --git a/src/var.py b/src/var.py
index d43e1149..4bfc95ea 100644
--- a/src/var.py
+++ b/src/var.py
@@ -43,6 +43,10 @@ FN_OAUTH2SERVICE_JSON = u'oauth2service.json'
 FN_OAUTH2_TXT = u'oauth2.txt'
 MY_CUSTOMER = u'my_customer'
 SKUS = {
+  u'1010010001': {
+    u'product': u'101001', u'aliases': [u'identity', u'cloudidentity'], u'displayName': 'Cloud Identity'},
+  u'1010050001': {
+    u'product': u'101005', u'aliases': [u'identitypremium', u'cloudidentitypremium'], u'displayName': 'Cloud Identity Premium'},
   u'1010310002': {
     u'product': u'101031', u'aliases': [u'gsefe', u'e4e'], u'displayName': u'G Suite Enterprise for Education'},
   u'Google-Apps': {
@@ -507,6 +511,21 @@ CROS_END_ARGUMENTS = [u'end', u'enddate']
 CROS_TPM_VULN_VERSIONS = [u'41f', u'420', u'628', u'8520',]
 CROS_TPM_FIXED_VERSIONS = [u'422', u'62b', u'8521',]
 
+COLLABORATIVE_INBOX_ATTRIBUTES = {
+  u'whoCanAddReferences': u'acl',
+  u'whoCanAssignTopics': u'acl',
+  u'whoCanEnterFreeFormTags': u'acl',
+  u'whoCanMarkDuplicate': u'acl',
+  u'whoCanMarkFavoriteReplyOnAnyTopic': u'acl',
+  u'whoCanMarkFavoriteReplyOnOwnTopic': u'acl',
+  u'whoCanMarkNoResponseNeeded': u'acl',
+  u'whoCanModifyTagsAndCategories': u'acl',
+  u'whoCanTakeTopics': u'acl',
+  u'whoCanUnassignTopic': u'acl',
+  u'whoCanUnmarkFavoriteReplyOnAnyTopic': u'acl',
+  u'favoriteRepliesOnTop': True,
+  }
+
 #
 # Global variables
 #