From 2cc79f44eacfb3ea752bd42ce73efddb61488c48 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <taers232c@users.noreply.github.com>
Date: Sat, 31 Dec 2016 08:50:39 -0800
Subject: [PATCH] Update licenses (#376)

* Update documentation for new license aliases

Add government as in PR #362

* Allow full SKU to be specified
---
 src/GamCommands.txt | 13 ++++++++++---
 src/gam.py          |  3 ++-
 src/var.py          |  2 ++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index d939e95c..8f847a4f 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -17,10 +17,17 @@ Primitives
 <TrueValues> ::= true|on|yes|enabled|1
 <FalseValues>= false|off|no|disabled|0
 <DataTransferService> ::= googledrive|gdrive|drive|"drive and docs"
-<ProductID> ::= Google-Apps|Google-Coordinate|Google-Drive-storage|Google-Vault
-<SKUID> ::= apps|gafb|gafw|gsbasic|gafg|gams|gau|unlimited|d4w|dfw|gsbusiness|coordinate|vault|vfe|
+<ProductID> ::= Google-Apps|Google-Drive-storage|Google-Vault|Google-Coordinate
+<SKUID> ::= gafb|gafw|basic|gsuite-basic|
+	    gafg|gsuite-government|
+	    gal|lite|gsuite-lite|
+	    gams|postini|gsuite-gams|
+	    gau|unlimited|gsuite-business|
 	    drive-20gb|drive20gb|20gb|drive-50gb|drive50gb|50gb|drive-200gb|drive200gb|200gb|drive-400gb|drive400gb|400gb|
-	    drive-1tb|drive1tb|1tb|drive-2tb|drive2tb|2tb|drive-4tb|drive4tb|4tb|drive-8tb|drive8tb|8tb|drive-16tb|drive16tb|16tb
+	    drive-1tb|drive1tb|1tb|drive-2tb|drive2tb|2tb|drive-4tb|drive4tb|4tb|drive-8tb|drive8tb|8tb|drive-16tb|drive16tb|16tb|
+	    vault|
+	    vfe|
+	    coordinate
 <Charset> ::= ascii|mbcs|utf-8|utf-8-sig|utf-16|<String>
 <FileFormat> ::= csv|html|txt|tsv|jpeg|jpg|png|svg|pdf|rtf|pptx|xlsx|docx|odt|ods|openoffice|ms|microsoft|micro$oft
 <Language> ::= ar|bn|bg|ca|zh-CN|zh-TW|hr|cs|da|nl|en|en-GB|et|fi|fr|de|el|gu|iw|is|in|it|ja|kn|ko|lv|lt|ms|ml|mr|no|or|fa|pl|pt-BR|pt-PT|ro|ru|sr|sk|sl|es|sv|tl|ta|te|th|tr|uk|ur|vi
diff --git a/src/gam.py b/src/gam.py
index ff09aa09..df642fe8 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -4255,8 +4255,9 @@ def getImap(users):
 
 def getProductAndSKU(sku):
   product = None
+  l_sku = sku.lower()
   for a_sku, sku_values in SKUS.items():
-    if sku.lower() in sku_values[u'aliases']:
+    if l_sku == a_sku.lower() or l_sku in sku_values[u'aliases']:
       sku = a_sku
       product = sku_values[u'product']
       break
diff --git a/src/var.py b/src/var.py
index 16a89fe1..cce17b25 100644
--- a/src/var.py
+++ b/src/var.py
@@ -42,6 +42,8 @@ MY_CUSTOMER = u'my_customer'
 SKUS = {
   u'Google-Apps-For-Business': {
    u'product': u'Google-Apps', u'aliases': [u'gafb', u'gafw', u'basic', u'gsuite-basic']},
+  u'Google-Apps-For-Government': {
+   u'product': u'Google-Apps', u'aliases': [u'gafg', u'gsuite-government']},
   u'Google-Apps-For-Postini': {
    u'product': u'Google-Apps', u'aliases': [u'gams', u'postini', u'gsuite-gams']},
   u'Google-Apps-Lite': {