Merge branch 'main' of https://github.com/GAM-team/GAM

Upgraded to OpenSSL 3.5.0.
2026-06-22 07:01:37 +00:00 · 2025-04-08 09:58:27 -07:00 · 2025-04-08 09:58:25 -07:00
2 changed files with 12 additions and 5 deletions
--- a/src/GamUpdate.txt
+++ b/src/GamUpdate.txt
@@ -1,3 +1,10 @@
+7.06.00
+
+Upgraded to OpenSSL 3.5.0.
+
+Fixed bug in `gam print cigroups` where `createTime`, `updateTime` and `statusTime`
+were not converted according to `gam.cfg timezone`.
+
 7.05.22

 Updated progress messages for  `gam <UserTypeEntity> print filelist|filecounts|filesharecounts|filetree select shareddriveid <SharedDriveID>`
--- a/src/gam/init.py
+++ b/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.05.22'
+__version__ = '7.06.00'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'

 #pylint: disable=wrong-import-position
@@ -33563,14 +33563,14 @@ def doPrintGroups():
        groupSettings.pop(key)
    if FJQC.formatJSON:
      row['email'] = groupEntity['email']
-      row['JSON'] = json.dumps(groupEntity, ensure_ascii=False, sort_keys=True)
+      row['JSON'] = json.dumps(cleanJSON(groupEntity), ensure_ascii=False, sort_keys=True)
      if rolesSet and groupMembers is not None:
        row['JSON-members'] = json.dumps(groupMembers, ensure_ascii=False, sort_keys=True)
      if isinstance(groupSettings, dict):
-        row['JSON-settings'] = json.dumps(groupSettings, ensure_ascii=False, sort_keys=True)
+        row['JSON-settings'] = json.dumps(cleanJSON(groupSettings), ensure_ascii=False, sort_keys=True)
      groupCloudIdentity = ciGroups.get(row['email'], {})
      if groupCloudIdentity:
-        row['JSON-cloudIdentity'] = json.dumps(groupCloudIdentity, ensure_ascii=False, sort_keys=True)
+        row['JSON-cloudIdentity'] = json.dumps(cleanJSON(groupCloudIdentity, timeObjects=CIGROUP_TIME_OBJECTS), ensure_ascii=False, sort_keys=True)
      csvPF.WriteRowNoFilter(row)
      return
    for field in groupFieldsLists['cd']:
@@ -35935,7 +35935,7 @@ def doPrintCIGroups():
    row = {}
    if FJQC.formatJSON:
      row['email'] = groupEntity['groupKey']['id'].lower()
-      row['JSON'] = json.dumps(groupEntity, ensure_ascii=False, sort_keys=True)
+      row['JSON'] = json.dumps(cleanJSON(groupEntity, timeObjects=CIGROUP_TIME_OBJECTS), ensure_ascii=False, sort_keys=True)
      if rolesSet and groupMembers is not None:
        row['JSON-members'] = json.dumps(groupMembers, ensure_ascii=False, sort_keys=True)
      csvPF.WriteRowNoFilter(row)
Author	SHA1	Message	Date
Ross Scroggs	117eec1cfd	Merge branch 'main' of https://github.com/GAM-team/GAM Some checks are pending Build and test GAM / build (Win64, build, 10, VC-WIN64A, windows-2022) (push) Waiting to run Details Build and test GAM / build (aarch64, build, 3, linux-aarch64, ubuntu-24.04-arm) (push) Waiting to run Details Build and test GAM / build (aarch64, build, 4, linux-aarch64, ubuntu-22.04-arm) (push) Waiting to run Details Build and test GAM / build (aarch64, build, 6, linux-aarch64, ubuntu-22.04-arm, yes) (push) Waiting to run Details Build and test GAM / build (aarch64, build, 8, darwin64-arm64, macos-14) (push) Waiting to run Details Build and test GAM / build (aarch64, build, 9, darwin64-arm64, macos-15) (push) Waiting to run Details Build and test GAM / build (x86_64, build, 1, linux-x86_64, ubuntu-22.04) (push) Waiting to run Details Build and test GAM / build (x86_64, build, 2, linux-x86_64, ubuntu-24.04) (push) Waiting to run Details Build and test GAM / build (x86_64, build, 5, linux-x86_64, ubuntu-22.04, yes) (push) Waiting to run Details Build and test GAM / build (x86_64, build, 7, darwin64-x86_64, macos-13) (push) Waiting to run Details Build and test GAM / build (x86_64, test, 11, ubuntu-24.04, 3.10) (push) Waiting to run Details Build and test GAM / build (x86_64, test, 12, ubuntu-24.04, 3.11) (push) Waiting to run Details Build and test GAM / build (x86_64, test, 13, ubuntu-24.04, 3.12) (push) Waiting to run Details Build and test GAM / merge (push) Blocked by required conditions Details Build and test GAM / publish (push) Blocked by required conditions Details CodeQL / Analyze (python) (push) Waiting to run Details Check for Google Root CA Updates / check-apis (push) Waiting to run Details	2025-04-08 09:58:27 -07:00
Ross Scroggs	c460c48289	Upgraded to OpenSSL 3.5.0.	2025-04-08 09:58:25 -07:00