gam7 7.3.5__tar.gz → 7.3.6__tar.gz

gam7-7.3.6/.github/workflows/pypi.yml

@@ -0,0 +1,32 @@
+name: build and publish releases to PyPi
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  pypi:
+    name: Upload release to PyPI
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/gam7
+    permissions:
+      id-token: write
+    steps:
+
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Install required packages to publish
+        run: |
+          python3 -m pip install --upgrade build
+
+      - name: Build packages
+        run: |
+          python -m build
+
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

{gam7-7.3.5 → gam7-7.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.3.5
+Version: 7.3.6
 Summary: CLI tool to manage Google Workspace
 Project-URL: Homepage, https://github.com/GAM-team/GAM
 Project-URL: Issues, https://github.com/GAM-team/GAM/issues

{gam7-7.3.5 → gam7-7.3.6}/src/GamCommands.txt

@@ -2096,13 +2096,13 @@ gam show browsers
         ([ou|org|orgunit|browserou <OrgUnitPath>] [(query <QueryBrowser>)|(queries <QueryBrowserList>))|(select <BrowserEntity>))
         [querytime<String> <Time>]
         [orderby <BrowserOrderByFieldName> [ascending|descending]]
-        [basic|full|allfields|annotated] <BrowserFieldName>* [fields <BrowserFieldNameList>]
+        [basic|full|allfields|annotated] <BrowserFieldName>* [fields <BrowserFieldNameList>] [rawfields <BrowserFieldsString>]
         [formatjson]
 gam print browsers [todrive <ToDriveAttribute>*]
         ([ou|org|orgunit|browserou <OrgUnitPath>] [(query <QueryBrowser>)|(queries <QueryBrowserList>))|(select <BrowserEntity>))
         [querytime<String> <Time>]
         [orderby <BrowserOrderByFieldName> [ascending|descending]]
-        [basic|full|allfields|annotated] <BrowserFieldName>* [fields <BrowserFieldNameList>]
+        [basic|full|allfields|annotated] <BrowserFieldName>* [fields <BrowserFieldNameList>] [rawfields <BrowserFieldsString>]
         [sortheaders]
         [formatjson [quotechar <Character>]]
 

{gam7-7.3.5 → gam7-7.3.6}/src/GamUpdate.txt

@@ -1,3 +1,7 @@
+7.03.06
+
+gam print browsers rawfields - specify complex values for the fields argument
+
 7.03.05
 
 Make GAM pip-installable: "pip install gam7"

{gam7-7.3.5 → gam7-7.3.6}/src/gam/__init__.py

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
 """
 
 __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
-__version__ = '7.03.05'
+__version__ = '7.03.06'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -7768,6 +7768,9 @@ def RowFilterMatch(row, titlesList, rowFilter, rowFilterModeAll, rowDropFilter,
       return False
   return True
 
+def getFieldsRaw():
+  return getString(Cmd.OB_FIELDS)
+
 # myarg is command line argument
 # fieldChoiceMap maps myarg to API field names
 #FIELD_CHOICE_MAP = {
@@ -25502,6 +25505,7 @@ def doPrintShowBrowsers():
   csvPF = CSVPrintFile(['deviceId']) if Act.csvFormat() else None
   FJQC = FormatJSONQuoteChar(csvPF)
   fieldsList = []
+  fields = None
   projection = 'BASIC'
   orderBy = 'id'
   sortOrder = 'ASCENDING'
@@ -25538,13 +25542,18 @@ def doPrintShowBrowsers():
       fieldsList = []
     elif myarg == 'sortheaders':
       sortHeaders = True
+    elif myarg == 'rawfields':
+      projection = 'FULL'
+      fields = getFieldsRaw()
     elif getFieldsList(myarg, BROWSER_FIELDS_CHOICE_MAP, fieldsList, initialField='deviceId'):
       pass
     else:
       FJQC.GetFormatJSONQuoteChar(myarg, True)
   if projection == 'BASIC' and set(fieldsList).intersection(BROWSER_FULL_ACCESS_FIELDS):
     projection = 'FULL'
-  fields = getItemFieldsFromFieldsList('browsers', fieldsList)
+  if not fields:
+    fields = getItemFieldsFromFieldsList('browsers', fieldsList)
+  print(f'fields: {fields}')
   if FJQC.formatJSON:
     sortHeaders = False
   substituteQueryTimes(queries, queryTimes)

{gam7-7.3.5 → gam7-7.3.6}/src/gam/gamlib/glclargs.py

@@ -922,6 +922,7 @@ class GamCLArgs():
   OB_EVENT_ID_ENTITY = 'EventIDEntity'
   OB_EVENT_NAME_LIST = "EventNameList"
   OB_EXPORT_ITEM = 'ExportItem'
+  OB_FIELDS = 'Fields'
   OB_FIELD_NAME = 'FieldName'
   OB_FIELD_NAME_LIST = "FieldNameList"
   OB_FILE_NAME = 'FileName'