gam7 7.21.1__tar.gz → 7.21.3__tar.gz

{gam7-7.21.1 → gam7-7.21.3}/.github/workflows/build.yml

@@ -77,34 +77,38 @@ jobs:
             jid: 9
             goal: build
             name: Build Arm MacOS 15
-          - os: windows-2025
+          - os: macos-26
             jid: 10
             goal: build
+            name: Build Arm MacOS 26
+          - os: windows-2025
+            jid: 11
+            goal: build
             name: Build Intel Windows
           - os: windows-11-arm
-            jid: 11
+            jid: 12
             goal: build
             name: Build Arm Windows
           - os: ubuntu-24.04
             goal: test
             python: "3.10"
-            jid: 12
+            jid: 13
             name: Test Python 3.10
           - os: ubuntu-24.04
             goal: test
             python: "3.11"
-            jid: 13
+            jid: 14
             name: Test Python 3.11
           - os: ubuntu-24.04
             goal: test
             python: "3.12"
-            jid: 14
-            name: Test Python 3.12
-          - os: ubuntu-24.04
-            goal: test
-            python: "3.14-dev"
             jid: 15
-            name: Test Python 3.14-dev
+            name: Test Python 3.12
+          #- os: ubuntu-24.04
+          #  goal: test
+          #  python: "3.14-dev"
+          #  jid: 16
+          #  name: Test Python 3.14-dev
 
     steps:
 
@@ -127,7 +131,7 @@ jobs:
         with:
           path: |
             cache.tar.xz
-          key: gam-${{ matrix.jid }}-20250911
+          key: gam-${{ matrix.jid }}-20250916
 
       - name: Untar Cache archive
         if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true'
@@ -454,21 +458,14 @@ jobs:
           "$PYTHON" -m pip install --upgrade setuptools-scm
           "$PYTHON" -m pip list
 
-      - name: Custom wheels for Win arm64
-        if: runner.os == 'Windows' && runner.arch == 'ARM64'
-        run: |
-          latest_crypt_whl=$(curl https://api.github.com/repos/jay0lee/cryptography/releases/latest -s | jq -r .assets.[0].browser_download_url)
-          echo "Downloading ${latest_crypt_whl}..."
-          curl -O -L "$latest_crypt_whl"
-          "$PYTHON" -m pip install cryptography*.whl
-
       - name: Install pip requirements
         run: |
           echo "before anything..."
           "$PYTHON" -m pip list
           "$PYTHON" -m pip install --upgrade ..[yubikey]
+          # forcefully update all installed packages
+          "$PYTHON" -m pip --disable-pip-version-check list --outdated --format=json | "$PYTHON" -c "import json, sys; print('\n'.join([x['name'] for x in json.load(sys.stdin)]))" | xargs -n1 "$PYTHON" -m pip install -U
           "$PYTHON" -m pip list
-          #"$PYTHON" -m pip install --force-reinstall --no-deps --upgrade cryptography
           echo "after everything..."
           "$PYTHON" -m pip list
 

{gam7-7.21.1 → gam7-7.21.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.21.1
+Version: 7.21.3
 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.21.1 → gam7-7.21.3}/src/GamCommands.txt

@@ -5710,7 +5710,7 @@ gam create|add user <EmailAddress> [ignorenullpassword] <UserAttribute>*
         (groups [<GroupRole>] [[delivery] <DeliverySetting>] <GroupEntity>)*
         [alias|aliases <EmailAddressList>]
         [license <SKUIDList> [product|productid <ProductID>]]
-        [notify <EmailAddressList>
+        [[notify <EmailAddressList>] [notifyrecoveryemail]
             [subject <String>]
             [notifypassword <String>]
             [from <EmailAaddress>]
@@ -5736,7 +5736,7 @@ gam update user <UserItem> [ignorenullpassword] <UserAttribute>*
         [createifnotfound] [notfoundpassword (random [<Integer>])|blocklogin|<Password>]
         (groups [<GroupRole>] [[delivery] <DeliverySetting>] <GroupEntity>)*
         [alias|aliases <EmailAddressList>]
-        [notify <EmailAddressList>
+        [[notify <EmailAddressList>] [notifyrecoveryemail]
             [subject <String>]
             [notifypassword <String>]
             [from <EmailAaddress>]
@@ -5774,7 +5774,7 @@ gam update users <UserTypeEntity> [ignorenullpassword] <UserAttribute>*
         [createifnotfound] [notfoundpassword (random [<Integer>])|blocklogin|<Password>]
         (groups [<GroupRole>] [[delivery] <DeliverySetting>] <GroupEntity>)*
         [alias|aliases <EmailAddressList>]
-        [notify <EmailAddressList>
+        [[notify <EmailAddressList>] [notifyrecoveryemail]
             [subject <String>]
             [notifypassword <String>]
             [from <EmailAddress>]
@@ -5811,7 +5811,7 @@ gam <UserTypeEntity> update users [ignorenullpassword] <UserAttribute>*
         [createifnotfound] [notfoundpassword (random [<Integer>])|blocklogin|<Password>]
         (groups [<GroupRole>] [[delivery] <DeliverySetting>] <GroupEntity>)*
         [alias|aliases <EmailAddressList>]
-        [notify <EmailAddressList>
+        [[notify <EmailAddressList>] [notifyrecoveryemail]
             [subject <String>]
             [notifypassword <String>]
             [from <EmailAaddress>]

{gam7-7.21.1 → gam7-7.21.3}/src/GamUpdate.txt

@@ -1,3 +1,16 @@
+7.21.03
+
+Added option `notifyrecoveryemail` to `gam create user` and `gam <UserTypeEntity> update user password <String>`
+that sends the passsword notification email to the user's recovery email address (if defined).
+
+7.21.02
+
+GAM now builds on macOS 26 Tahoe and properly identifies the OS.
+
+A custom build of the cryptography library is no longer needed for Windows arm64 builds as the project now releases their own build for the OS.
+
+Upgrade to OpenSSL 3.5.3 latest
+
 7.21.01
 
 Replaced datetime, dateutil, calendar and iso8601 Python libraries with arrow library.

{gam7-7.21.1 → gam7-7.21.3}/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.21.01'
+__version__ = '7.21.03'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -9361,6 +9361,7 @@ MACOS_CODENAMES = {
   13: 'Ventura',
   14: 'Sonoma',
   15: 'Sequoia',
+  26: 'Tahoe',
   }
 
 def getOSPlatform():
@@ -9370,7 +9371,7 @@ def getOSPlatform():
   elif myos == 'Windows':
     pltfrm = ' '.join(platform.win32_ver())
   elif myos == 'Darwin':
-    myos = 'MacOS'
+    myos = 'macOS'
     mac_ver = platform.mac_ver()[0]
     major_ver = int(mac_ver.split('.')[0]) # macver 10.14.6 == major_ver 10
     minor_ver = int(mac_ver.split('.')[1]) # macver 10.14.6 == minor_ver 14
@@ -43946,6 +43947,7 @@ def getUserAttributes(cd, updateCmd, noUid=False):
     invalidArgumentExit(Cmd.OB_SCHEMA_NAME_FIELD_NAME)
 
   parameters = {
+    'notifyRecoveryEmail': False,
     'verifyNotInvitable': False,
     'createIfNotFound': False,
     'noActionIfAlias': False,
@@ -43962,7 +43964,7 @@ def getUserAttributes(cd, updateCmd, noUid=False):
     body = {'name': {'givenName': UNKNOWN, 'familyName': UNKNOWN}}
     body['primaryEmail'] = getEmailAddress(noUid=noUid)
   notFoundBody = {}
-  notify = {'subject': '', 'message': '', 'html': False, 'charset': UTF8, 'password': ''}
+  notify = {'recipients': [], 'subject': '', 'message': '', 'html': False, 'charset': UTF8, 'password': ''}
   primary = {}
   updatePrimaryEmail = {}
   groupOrgUnitMap = None
@@ -43974,7 +43976,9 @@ def getUserAttributes(cd, updateCmd, noUid=False):
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
     if myarg == 'notify':
-      notify['recipients'] = getNormalizedEmailAddressEntity(shlexSplit=True, noLower=True)
+      notify['recipients'].extend(getNormalizedEmailAddressEntity(shlexSplit=True, noLower=True))
+    elif myarg == 'notifyrecoveryemail':
+      parameters['notifyRecoveryEmail'] = True
     elif myarg == 'subject':
       notify['subject'] = getString(Cmd.OB_STRING)
     elif myarg in SORF_MSG_FILE_ARGUMENTS:
@@ -44390,7 +44394,7 @@ def createUserAddAliases(cd, user, aliasList, i, count):
 #	(groups [<GroupRole>] [[delivery] <DeliverySetting>] <GroupEntity>)*
 #	[alias|aliases <EmailAddressList>]
 #	[license <SKUID> [product|productid <ProductID>]]
-#	[notify <EmailAddressList>
+#	[[notify <EmailAddressList>] [notifyrecoveryemail]
 #	    [subject <String>]
 #	    [notifypassword <String>]
 #	    [from <EmailAaddress>]
@@ -44408,7 +44412,7 @@ def doCreateUser():
   suffix = 0
   originalEmail = body['primaryEmail']
   atLoc = originalEmail.find('@')
-  fields = '*' if tagReplacements['subs'] else 'primaryEmail,name'
+  fields = '*' if tagReplacements['subs'] else 'primaryEmail,name,recoveryEmail'
   while True:
     user = body['primaryEmail']
     if parameters['verifyNotInvitable']:
@@ -44449,7 +44453,9 @@ def doCreateUser():
     createUserAddToGroups(cd, result['primaryEmail'], addGroups, 0, 0)
   if addAliases:
     createUserAddAliases(cd, result['primaryEmail'], addAliases, 0, 0)
-  if notify.get('recipients'):
+  if (notify.get('recipients') or (parameters['notifyRecoveryEmail'] and result.get('recoveryEmail'))):
+    if parameters['notifyRecoveryEmail'] and result.get('recoveryEmail'):
+      notify['recipients'].append(result['recoveryEmail'])
     sendCreateUpdateUserNotification(result, notify, tagReplacements)
   for productSku in parameters[LICENSE_PRODUCT_SKUIDS]:
     productId = productSku[0]
@@ -44492,7 +44498,7 @@ def verifyUserPrimaryEmail(cd, user, createIfNotFound, i, count):
 #	[createifnotfound] [notfoundpassword (random [<Integer>])|blocklogin|<Password>]
 #	(groups [<GroupRole>] [[delivery] <DeliverySetting>] <GroupEntity>)*
 #	[alias|aliases <EmailAddressList>]
-#	[notify <EmailAddressList>
+#	[[notify <EmailAddressList>] [notifyrecoveryemail]
 #	    [subject <String>]
 #	    [notifypassword <String>]
 #	    [from <EmailAaddress>]
@@ -44521,7 +44527,7 @@ def updateUsers(entityList):
   else:
     checkImmutableOUs = False
   i, count, entityList = getEntityArgument(entityList)
-  fields = '*' if tagReplacements['subs'] else 'primaryEmail,name'
+  fields = '*' if tagReplacements['subs'] else 'primaryEmail,name,recoveryEmail'
   for user in entityList:
     i += 1
     user = userKey = normalizeEmailAddressOrUID(user)
@@ -44597,7 +44603,10 @@ def updateUsers(entityList):
             entityActionPerformed([Ent.USER, user], i, count)
             if PwdOpts.filename and PwdOpts.password:
               writeFile(PwdOpts.filename, f'{userKey},{PwdOpts.password}\n', mode='a', continueOnError=True)
-            if parameters['notifyOnUpdate'] and notify.get('recipients') and notify['password']:
+            if (parameters['notifyOnUpdate'] and notify['password'] and
+                (notify.get('recipients') or (parameters['notifyRecoveryEmail'] and result.get('recoveryEmail')))):
+              if parameters['notifyRecoveryEmail'] and result.get('recoveryEmail'):
+                notify['recipients'].append(result['recoveryEmail'])
               sendCreateUpdateUserNotification(result, notify, tagReplacements, i, count, createMessage=False)
             break
           except GAPI.conditionNotMet as e:
@@ -44631,8 +44640,10 @@ def updateUsers(entityList):
                     createUserAddToGroups(cd, result['primaryEmail'], addGroups, i, count)
                   if addAliases:
                     createUserAddAliases(cd, result['primaryEmail'], addAliases, i, count)
-                  if notify.get('recipients'):
+                  if (notify.get('recipients') or (parameters['notifyRecoveryEmail'] and result.get('recoveryEmail'))):
                     notify['password'] = notify['notFoundPassword']
+                    if parameters['notifyRecoveryEmail'] and result.get('recoveryEmail'):
+                      notify['recipients'].append(result['recoveryEmail'])
                     sendCreateUpdateUserNotification(result, notify, tagReplacements, i, count)
                 except GAPI.duplicate:
                   duplicateAliasGroupUserWarning(cd, [Ent.USER, body['primaryEmail']], i, count)

gam7-7.21.3/wiki/GAM-Release-Process.md

@@ -0,0 +1,19 @@
+# Steps to release a new GAM version
+1. In a final commit before release:
+    - [src/gam/__init.py](https://github.com/GAM-team/GAM/blob/main/src/gam/__init__.py) `__version___` value should be updated to the new version.
+    - [src/GamUpdate.txt](https://github.com/GAM-team/GAM/blob/main/src/GamUpdate.txt) should be updated with a high-level changelog.
+    - [wiki/GamUpdates.md](https://github.com/GAM-team/GAM/blob/main/wiki/GamUpdates.md) should be updated with same high-level changelog.
+2. The [build.yaml](https://github.com/GAM-team/GAM/blob/main/.github/workflows/build.yml) Github Action for final commit should complete successfully and creating a new dated Draft release.
+    - We should *NEVER* upload release files manually. Only release files automatically created and [attested](https://github.com/GAM-team/GAM/wiki/Verifying-a-GAM7-Build-is-Legitimate-and-Official#github-attestation-linuxmacoswindows) as created by the Github Action should be used.
+3. Edit the Draft release:
+    - Create a new tag with the format: `vN.NN.NN` where N.NN.NN is the GAM release version.
+    - name the release "GAM N.NN.NN" where N.NN.NN is the GAM release version.
+    - Include the changelog details for the new version in details.
+    - leave "Set as pre-release" unchecked and "Set as the latest release" checked.
+    - Publish the release.
+
+# TODO: Release Process Improvements
+- copying changelog between GamUpdate.txt, GamUpdates.md and release description is manual and tedious. Automate it.
+- copying version string from gam/__init__.py, changelogs and release details and tag in manual and tedious. Automate it.
+- See if we can block releases with binaries not uploaded by GitHub Actions to further secure release pipelines.
+

{gam7-7.21.1 → gam7-7.21.3}/wiki/GamUpdates.md

@@ -10,7 +10,15 @@ Add the `-s` option to the end of the above commands to suppress creating the `g
 
 See [Downloads-Installs-GAM7](https://github.com/GAM-team/GAM/wiki/Downloads-Installs) for Windows or other options, including manual installation
 
-### 7.21.00
+### 7.21.02
+
+GAM now builds on macOS 26 Tahoe and properly identifies the OS.
+
+A custom build of the cryptography library is no longer needed for Windows arm64 builds as the project now releases their own build for the OS.
+
+Upgrade to OpenSSL 3.5.3 latest
+
+### 7.21.01
 
 Replaced datetime, dateutil, calendar and iso8601 Python libraries with arrow library.
 This should have no performance impact; report any problems.

{gam7-7.21.1 → gam7-7.21.3}/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md

@@ -252,7 +252,7 @@ writes the credentials into the file oauth2.txt.
 admin@server:/Users/admin$ rm -f /Users/admin/GAMConfig/oauth2.txt
 admin@server:/Users/admin$ gam version
 WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found
-GAM 7.21.00 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.21.01 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.7 64-bit final
 MacOS Sequoia 15.6.1 x86_64
@@ -990,7 +990,7 @@ writes the credentials into the file oauth2.txt.
 C:\>del C:\GAMConfig\oauth2.txt
 C:\>gam version
 WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found
-GAM 7.21.00 - https://github.com/GAM-team/GAM - pythonsource
+GAM 7.21.01 - https://github.com/GAM-team/GAM - pythonsource
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.7 64-bit final
 Windows-10-10.0.17134 AMD64

{gam7-7.21.1 → gam7-7.21.3}/wiki/Version-and-Help.md

@@ -3,7 +3,7 @@
 Print the current version of Gam with details
 ```
 gam version
-GAM 7.21.00 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.21.01 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.7 64-bit final
 MacOS Sequoia 15.6.1 x86_64
@@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00
 Print the current version of Gam with details and time offset information
 ```
 gam version timeoffset
-GAM 7.21.00 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.21.01 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.7 64-bit final
 MacOS Sequoia 15.6.1 x86_64
@@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second
 Print the current version of Gam with extended details and SSL information
 ```
 gam version extended
-GAM 7.21.00 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.21.01 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.7 64-bit final
 MacOS Sequoia 15.6.1 x86_64
@@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64
 Path: /Users/Admin/bin/gam7
 Version Check:
   Current: 5.35.08
-   Latest: 7.21.00
+   Latest: 7.21.01
 echo $?
 1
 ```
@@ -72,7 +72,7 @@ echo $?
 Print the current version number without details
 ```
 gam version simple
-7.21.00
+7.21.01
 ```
 In Linux/MacOS you can do:
 ```
@@ -82,7 +82,7 @@ echo $VER
 Print the current version of Gam and address of this Wiki
 ```
 gam help
-GAM 7.21.00 - https://github.com/GAM-team/GAM
+GAM 7.21.01 - https://github.com/GAM-team/GAM
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.7 64-bit final
 MacOS Sequoia 15.6.1 x86_64