fix device user printing

* multivalued schema field defaults to type work;

* Update URLs

* Add new Product/SKU

* Revert to https://jaylee.us/gam

.github/ISSUE_TEMPLATE.txt

@@ -1,8 +1,8 @@
 The issue tracker is for reporting product deficiencies. "How do I?" questions should be posted to the discussion forum at https://groups.google.com/group/google-apps-manager. When in doubt, start at the discussion forum and return here only when instructed to do so.
 
 Please confirm the following:
-* I have upgraded to the latest GAM release from https://git.io/gamreleases and I still have this issue.
-* I am typing the command as described in the GAM Wiki at https://github.com/jay0lee/gam/wiki
+* I have upgraded to the latest GAM release from https://github.com/GAM-team/GAM/releases and I still have this issue.
+* I am typing the command as described in the GAM Wiki at https://github.com/GAM-team/GAM/wiki
 
 Full steps to reproduce the issue:
 1.

.github/ISSUE_TEMPLATE/za-bug-report.md

@@ -10,7 +10,7 @@ assignees: jay0lee
 The issue tracker is for reporting product deficiencies. "How do I?" questions should be posted to the discussion forum at https://groups.google.com/group/google-apps-manager. When in doubt, start at the discussion forum and return here only when instructed to do so.
 
 Please confirm the following:
-* I have upgraded to the latest GAM release from https://git.io/gamreleases and I still have this issue.
+* I have upgraded to the latest GAM release from https://github.com/GAM-team/GAM/releases and I still have this issue.
 * I am typing the command as described in the GAM Wiki at https://github.com/jay0lee/gam/wiki
 
 Full steps to reproduce the issue:

.github/workflows/build.yml

@@ -12,10 +12,10 @@ defaults:
     working-directory: src
 
 env:
-  OPENSSL_CONFIG_OPTS: no-asm no-fips
-  OPENSSL_INSTALL_PATH: ${{ github.workspace }}/src/ssl
+  OPENSSL_CONFIG_OPTS: no-fips
+  OPENSSL_INSTALL_PATH: ${{ github.workspace }}/bin/ssl
   OPENSSL_SOURCE_PATH: ${{ github.workspace }}/src/openssl
-  PYTHON_INSTALL_PATH: ${{ github.workspace }}/src/python
+  PYTHON_INSTALL_PATH: ${{ github.workspace }}/bin/python
   PYTHON_SOURCE_PATH: ${{ github.workspace }}/src/cpython
 
 jobs:
@@ -24,48 +24,53 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
+            jid: 1
+            goal: build
+            arch: x86_64
+            openssl_archs: linux-x86_64
+          - os: [self-hosted, linux, arm64]
             jid: 2
             goal: build
-            arch: x86_64
-          - os: macos-11
-            jid: 3
-            goal: build
-            arch: x86_64
-          - os: windows-2022
+            arch: aarch64
+            openssl_archs: linux-aarch64
+          - os: macos-12
             jid: 4
             goal: build
-            arch: Win64
+            arch: universal2
+            openssl_archs: darwin64-x86_64 darwin64-arm64
           - os: windows-2022
             jid: 5
             goal: build
+            arch: Win64
+            openssl_archs: VC-WIN64A
+          - os: windows-2022
+            jid: 6
+            goal: build
             arch: Win32
-          - os: ubuntu-20.04
+            openssl_archs: VC-WIN32
+          - os: ubuntu-22.04
             goal: test
             python: "3.7"
-            jid: 6
-            arch: x86_64
-          - os: ubuntu-20.04
-            goal: test
-            python: "3.8"
             jid: 7
             arch: x86_64
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             goal: test
-            python: "3.9"
+            python: "3.8"
             jid: 8
             arch: x86_64
-          - os: [self-hosted, linux, arm64]
+          - os: ubuntu-22.04
+            goal: test
+            python: "3.9"
             jid: 9
-            goal: build
-            arch: aarch64
-          - os: [self-hosted, linux, arm]
+            arch: x86_64
+          - os: ubuntu-22.04
+            goal: test
+            python: "3.11-dev"
             jid: 10
-            goal: build
-            arch: armv7l
+            arch: x86_64
 
     steps:
-
       - uses: actions/checkout@master
         with:
           persist-credentials: false
@@ -76,9 +81,8 @@ jobs:
         id: cache-python-ssl
         with:
           path: |
-            src/python
-            src/ssl
-          key: gam-${{ matrix.jid }}-20220131
+            bin
+          key: gam-${{ matrix.jid }}-20220621
 
       - name: Use pre-compiled Python for testing
         if: matrix.python != ''
@@ -105,18 +109,33 @@ jobs:
              echo "JID=${JID}" >> $GITHUB_ENV
              echo "ACTIONS_CACHE=${ACTIONS_CACHE}" >> $GITHUB_ENV
              echo "ACTIONS_GOAL=${ACTIONS_GOAL}" >> $GITHUB_ENV
-             echo "date=date" >> $GITHUB_ENV
 
-      - name: Install necessary hosted Linux packages
-        if: matrix.os == 'ubuntu-20.04'
+      - name: Install necessary Github-hosted Linux packages
+        if: runner.os == 'Linux' && runner.arch == 'X64'
         run: |
           echo "RUNNING: apt update..."
           sudo apt-get -qq --yes update
           sudo apt-get -qq --yes install swig libpcsclite-dev
 
+      - name: MacOS remove Homebrew
+        if: runner.os == 'macOS'
+        run: |
+          # remove everything except the libraries needed by yubikey-manager
+          brew uninstall $(brew list | grep -v 'pcre\|swig\|pcsc-lite')
+
+      - name: MacOS install tools
+        if: runner.os == 'macOS'
+        run: |
+          # Install latest Rust
+          curl -fsS -o rust.sh https://sh.rustup.rs
+          bash ./rust.sh -y
+          source $HOME/.cargo/env
+          # needed for Rust to compile cryptography Python package for universal2
+          rustup target add aarch64-apple-darwin
+
       - name: Windows Configure VCode
         uses: ilammy/msvc-dev-cmd@v1
-        if: matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
+        if: runner.os == 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         with:
           arch: ${{ matrix.arch }}
 
@@ -125,54 +144,44 @@ jobs:
         env:
           arch: ${{ matrix.arch }}
           jid: ${{ matrix.jid }}
+          openssl_archs: ${{ matrix.openssl_archs }}
         run: |
           echo "We are running on ${RUNNER_OS}"
           if [[ "${arch}" == "Win64" ]]; then
             PYEXTERNALS_PATH="amd64"
             PYBUILDRELEASE_ARCH="x64"
-            OPENSSL_CONFIG_TARGET="VC-WIN64A"
             GAM_ARCHIVE_ARCH="x86_64"
             WIX_ARCH="x64"
             CHOC_OPS=""
           elif [[ "${arch}" == "Win32" ]]; then
             PYEXTERNALS_PATH="win32"
             PYBUILDRELEASE_ARCH="Win32"
-            OPENSSL_CONFIG_TARGET="VC-WIN32"
             GAM_ARCHIVE_ARCH="x86"
             WIX_ARCH="x86"
             CHOC_OPS="--forcex86"
           fi
           if [[ "${RUNNER_OS}" == "macOS" ]]; then
-            brew install coreutils
-            brew install bash
+            #brew install coreutils
+            #brew install bash
             MAKE=make
             MAKEOPT="-j$(sysctl -n hw.logicalcpu)"
             PERL=perl
-            # We only care about non-deprecated OSes
-            MACOSX_DEPLOYMENT_TARGET="10.15"
-            echo "MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}" >> $GITHUB_ENV
+            echo "MACOSX_DEPLOYMENT_TARGET=10.15" >> $GITHUB_ENV
             echo "PYTHON=${PYTHON_INSTALL_PATH}/bin/python3" >> $GITHUB_ENV
-            export date=gdate
-            export realpath=grealpath
+            echo "PIP_ARGS=--no-binary=:all:" >> $GITHUB_ENV
           elif [[ "${RUNNER_OS}" == "Linux" ]]; then
             MAKE=make
             MAKEOPT="-j$(nproc)"
             PERL=perl
             echo "PYTHON=${PYTHON_INSTALL_PATH}/bin/python3" >> $GITHUB_ENV
-            export date=date
-            export realpath=realpath
           elif [[ "${RUNNER_OS}" == "Windows" ]]; then
             MAKE=nmake
             MAKEOPT=""
             PERL="c:\strawberry\perl\bin\perl.exe"
             echo "PYTHON=${PYTHON_INSTALL_PATH}\python.exe" >> $GITHUB_ENV
-            export date=date
-            export realpath=realpath
             echo "GAM_ARCHIVE_ARCH=${GAM_ARCHIVE_ARCH}" >> $GITHUB_ENV
             echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV
           fi
-          echo "date=${date}" >> $GITHUB_ENV
-          echo "realpath=${realpath}" >> $GITHUB_ENV
           echo "We'll run make with: ${MAKEOPT}"
           echo "JID=${jid}" >> $GITHUB_ENV
           echo "arch=${arch}" >> $GITHUB_ENV
@@ -181,13 +190,15 @@ jobs:
           echo "PERL=${PERL}" >> $GITHUB_ENV
           echo "PYEXTERNALS_PATH=${PYEXTERNALS_PATH}" >> $GITHUB_ENV
           echo "PYBUILDRELEASE_ARCH=${PYBUILDRELEASE_ARCH}" >> $GITHUB_ENV
-          echo "OPENSSL_CONFIG_TARGET=${OPENSSL_CONFIG_TARGET}" >> $GITHUB_ENV
+          echo "openssl_archs=${openssl_archs}" >> $GITHUB_ENV
           echo "LD_LIBRARY_PATH=${OPENSSL_INSTALL_PATH}/lib:${PYTHON_INSTALL_PATH}/lib" >> $GITHUB_ENV
           #echo "PATH=${PATH}:${PYTHON_INSTALL_PATH}/scripts" >> $GITHUB_ENV
 
       - name: Get latest stable OpenSSL source
         if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         run: |
+          mkdir -vp "${GITHUB_WORKSPACE}/src"
+          cd "${GITHUB_WORKSPACE}/src"
           git clone https://github.com/openssl/openssl.git
           cd "${OPENSSL_SOURCE_PATH}"
           export LATEST_STABLE_TAG=$(git tag --list openssl-* | grep -v alpha | grep -v beta | sort -Vr | head -n1)
@@ -195,44 +206,86 @@ jobs:
           git checkout "${LATEST_STABLE_TAG}"
           export COMPILED_OPENSSL_VERSION=${LATEST_STABLE_TAG:8} # Trim the openssl- prefix
           echo "COMPILED_OPENSSL_VERSION=${COMPILED_OPENSSL_VERSION}" >> $GITHUB_ENV
+          if [[ "${RUNNER_OS}" == "macOS" ]]; then
+            for openssl_arch in $openssl_archs; do
+              ssldir="${OPENSSL_SOURCE_PATH}-${openssl_arch}"
+              mkdir -v "${ssldir}"
+              cp -vrf ${OPENSSL_SOURCE_PATH}/* "${ssldir}/"
+            done
+            rm -vrf "${OPENSSL_SOURCE_PATH}"
+          else
+            mv -v "${OPENSSL_SOURCE_PATH}" "${OPENSSL_SOURCE_PATH}-${openssl_archs}"
+          fi
 
       - name: Windows NASM Install
         uses: ilammy/setup-nasm@v1
-        if: matrix.goal == 'build' && matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
+        if: matrix.goal == 'build' && runner.os == 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true'
 
       - name: Config OpenSSL
         if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         run: |
-          cd "${OPENSSL_SOURCE_PATH}"
-          # --libdir=lib is needed so Python can find OpenSSL libraries
-          "${PERL}" ./Configure "${OPENSSL_CONFIG_TARGET}" --libdir=lib --prefix="${OPENSSL_INSTALL_PATH}" $OPENSSL_CONFIG_OPTS
+          for openssl_arch in $openssl_archs; do
+            cd "${GITHUB_WORKSPACE}/src/openssl-${openssl_arch}"
+            # --libdir=lib is needed so Python can find OpenSSL libraries
+            "${PERL}" ./Configure "${openssl_arch}" --libdir=lib --prefix="${OPENSSL_INSTALL_PATH}" $OPENSSL_CONFIG_OPTS
+          done
 
       - name: Rename GNU link on Windows
-        if: matrix.goal == 'build' && matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
+        if: matrix.goal == 'build' && runner.os == 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         shell: bash
         run: mv /usr/bin/link /usr/bin/gnulink
 
       - name: Make OpenSSL
         if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         run: |
-          cd "${OPENSSL_SOURCE_PATH}"
-          $MAKE "${MAKEOPT}"
+          for openssl_arch in $openssl_archs; do
+            cd "${GITHUB_WORKSPACE}/src/openssl-${openssl_arch}"
+            $MAKE "${MAKEOPT}"
+          done
 
       - name: Install OpenSSL
         if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         run: |
-          cd "${OPENSSL_SOURCE_PATH}"
-          # install_sw saves us ages processing man pages :-)
-          $MAKE install_sw
+          if [[ "${RUNNER_OS}" == "macOS" ]]; then
+            for openssl_arch in $openssl_archs; do
+              cd "${GITHUB_WORKSPACE}/src/openssl-${openssl_arch}"
+              # install_sw saves us ages processing man pages :-)
+              $MAKE install_sw
+              mv "${OPENSSL_INSTALL_PATH}" "${GITHUB_WORKSPACE}/bin/ssl-${openssl_arch}"
+            done
+            mkdir -vp "${OPENSSL_INSTALL_PATH}/lib"
+            mkdir -vp "${OPENSSL_INSTALL_PATH}/bin"
+            for archlib in libcrypto.3.dylib libssl.3.dylib libcrypto.a libssl.a; do
+              lipo -create "${GITHUB_WORKSPACE}/bin/ssl-darwin64-x86_64/lib/${archlib}" \
+                           "${GITHUB_WORKSPACE}/bin/ssl-darwin64-arm64/lib/${archlib}" \
+                   -output "${GITHUB_WORKSPACE}/bin/ssl/lib/${archlib}"
+            done
+            mv ${GITHUB_WORKSPACE}/bin/ssl-darwin64-x86_64/include ${GITHUB_WORKSPACE}/bin/ssl/
+            lipo -create "${GITHUB_WORKSPACE}/bin/ssl-darwin64-x86_64/bin/openssl" \
+                         "${GITHUB_WORKSPACE}/bin/ssl-darwin64-arm64/bin/openssl" \
+                 -output "${GITHUB_WORKSPACE}/bin/ssl/bin/openssl"
+            rm -rf ${GITHUB_WORKSPACE}/bin/ssl-darwin64-x86_64
+            rm -rf ${GITHUB_WORKSPACE}/bin/ssl-darwin64-arm64
+            echo "LDFLAGS=-L${OPENSSL_INSTALL_PATH}/lib" >> $GITHUB_ENV
+            echo "CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1" >> $GITHUB_ENV
+            echo "CFLAGS=-I${OPENSSL_INSTALL_PATH}/include -arch arm64 -arch x86_64" >> $GITHUB_ENV
+            echo "ARCHFLAGS=-arch x86_64 -arch arm64" >> $GITHUB_ENV
+          else
+            cd "${GITHUB_WORKSPACE}/src/openssl-${openssl_archs}"
+            # install_sw saves us ages processing man pages :-)
+            $MAKE install_sw
+          fi
 
       - name: Run OpenSSL
         if: matrix.goal == 'build'
         run: |
           "${OPENSSL_INSTALL_PATH}/bin/openssl" version
+          file "${OPENSSL_INSTALL_PATH}/bin/openssl"
 
       - name: Get latest stable Python source
         if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         run: |
+          cd "${GITHUB_WORKSPACE}/src"
           git clone https://github.com/python/cpython.git
           cd "${PYTHON_SOURCE_PATH}"
           export LATEST_STABLE_TAG=$(git tag --list | grep -v a | grep -v rc | grep -v b | sort -Vr | head -n1)
@@ -241,25 +294,31 @@ jobs:
           echo "COMPILED_PYTHON_VERSION=${COMPILED_PYTHON_VERSION}" >> $GITHUB_ENV
 
       - name: Mac/Linux Configure Python
-        if: matrix.goal == 'build' && matrix.os != 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
+        if: matrix.goal == 'build' && runner.os != 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         run: |
           cd "${PYTHON_SOURCE_PATH}"
+          if [[ "${RUNNER_OS}" == "macOS" ]]; then
+            extra_args=( "--enable-universalsdk" "--with-universal-archs=universal2" )
+          else
+            extra_args=( )
+          fi
           ./configure --with-openssl="${OPENSSL_INSTALL_PATH}" \
                       --prefix="${PYTHON_INSTALL_PATH}" \
                       --enable-shared \
                       --with-ensurepip=upgrade \
                       --enable-optimizations \
-                      --with-lto
+                      --with-lto \
+                      "${extra_args[@]}"
 
       - name: Windows Get External Python deps
-        if: matrix.goal == 'build' && matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
+        if: matrix.goal == 'build' && runner.os == 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         shell: powershell
         run: |
           cd "${env:PYTHON_SOURCE_PATH}"
           PCBuild\get_externals.bat
 
       - name: Windows overwrite external OpenSSL with local
-        if: matrix.goal == 'build' && matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
+        if: matrix.goal == 'build' && runner.os == 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         shell: powershell
         run: |
           cd "${env:PYTHON_SOURCE_PATH}"
@@ -271,14 +330,14 @@ jobs:
           $env:OPENSSL_EXT_TARGET_PATH = "${env:OPENSSL_EXT_PATH}${env:PYEXTERNALS_PATH}"
           echo "Copying our OpenSSL to ${env:OPENSSL_EXT_TARGET_PATH}"
           mkdir "${env:OPENSSL_EXT_TARGET_PATH}\include\openssl\"
-          Copy-Item -Path "${env:OPENSSL_SOURCE_PATH}\LICENSE.txt" -Destination "${env:OPENSSL_EXT_TARGET_PATH}\LICENSE"
+          Copy-Item -Path "${env:GITHUB_WORKSPACE}/src/openssl-${env:openssl_archs}\LICENSE.txt" -Destination "${env:OPENSSL_EXT_TARGET_PATH}\LICENSE"
           cp -v "$env:OPENSSL_INSTALL_PATH\lib\*" "${env:OPENSSL_EXT_TARGET_PATH}"
           cp -v "$env:OPENSSL_INSTALL_PATH\bin\*" "${env:OPENSSL_EXT_TARGET_PATH}"
           cp -v "$env:OPENSSL_INSTALL_PATH\include\openssl\*" "${env:OPENSSL_EXT_TARGET_PATH}\include\openssl\"
           cp -v "$env:OPENSSL_INSTALL_PATH\include\openssl\applink.c" "${env:OPENSSL_EXT_TARGET_PATH}\include\"
 
       - name: Windows Install sphinx-build
-        if: matrix.goal == 'build' && matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
+        if: matrix.goal == 'build' && runner.os == 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         shell: powershell
         run: |
           pip install --upgrade pip
@@ -286,7 +345,7 @@ jobs:
           sphinx-build --version
 
       - name: Windows Config/Build Python
-        if: matrix.goal == 'build' && matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
+        if: matrix.goal == 'build' && runner.os == 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         shell: powershell
         run: |
           cd "${env:PYTHON_SOURCE_PATH}"
@@ -296,7 +355,7 @@ jobs:
           PCBuild\build.bat -m --pgo -c Release -p "${env:PYBUILDRELEASE_ARCH}"
 
       - name: Windows Install Python
-        if: matrix.goal == 'build' && matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
+        if: matrix.goal == 'build' && runner.os == 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         shell: powershell
         run: |
           cd "${env:PYTHON_SOURCE_PATH}"
@@ -308,14 +367,14 @@ jobs:
           Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\PC\*.h" "${env:PYTHON_INSTALL_PATH}\include\"
 
       - name: Mac/Linux Build Python
-        if: matrix.goal == 'build' && matrix.os != 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
+        if: matrix.goal == 'build' && runner.os != 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         run: |
           cd "${PYTHON_SOURCE_PATH}"
           echo "Running: ${MAKE} ${MAKEOPT}"
           $MAKE $MAKEOPT
 
       - name: Mac/Linux Install Python
-        if: matrix.goal == 'build' && matrix.os != 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
+        if: matrix.goal == 'build' && runner.os != 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         run: |
           cd "${PYTHON_SOURCE_PATH}"
           $MAKE altinstall
@@ -348,13 +407,26 @@ jobs:
           fi
           echo "PyInstaller build arguments: ${PYINSTALLER_BUILD_ARGS}"
           "${PYTHON}" ./waf all $PYINSTALLER_BUILD_ARGS
-          cd ..
-          "${PYTHON}" -m pip install .
+          cd ../..
+          echo "---- Installing PyInstaller ----"
+          "${PYTHON}" -m pip install pyinstaller
 
       - name: Install pip requirements
         run: |
-             set +e
-             "${PYTHON}" -m pip install --upgrade -r requirements.txt
+             if [[ "${RUNNER_OS}" == "macOS" ]]; then
+               for package in cryptography; do
+                 "${PYTHON}" -m pip install --upgrade cffi ${PIP_ARGS}
+                 "${PYTHON}" -m pip download --only-binary :all: \
+                                             --dest . \
+                                             --no-cache \
+                                             --no-deps \
+                                             --platform macosx_10_15_universal2 \
+                                             $package
+               "${PYTHON}" -m pip install --force-reinstall --no-deps $package*.whl
+               done
+               find $PYTHON_INSTALL_PATH/lib/python3.10/site-packages -type f -name "*.so" -exec du -sh "{}" \;
+             fi
+             "${PYTHON}" -m pip install --upgrade -r requirements.txt ${PIP_ARGS}
              "${PYTHON}" -m pip list
 
       - name: Build GAM with PyInstaller
@@ -362,12 +434,16 @@ jobs:
         run: |
              export gampath="./dist/gam"
              mkdir -p -v "${gampath}"
-             export gampath="$($realpath $gampath)"
+             if [[ "${RUNNER_OS}" == "macOS" ]]; then
+               export gampath=$($PYTHON -c "import os; print(os.path.realpath('$gampath'))")
+             else
+               export gampath=$(realpath "${gampath}")
+             fi
              export gam="${gampath}/gam"
              echo "gampath=${gampath}" >> $GITHUB_ENV
              echo "gam=${gam}" >> $GITHUB_ENV
              echo -e "GAM: ${gam}\nGAMPATH: ${gampath}"
-             "${PYTHON}" -m PyInstaller --clean --noupx --strip --onefile --distpath="${gampath}" gam.spec
+             "${PYTHON}" -m PyInstaller --clean --distpath="${gampath}" gam.spec
  
       - name: Basic Tests all jobs
         run: |
@@ -378,43 +454,52 @@ jobs:
              echo "GAMVERSION=${GAMVERSION}" >> $GITHUB_ENV
 
       - name: Linux/MacOS package
-        if: matrix.os != 'windows-2022' && matrix.goal == 'build'
+        if: runner.os != 'Windows' && matrix.goal == 'build'
         run: |
           cp -v LICENSE $gampath
           cp -v GamCommands.txt $gampath
           if [[ "${RUNNER_OS}" == "macOS" ]]; then
-              GAM_ARCHIVE="gam-${GAMVERSION}-macos-x86_64.tar.xz"
+              GAM_ARCHIVE="gam-${GAMVERSION}-macos-universal2.tar.xz"
           elif [[ "${RUNNER_OS}" == "Linux" ]]; then
               this_glibc_ver=$(ldd --version | awk '/ldd/{print $NF}')
               GAM_ARCHIVE="gam-${GAMVERSION}-linux-$(arch)-glibc${this_glibc_ver}.tar.xz"
           fi
           tar -C dist/ --create --verbose --exclude-from "${GITHUB_WORKSPACE}/.github/actions/package_exclusions.txt" --file $GAM_ARCHIVE --xz gam
 
-      - name: Linux install patchelf/staticx
-        if: matrix.os == 'ubuntu-20.04' && matrix.goal != 'test'
+      - name: Linux 64-bit install patchelf/staticx
+        if: runner.os == 'Linux' && contains(runner.arch, '64') && matrix.goal != 'test'
         run: |
           "${PYTHON}" -m pip install --upgrade patchelf-wrapper
           "${PYTHON}" -m pip install --upgrade staticx
 
-      - name: Linux Make Static
-        if: matrix.os == 'ubuntu-20.04' && matrix.goal != 'test'
+      - name: Linux 64-bit Make Static
+        if: runner.os == 'Linux' && contains(runner.arch, '64') && matrix.goal != 'test'
         run: |
-          $PYTHON -m staticx "${gam}" "${gam}-staticx"
+          case $RUNNER_ARCH in
+            X64)
+              ldlib=/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2
+              ;;
+            ARM64)
+              ldlib=/lib/aarch64-linux-gnu/ld-linux-aarch64.so.1
+              ;;
+          esac
+          echo "ldlib=${ldlib}"
+          $PYTHON -m staticx -l "${ldlib}" "${gam}" "${gam}-staticx"
           
       - name: Linux Run StaticX-ed
-        if: matrix.os == 'ubuntu-20.04' && matrix.goal != 'test'
+        if: runner.os == 'Linux' && contains(runner.arch, '64') && matrix.goal != 'test'
         run: |
           "${gam}-staticx" version extended
           mv -v "${gam}-staticx" "${gam}"
 
       - name: Linux package staticx
-        if: matrix.os == 'ubuntu-20.04' && matrix.goal != 'test'
+        if: runner.os == 'Linux' && contains(runner.arch, '64') && matrix.goal != 'test'
         run: |
-          GAM_ARCHIVE="gam-${GAMVERSION}-linux-x86_64-legacy.tar.xz"
+          GAM_ARCHIVE="gam-${GAMVERSION}-linux-$(uname -m)-legacy.tar.xz"
           tar -C dist/ --create --verbose --exclude-from "${GITHUB_WORKSPACE}/.github/actions/package_exclusions.txt" --file $GAM_ARCHIVE --xz gam
 
       - name: Windows package
-        if: matrix.os == 'windows-2022' && matrix.goal != 'test'
+        if: runner.os == 'Windows' && matrix.goal != 'test'
         run: |
           cp -v LICENSE $gampath
           cp -v GamCommands.txt $gampath
@@ -452,6 +537,9 @@ jobs:
         env:
           PASSCODE: ${{ secrets.PASSCODE }}
         run: |
+             if [[ "${RUNNER_OS}" == "macOS" ]]; then
+               brew install gnupg
+             fi
              source ../.github/actions/decrypt.sh ../.github/actions/creds.tar.gpg creds.tar
              export OAUTHFILE="oauth2.txt-gam-gha-${JID}"
              echo "OAUTHFILE=${OAUTHFILE}" >> $GITHUB_ENV
@@ -462,8 +550,8 @@ jobs:
              $gam oauth refresh
              $gam info user
              #$gam info user $gam_user grouptree
-             export tstamp=$($date +%s%3N)
-             export newbase=gha-test-$JID-$tstamp
+             export tstamp=$($PYTHON -c "import time; print(time.time_ns())")
+             export newbase=gha_test_$JID_$tstamp
              export newuser=$newbase@pdl.jaylee.us
              export newgroup=$newbase-group@pdl.jaylee.us
              export newalias=$newbase-alias@pdl.jaylee.us
@@ -471,7 +559,7 @@ jobs:
              export newresource=$newbase-resource
              export GAM_THREADS=5
              echo email > sample.csv;
-             for i in {01..10}; do
+             for i in {1..10}; do
                echo "${newbase}-bulkuser-$i" >> sample.csv;
              done
              $gam create user $newuser firstname GHA lastname $JID password random recoveryphone 12125121110 recoveryemail jay0lee@gmail.com gha.jid $JID languages en+,en-GB-
@@ -481,12 +569,12 @@ jobs:
              $gam create group $newgroup name "GHA $JID group" description "This is a description" isarchived true
              $gam user $gam_user sendemail recipient $newuser subject "test message $newbase" message "GHA test message"
              $gam user $gam_user sendemail recipient exchange@pdl.jaylee.us subject "test ${tstamp}" message "test message"
+             $gam user $newuser add license workspaceenterpriseplus
+             $gam print privileges
              $gam update cigroup $newgroup memberrestriction 'member.type == 1 || member.customer_id == groupCustomerId()'
              $gam info cigroup $newgroup
-             $gam user $newuser add license workspaceenterpriseplus
              $gam update group $newgroup add owner $gam_user
              $gam update group $newgroup add member $newuser
-             $gam print privileges
              $gam create admin $newuser _GROUPS_EDITOR_ROLE CUSTOMER condition nonsecuritygroup
              $gam csv sample.csv gam create user ~~email~~ firstname "GHA Bulk" lastname ~~email~~ gha.jid $JID
              $gam csv sample.csv gam update user ~~email~~ recoveryphone 12125121110 recoveryemail jay0lee@gmail.com password random
@@ -502,7 +590,7 @@ jobs:
              $gam user $newuser imap on
              $gam user $newuser show imap
              $gam user $newuser show delegates
-             #$gam user $newuser add contactdelegate "${newbase}-bulkuser-01"
+             #$gam user $newuser add contactdelegate "${newbase}-bulkuser-1"
              #$gam user $newuser print contactdelegates
              export biohazard=$(echo -e '\xe2\x98\xa3')
              $gam user $newuser label "$biohazard unicode biohazard $biohazard"
@@ -513,10 +601,10 @@ jobs:
              $gam user $gam_user sendemail subject "GHA send $gam_user $newbase" file gam.py recipient admin@pdl.jaylee.us
              $gam user $gam_user draftemail subject "GHA draft $newbase" message "Draft message test"
              $gam csvfile sample.csv:email waitformailbox
-             $gam user $newuser delegate to "${newbase}-bulkuser-01"
-             $gam users "$gam_user $newbase-bulkuser-01 $newbase-bulkuser-02 $newbase-bulkuser-03" delete messages query in:anywhere maxtodelete 99999 doit
-             $gam users "$newbase-bulkuser-04 $newbase-bulkuser-05 $newbase-bulkuser-06" trash messages query in:anywhere maxtotrash 99999 doit
-             $gam users "$newbase-bulkuser-07 $newbase-bulkuser-08 $newbase-bulkuser-09" modify messages query in:anywhere maxtomodify 99999 addlabel IMPORTANT addlabel STARRED doit
+             $gam user $newuser delegate to "${newbase}-bulkuser-1"
+             $gam users "$gam_user $newbase-bulkuser-1 $newbase-bulkuser-2 $newbase-bulkuser-3" delete messages query in:anywhere maxtodelete 99999 doit
+             $gam users "$newbase-bulkuser-4 $newbase-bulkuser-5 $newbase-bulkuser-6" trash messages query in:anywhere maxtotrash 99999 doit
+             $gam users "$newbase-bulkuser-7 $newbase-bulkuser-8 $newbase-bulkuser-9" modify messages query in:anywhere maxtomodify 99999 addlabel IMPORTANT addlabel STARRED doit
              $gam user $newuser delete label --ALL_LABELS--
              GAM_CSV_ROW_FILTER="name:regex:gha-test-${JID}" $gam print features | $gam csv - gam delete feature ~name
              $gam create feature name Whiteboard-$newbase
@@ -531,14 +619,16 @@ jobs:
              $gam calendar $gam_user add editor $newuser
              $gam calendar $gam_user showacl
              $gam calendar $gam_user printacl | $gam csv - gam calendar $gam_user delete id ~id
-             $gam calendar $gam_user addevent summary "GHA test event" start $($date '+%FT%T.%N%:z' -d "now + 1 hour") end $($date '+%FT%T.%N%:z' -d "now + 2 hours") attendee $newgroup hangoutsmeet guestscanmodify true sendupdates all
+             starttime=$($PYTHON -c "import datetime; print((datetime.datetime.now() + datetime.timedelta(hours=1)).strftime('%Y-%m-%dT%H:%M:%S.%f+00:00'))")
+             endtime=$($PYTHON -c "import datetime; print((datetime.datetime.now() + datetime.timedelta(hours=2)).strftime('%Y-%m-%dT%H:%M:%S.%f+00:00'))")
+             $gam calendar $gam_user addevent summary "GHA test event" start "${starttime}" end "${endtime}" attendee $newgroup hangoutsmeet guestscanmodify true sendupdates all
              $gam calendar $gam_user printevents after -0d
              matterid=uid:$($gam create vaultmatter name "GHA matter $newbase" description "test matter" collaborators $newuser | head -1 | cut -d ' ' -f 3)
              $gam create vaulthold matter $matterid name "GHA hold $newbase" corpus mail accounts $newuser
              $gam print vaultmatters matterstate open
              $gam print vaultholds matter $matterid
              $gam print vaultcount matter $matterid corpus mail everyone todrive
-             $gam create vaultexport matter $matterid name "GHA export $newbase" corpus mail accounts $newuser use_new_export true
+             $gam create vaultexport matter $matterid name "GHA export $newbase" corpus mail accounts $newuser use_new_export false
              $gam print exports matter $matterid | $gam csv - gam info export $matterid id:~~id~~
              $gam csv sample.csv gam user ~email add calendar id:$newresource
              $gam delete resource $newresource
@@ -564,7 +654,7 @@ jobs:
              export sn="$JID$JID$JID$JID-$(openssl rand -base64 32 | sed 's/[^a-zA-Z0-9]//g')"
              $gam create device serialnumber $sn devicetype android
              $gam print cros allfields orderby serialnumber
-             #$gam show crostelemetry storagepercentonly
+             $gam show crostelemetry storagepercentonly
              $gam report usageparameters customer
              $gam report usage customer parameters gmail:num_emails_sent,accounts:num_1day_logins
              $gam report customer todrive
@@ -573,25 +663,35 @@ jobs:
              $gam print devices nopersonaldevices nodeviceusers filter "serial:$JID$JID$JID$JID-" | $gam csv - gam delete device id ~name
              $gam print userinvitations
              $gam print userinvitations | $gam csv - gam send userinvitation ~name
-             export CUSTOMER_ID="C01wfv983"
-             export GA_DOMAIN="pdl.jaylee.us"
-             touch $gampath/enabledasa.txt
+             $gam create caalevel "zzz_${newbase}" basic condition ipsubnetworks 1.1.1.1/32,2.2.2.2/32 endcondition
+             $gam print caalevels
+             $gam delete caalevel "zzz_${newbase}"
+             driveid=$($gam user $gam_user add shareddrive "${newbase}" | awk '{print $NF}')
+             echo "Created shared drive ${driveid}"
+             $gam user $gam_user add drivefile localfile gam.py parentid "${driveid}"
+             $gam user $gam_user update shareddrive "${driveid}" ou "id:03ph8a2z1t2ph5z"
+             $gam user $gam_user show shareddrives asadmin
+             $gam user $gam_user delete shareddrive "${driveid}" nukefromorbit
              echo "printer model count:"
              $gam print printermodels | wc -l
              #$gam print printers
-             #$gam create printer displayname "${newbase}" uri ipp://localhost:631 driverless description "made by $(date)"
-             rm -f -v $gampath/enabledasa.txt
+             #$gam create printer displayname "${newbase}" uri ipp://localhost:631 driverless description "made by $(gam_user)" ou /
+             #export CUSTOMER_ID="C01wfv983"
+             #export GA_DOMAIN="pdl.jaylee.us"
+             #touch $gampath/enabledasa.txt
+             #echo "using delegated admin service account"
+             #$gam print users
 
-      - name: Upload to Google Drive, build only.
-        if: github.event_name == 'push' && matrix.goal != 'test'
-        run: |
-             ls gam-$GAMVERSION-*
-             for gamfile in gam-$GAMVERSION-*; do
-               echo "Uploading file ${gamfile} to Google Drive..."
-               fileid=$($gam user $gam_user add drivefile localfile $gamfile drivefilename $GAMVERSION-${GITHUB_SHA:0:7}-$gamfile parentid 1N2zbO33qzUQFsGM49-m9AQC1ijzd_ru1 returnidonly)
-               echo "file uploaded as ${fileid}, setting ACL..."
-               $gam user $gam_user add drivefileacl $fileid anyone role reader withlink
-             done
+     # - name: Upload to Google Drive, build only.
+     #   if: github.event_name == 'push' && matrix.goal != 'test'
+     #   run: |
+     #        ls gam-$GAMVERSION-*
+     #        for gamfile in gam-$GAMVERSION-*; do
+     #          echo "Uploading file ${gamfile} to Google Drive..."
+     #          fileid=$($gam user $gam_user add drivefile localfile $gamfile drivefilename $GAMVERSION-${GITHUB_SHA:0:7}-$gamfile parentid 1N2zbO33qzUQFsGM49-m9AQC1ijzd_ru1 returnidonly)
+     #          echo "file uploaded as ${fileid}, setting ACL..."
+     #          $gam user $gam_user add drivefileacl $fileid anyone role reader withlink
+     #        done
 
       - name: Archive production artifacts
         uses: actions/upload-artifact@v2

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '25 10 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

README.md

@@ -9,7 +9,7 @@ GAM is a command line tool for Google Workspace admins to manage domain and user
 Open a terminal and run:
 
 ```sh
-bash <(curl -s -S -L https://git.io/install-gam)
+bash <(curl -s -S -L https://gam-shortn.appspot.com/gam-install)
 ```
 
 this will download GAM, install it and start setup.
@@ -28,13 +28,13 @@ The GAM mailing list / discussion group is hosted on [Google Groups].  You can j
 
 # Chat Room
 
-There is a public chat room hosted in Google Chat. [Instructions to join](https://git.io/gam-chat).
+There is a public chat room hosted in Google Chat. [Instructions to join](https://github.com/GAM-team/GAM/wiki/GAM-Public-Chat-Room).
 
 # Author
 
 GAM is maintained by [Jay Lee](mailto:jay0lee@gmail.com). Please direct "how do I?" questions to [Google Groups].
 
-[GAM release]: https://git.io/gamreleases
+[GAM release]: https://github.com/GAM-team/GAM/releases
 [GitHub Releases]: https://github.com/GAM-team/GAM/releases
 [GitHub]: https://github.com/GAM-team/GAM/tree/master
 [GitHub Wiki]: https://github.com/GAM-team/GAM/wiki/

src/GamCommands.txt

@@ -243,6 +243,7 @@ If an item contains spaces, it should be surrounded by ".
 <SMTPHostName> ::= <String>
 <StudentItem> ::= <EmailAddress>|<UniqueID>|<String>
 <TeamDriveID> ::= <String>
+<TeamDriveName> ::= <String>
 <Timezone> ::= <String>
 <Title> ::= <String>
 <URI> ::= <String>
@@ -632,6 +633,7 @@ Items, separated by spaces, with spaces, commas or single quotes in the items th
 <SchemaNameList> ::= "<SchemaName>(,<SchemaName>)*"
 <SerialNumberList> ::= "<SerialNumber>(,<SerialNumber>)*"
 <ServiceAccountKeyList> ::= "<ServiceAccountKey>(,<ServiceAccountKey>)*"
+<StringList> ::= "<String>(,<String>)*"
 <TeamDriveIDList> ::= "<TeamDriveID>(,<TeamDriveID>)*"
 <UserFieldNameList> ::= "<UserFieldName>(,<UserFieldName>)*"
 <UserList> ::= "<UserItem>(,<UserItem>)*"
@@ -680,12 +682,19 @@ Specify a collection of Users by directly specifying them or by specifying items
 ## Item attributes
 
 <BuildingAttribute> ::=
+	(address|addresslines <String>)|
+	(city|locality <String>)|
+	(country|regioncode <String>)|
 	(description <String>)|
 	(floors <FloorNameList>)|
 	(id <String>)|
+	(language|languageCode <Language>)|
 	(latitude <Float>)|
 	(longitude <Float>)|
 	(name <String>)
+	(state|administrativearea <String>)|
+	(sublocality <String>)|
+	(zipcode|postalcode <String>)
 
 <CalendarAttribute> ::=
 	(selected <Boolean>)|(hidden <Boolean>)|(summary <String>)|(colorindex|colorid <CalendarColorIndex>)|(backgroundcolor <ColorValue>)|(foregroundcolor <ColorValue>)|
@@ -1210,6 +1219,76 @@ gam print browsertokens [todrive]
 	[fields <BrowserTokenFieldNameList>]
 	[sortheaders]
 
+<CAAAllowedEncryptionStatus> ::=
+	encryption_unsupported |
+	encrypted |
+	unencrypted
+<CAAAllowedEncryptionStatusList> ::= "<CAAAllowedEncryptionStatus>(,<CAAAllowedEncryptionStatus>)"
+
+<CAAAllowedDeviceManagementLevel> ::=
+	basic |
+	advanced|complete |
+	none
+<CAAAllowedDeviceManagementLevelList> ::= "<CAAAllowedDeviceManagementLevel>(,<CAAAllowedDeviceManagementLevel>)"
+
+<CAACombiningFunction> ::=
+	and |
+	or
+
+<CAAIPSubNetwork> ::=
+	<CIDRnetmask>
+<CAAIPSubNetworkList> ::= "<CAAIPSubNetwork>(,<CAAIPSubNetwork>)"
+
+<CAAMember> ::=
+	user:<EmailAddress> |
+	serviceAccount:<EmailAddress>
+<CAAMemberList> ::= "<CAAMember>(,<CAAMember>)"
+
+<CAAOsType> ::=
+	DESKTOP_MAC |
+	DESKTOP_WINDOWS |
+	DESKTOP_LINUX |
+	DESKTOP_CHROME_OS |
+	VERIFIED_DESKTOP_CHROME_OS |
+	ANDROID |
+	IOS
+
+<CAAOsConstraint> ::=
+	<CAAOsType> |
+	<CAAOsType>:<String>.<String>.<String>
+<CAAOsConstraintList> ::= "<CAAOsConstraint>(,<CAAOsConstraint>)"
+
+<CAARegion> ::=
+	<Character><Character>
+<CAARegionList> ::= "<CAARegion>(,<CAARegion>)"
+	See: https://www.iso.org/obp/ui/#search
+
+<CAADevicePolicyAttribute> ::=
+	(requirescreenlock <Boolean>) |
+	(allowedencryptionstatuses <CAAAllowedEncryptionStatusList>) |
+	(osconstraints <CAAOsConstraintList>) |
+	(alloweddevicemanagementlevels <CAAAllowedDeviceManagementLevelList>) |
+	(requireadminapproval <Boolean>) |
+	(requirecorpowned <Boolean>)
+
+<CAAConditionAttribute> ::=
+	(ipsubnetworks <CAAIPSubNetworkList>) |
+	(devicepolicy <CAADevicePolicyAttribute> enddevicepolicy) |
+	(requiredaccesslevels <StringList>) |
+	(negate <Boolean>) |
+	(members <CAARegionList>) |
+	(regions <CAAMemberList>)
+	
+<CAABasicAttribute> ::+
+	(combiningfunction <CAACombiningFunction>) |
+	(condition <CAAConditionAttribute>+ endcondition)
+
+gam create caalevel <String> (basic <CAABasicAttribute>+)|(custom <String>)
+gam update caalevel <CAALevelName> (basic <CAABasicAttribute>+)|(custom <String>)
+gam delete caalevel <CAALevelName>
+gam show caalevels
+gam print caalevels [todrive]
+
 gam print chatspaces [todrive]
 gam print chatmembers space <ChatSpace> [todrive]
 gam create chatmessage space <ChatSpace> [thread <String>]
@@ -1350,11 +1429,11 @@ gam print chromehistory channels [todrive]
 gam print chromehistory versions [todrive]
 	[platform <ChromePlatformType>] [channel <ChromeChannelType>]
 	[filter <String>]
-        (orderby <ChromeVersionsOrderByFieldName> [ascending|descending])*
+	(orderby <ChromeVersionsOrderByFieldName> [ascending|descending])*
 gam print chromehistory releases [todrive]
 	[platform <ChromePlatformType>] [channel <ChromeChannelType>] [version <String>]
 	[filter <String>]
-        (orderby <ChromeReleasessOrderByFieldName> [ascending|descending])*
+	(orderby <ChromeReleasessOrderByFieldName> [ascending|descending])*
 
 gam delete chromepolicy <SchemaName>+ ou|org|orgunit <OrgUnitItem> [(printerid <PrinterID>)|(appid <AppID>)]
 gam update chromepolicy (<SchemaName> (<Field> <Value>)+)+ ou|org|orgunit <OrgUnitItem> [(printerid <PrinterID>)|(appid <AppID>)]
@@ -1423,7 +1502,7 @@ gam print printermodels [todrive] [filter <String>]
 gam create cigroup <EmailAddress> <CIGroupAttribute>*
 	[makeowner] [alias|aliases <AliasList>] [dynamic <QueryDynamicGroup>]
 gam update cigroup <GroupItem> [email <EmailAddress>] <CIGroupAttribute>*
-	[security] [dynamic <QueryDynamicGroup>]
+	[security|dynamicsecurity] [dynamic <QueryDynamicGroup>]
 	[memberrestrictions <QueryMemberRestrictions>]
 gam update cigroup <GroupItem> add [owner|manager|member] [notsuspended|suspended] [expires never|<Time>] <UserTypeEntity>
 gam update cigroup <GroupItem> delete|remove [owner|manager|member] [notsuspended|suspended] <UserTypeEntity>
@@ -1488,6 +1567,9 @@ gam update feature <Name> name <Name>
 gam delete feature <Name>
 gam print features [todrive]
 
+gam show oushareddrives|orgunitshareddrives [ou|org|orgunit <OrgUnitItem>]
+gam print oushareddrives|orgunitshareddrives [todrive] [ou|org|orgunit <OrgUnitItem>]
+
 gam create resource <ResourceID> <Name> <ResourceAttribute>*
 gam update resource <ResourceID> <ResourceAttribute>*
 gam delete resource <ResourceID>
@@ -1760,12 +1842,12 @@ gam <UserTypeEntity> show signature|sig [format]
 	teammembersonly
 
 gam <UserTypeEntity> create|add teamdrive <Name>
-gam <UserTypeEntity> update teamdrive <TeamDriveID> [asadmin] [name <Name>]
+gam <UserTypeEntity> update teamdrive <TeamDriveID>|(name <TeamDriveName>) [asadmin] [name <Name>]
 	[(theme|themeid <String>) | ([customtheme <DriveFileID> <Float> <Float> <Float>] [color <ColorValue>])]
 	(<TeamDriveRestrictionsSubfieldName> <Boolean>)*
 	[hidden <Boolean>]
-gam <UserTypeEntity> delete teamdrive <TeamDriveID>
-gam <UserTypeEntity> show teamdriveinfo <TeamDriveID> [asadmin]
+gam <UserTypeEntity> delete teamdrive <TeamDriveID>|(name <TeamDriveName>) [asadmin] [allowitemdeletion|nukefromorbit]
+gam <UserTypeEntity> show teamdriveinfo <TeamDriveID>|(name <TeamDriveName>) [asadmin]
 gam <UserTypeEntity> show teamdrives [query <QueryTeamDrive>] [asadmin]
 gam <UserTypeEntity> print teamdrives [query <QueryTeamDrive>] [todrive] [asadmin]
 gam <UserTypeEntity> show teamdrivethemes

src/gam-install.sh

@@ -128,7 +128,7 @@ case $gamos in
       this_macos_ver=$osversion
     fi
     echo "You are running MacOS $this_macos_ver"
-    gamfile="macos-x86_64.tar.xz"
+    gamfile="macos-universal2.tar.xz"
     ;;
   MINGW64_NT*)
     gamos="windows"
@@ -223,7 +223,7 @@ trap "rm -rf $temp_archive_dir" EXIT
 
 echo_yellow "Downloading file $name from $browser_download_url to $temp_archive_dir ($check_type)..."
 # Save archive to temp w/o losing our path
-(cd "$temp_archive_dir" && curl -O -L $GHCLIENT $browser_download_url)
+(cd "$temp_archive_dir" && curl -# -O -L $GHCLIENT $browser_download_url)
 
 mkdir -p "$target_dir"
 

src/gam.spec

@@ -33,12 +33,14 @@ for d in a.datas:
 
 pyz = PYZ(a.pure)
 
-# TODO: fix universal2
-target_arch = None
-#if sys.platform == "darwin":
-#     target_arch="universal2"
-#else:
-#     target_arch=None
+
+if sys.platform == "darwin":
+     target_arch="universal2"
+else:
+     target_arch=None
+
+# use strip on all non-Windows platforms
+strip = not sys.platform == 'win32'
 
 exe = EXE(pyz,
           a.scripts,
@@ -47,7 +49,7 @@ exe = EXE(pyz,
           a.datas,
           name='gam',
           debug=False,
-          strip=None,
+          strip=strip,
           upx=False,
           target_arch=target_arch,
           console=True)

src/gam/__init__.py

@@ -55,6 +55,7 @@ from gam import auth
 from gam import controlflow
 from gam import display
 from gam import fileutils
+from gam.gapi import caa as gapi_caa
 from gam.gapi import calendar as gapi_calendar
 from gam.gapi import cloudidentity as gapi_cloudidentity
 from gam.gapi import cbcm as gapi_cbcm
@@ -64,6 +65,7 @@ from gam.gapi import chromemanagement as gapi_chromemanagement
 from gam.gapi import chromepolicy as gapi_chromepolicy
 from gam.gapi.cloudidentity import devices as gapi_cloudidentity_devices
 from gam.gapi.cloudidentity import groups as gapi_cloudidentity_groups
+from gam.gapi.cloudidentity import orgunits as gapi_cloudidentity_orgunits
 from gam.gapi.cloudidentity import userinvitations as gapi_cloudidentity_userinvitations
 from gam.gapi import contactdelegation as gapi_contactdelegation
 from gam.gapi.directory import asps as gapi_directory_asps
@@ -80,6 +82,7 @@ from gam.gapi.directory import resource as gapi_directory_resource
 from gam.gapi.directory import roles as gapi_directory_roles
 from gam.gapi.directory import roleassignments as gapi_directory_roleassignments
 from gam.gapi.directory import users as gapi_directory_users
+from gam.gapi.drive import drives as gapi_drive_drives
 from gam.gapi import licensing as gapi_licensing
 from gam.gapi import siteverification as gapi_siteverification
 from gam.gapi import errors as gapi_errors
@@ -848,7 +851,9 @@ def _getSvcAcctData():
             controlflow.system_error_exit(6, None)
         GM_Globals[GM_OAUTH2SERVICE_JSON_DATA] = json.loads(json_string)
 
-jwt_apis = ['chat'] # APIs which can handle OAuthless JWT tokens
+jwt_apis = ['chat',
+            'cloudresourcemanager',
+            'accesscontextmanager'] # APIs which can handle OAuthless JWT tokens
 def getSvcAcctCredentials(scopes, act_as, api=None):
     try:
         _getSvcAcctData()
@@ -2730,7 +2735,7 @@ def printDriveSettings(users):
     display.write_csv_file(csvRows, titles, 'User Drive Settings', todrive)
 
 
-def getTeamDriveThemes(users):
+def getSharedDriveThemes(users):
     for user in users:
         user, drive = buildDrive3GAPIObject(user)
         if not drive:
@@ -7009,6 +7014,8 @@ def getUserAttributes(i, cd, updateCmd):
                     if schemaValue['type'] == 'custom':
                         schemaValue['customType'] = sys.argv[i]
                         i += 1
+                else:
+                    schemaValue['type'] = 'work'
                 schemaValue['value'] = sys.argv[i]
                 if schemaValue['value'] or multivalue != 'multinonempty':
                     body[up][schemaName][fieldName].append(schemaValue)
@@ -7118,6 +7125,7 @@ def enableGAMProjectAPIs(GAMProjectAPIs,
             f'  Project: {projectId}, Enable {jcount} APIs{currentCount(i, count)}'
         )
         j = 0
+        tried_universal_tos = False
         for api in apis:
             service_name = f'projects/{projectId}/services/{api}'
             j += 1
@@ -7128,19 +7136,26 @@ def enableGAMProjectAPIs(GAMProjectAPIs,
                               throw_reasons=[
                                   gapi_errors.ErrorReason.FAILED_PRECONDITION,
                                   gapi_errors.ErrorReason.FORBIDDEN,
-                                  gapi_errors.ErrorReason.PERMISSION_DENIED
+                                  gapi_errors.ErrorReason.PERMISSION_DENIED,
+                                  gapi_errors.ErrorReason.FOUR_O_O,
                               ],
                               retry_reasons=[gapi_errors.ErrorReason.INTERNAL_SERVER_ERROR],
                               name=service_name)
                     print(f'    API: {api}, Enabled{currentCount(j, jcount)}')
                     break
-                except gapi_errors.GapiFailedPreconditionError as e:
+                except (gapi_errors.GapiFailedPreconditionError,
+                        googleapiclient.errors.HttpError) as e:
+                    if hasattr(e, 'reason'):
+                        msg = e.reason
+                    else:
+                        msg = str(e)
+                    if 'terms of service' in msg.lower() and not tried_universal_tos:
+                        msg = '''You need to agree to the Google Cloud Terms of Service at:\n\n  https://console.developers.google.com'''
+                        tried_universal_tos = True
                     print(
                         f'\nThere was an error enabling {api}. Please resolve error as described below:'
                     )
-                    print()
-                    print(f'\n{str(e)}\n')
-                    print()
+                    print(f'\n\n{msg}\n\n')
                     input(
                         'Press enter once resolved and we will try enabling the API again.'
                     )
@@ -8006,10 +8021,17 @@ def doPrintShowProjects(csvFormat):
         display.write_csv_file(csvRows, titles, 'Projects', todrive)
 
 
-def doGetTeamDriveInfo(users):
-    teamDriveId = sys.argv[5]
+def getSharedDriveId(i):
+    driveId = sys.argv[i]
+    if driveId.lower() == 'name':
+        i += 1
+        driveId = gapi_drive_drives.drive_name_to_id(sys.argv[i])
+    return (i+1, driveId)
+
+
+def doGetSharedDriveInfo(users):
+    i, driveId = getSharedDriveId(5)
     useDomainAdminAccess = False
-    i = 6
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'asadmin':
@@ -8017,7 +8039,7 @@ def doGetTeamDriveInfo(users):
             i += 1
         else:
             controlflow.invalid_argument_exit(myarg,
-                                              'gam <users> show teamdrive')
+                                              'gam <users> show shareddrive')
     for user in users:
         drive = buildGAPIServiceObject('drive3', user)
         if not drive:
@@ -8025,13 +8047,15 @@ def doGetTeamDriveInfo(users):
             continue
         result = gapi.call(drive.drives(),
                            'get',
-                           driveId=teamDriveId,
+                           driveId=driveId,
                            useDomainAdminAccess=useDomainAdminAccess,
                            fields='*')
+        if useDomainAdminAccess and 'orgUnitId' in result:
+            result['orgUnit'] = gapi_directory_orgunits.orgunit_from_orgunitid(f'id:{result["orgUnitId"]}')
         display.print_json(result)
 
 
-def doCreateTeamDrive(users):
+def doCreateSharedDrive(users):
     body = {'name': sys.argv[5]}
     i = 6
     while i < len(sys.argv):
@@ -8041,7 +8065,7 @@ def doCreateTeamDrive(users):
             i += 2
         else:
             controlflow.invalid_argument_exit(sys.argv[i],
-                                              'gam <users> create teamdrive')
+                                              'gam <users> create shareddrive')
     for user in users:
         drive = buildGAPIServiceObject('drive3', user)
         if not drive:
@@ -8053,7 +8077,7 @@ def doCreateTeamDrive(users):
                            requestId=requestId,
                            body=body,
                            fields='id')
-        print(f'Created Team Drive {body["name"]} with id {result["id"]}')
+        print(f'Created Shared Drive {body["name"]} with id {result["id"]}')
 
 
 TEAMDRIVE_RESTRICTIONS_MAP = {
@@ -8064,17 +8088,20 @@ TEAMDRIVE_RESTRICTIONS_MAP = {
 }
 
 
-def doUpdateTeamDrive(users):
-    teamDriveId = sys.argv[5]
+def doUpdateSharedDrive(users):
+    i, driveId = getSharedDriveId(5)
     body = {}
     useDomainAdminAccess = False
     change_hide = None
-    i = 6
+    orgUnit = None
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'name':
             body['name'] = sys.argv[i + 1]
             i += 2
+        elif myarg in ['ou', 'org', 'orgunit']:
+            orgUnit = sys.argv[i+1]
+            i += 2
         elif myarg == 'theme':
             body['themeId'] = sys.argv[i + 1]
             i += 2
@@ -8092,9 +8119,9 @@ def doUpdateTeamDrive(users):
         elif myarg == 'asadmin':
             useDomainAdminAccess = True
             i += 1
-        elif myarg in ['ou', 'org', 'orgunit']:
-            body['orgUnitId'] = gapi_directory_orgunits.getOrgUnitId(sys.argv[i + 1])
-            i += 2
+#        elif myarg in ['ou', 'org', 'orgunit']:
+#            body['orgUnitId'] = gapi_directory_orgunits.getOrgUnitId(sys.argv[i + 1])
+#            i += 2
         elif myarg in ['hidden']:
             if getBoolean(sys.argv[i+1], myarg):
                 change_hide = 'hide'
@@ -8109,8 +8136,8 @@ def doUpdateTeamDrive(users):
             i += 2
         else:
             controlflow.invalid_argument_exit(sys.argv[i],
-                                              'gam <users> update teamdrive')
-    if not body and not change_hide:
+                                              'gam <users> update shareddrive')
+    if not body and not change_hide and not orgUnit:
         controlflow.system_error_exit(
             4, 'nothing to update. Need at least a name argument.')
     for user in users:
@@ -8122,7 +8149,7 @@ def doUpdateTeamDrive(users):
                            'update',
                            useDomainAdminAccess=useDomainAdminAccess,
                            body=body,
-                           driveId=teamDriveId,
+                           driveId=driveId,
                            fields='id',
                            soft_errors=True)
             if not result:
@@ -8130,15 +8157,19 @@ def doUpdateTeamDrive(users):
         if change_hide:
             ch_result = gapi.call(drive.drives(),
                     change_hide,
-                    driveId=teamDriveId,
+                    driveId=driveId,
                     fields='id',
                     soft_errors=True)
-        print(f'Updated Team Drive {teamDriveId}')
+        if orgUnit:
+            gapi_cloudidentity_orgunits.move_shared_drive(driveId,
+                                                          orgUnit)
+        print(f'Updated Shared Drive {driveId}')
 
-def printShowTeamDrives(users, csvFormat):
+def printShowSharedDrives(users, csvFormat):
     todrive = False
     useDomainAdminAccess = False
     q = None
+    get_orgunits = True 
     i = 5
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
@@ -8151,13 +8182,18 @@ def printShowTeamDrives(users, csvFormat):
         elif myarg == 'query':
             q = sys.argv[i + 1]
             i += 2
+        elif myarg == 'noorgunits':
+            get_orgunits = False
+            i += 1
         else:
             controlflow.invalid_argument_exit(
-                myarg, f"gam {['show', 'print'][csvFormat]} teamdrives")
+                myarg, f"gam {['show', 'print'][csvFormat]} shareddrives")
     tds = []
     titles = []
+    if get_orgunits and useDomainAdminAccess:
+        ou_map = gapi_directory_orgunits.orgid_to_org_map() 
     for user in users:
-        sys.stderr.write(f'Getting Team Drives for {user}\n')
+        sys.stderr.write(f'Getting Shared Drives for {user}\n')
         user, drive = buildDrive3GAPIObject(user)
         if not drive:
             continue
@@ -8172,12 +8208,16 @@ def printShowTeamDrives(users, csvFormat):
             continue
         for td in results:
             td = utils.flatten_json(td)
+            if get_orgunits and useDomainAdminAccess:
+                td_ouid = td.get('orgUnitId')
+                if td_ouid:
+                    td['orgUnit'] = ou_map.get(f'id:{td_ouid}', 'Unknown')
             for key in td:
                 if key not in titles:
                     titles.append(key)
             tds.append(td)
     if csvFormat:
-        display.write_csv_file(tds, titles, 'Team Drives', todrive)
+        display.write_csv_file(tds, titles, 'Shared Drives', todrive)
     else:
         for td in tds:
             name = td.pop('name')
@@ -8187,17 +8227,38 @@ def printShowTeamDrives(users, csvFormat):
             print()
 
 
-
-def doDeleteTeamDrive(users):
-    teamDriveId = sys.argv[5]
+def doDeleteSharedDrive(users):
+    _, driveId = getSharedDriveId(5)
+    allowItemDeletion = False
+    useDomainAdminAccess = False
+    i = 6
+    if driveId.lower().startswith('name'):
+        driveId = gapi_drive_drives.drive_name_to_id(sys.argv[i])
+        i += 1
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg in ['nukefromorbit', 'allowitemdeletion']:
+            print("I say we take off and nuke the entire site from orbit. It's the only way to be sure...")
+            print('(deleting the shared drive and all files on it...)')
+            allowItemDeletion = True
+            useDomainAdminAccess = True
+            i += 1
+        elif myarg == 'asadmin':
+            useDomainAdminAccess = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(
+                myarg, 'gam delete shareddrive')
     for user in users:
         user, drive = buildDrive3GAPIObject(user)
         if not drive:
             continue
-        print(f'Deleting Team Drive {teamDriveId}')
+        print(f'Deleting Shared Drive {driveId}')
         gapi.call(drive.drives(),
                   'delete',
-                  driveId=teamDriveId,
+                  driveId=driveId,
+                  allowItemDeletion=allowItemDeletion,
+                  useDomainAdminAccess=useDomainAdminAccess,
                   soft_errors=True)
 
 
@@ -8986,8 +9047,9 @@ def doGetUserInfo(user_email=None):
                     if isinstance(user['customSchemas'][schema][field], list):
                         print(f'  {field}:')
                         for an_item in user['customSchemas'][schema][field]:
-                            print(f'   type: {an_item["type"]}')
-                            if an_item['type'] == 'custom':
+                            an_type = an_item.get('type', 'work')
+                            print(f'   type: {an_type}')
+                            if an_type == 'custom':
                                 print(
                                     f'    customType: {an_item["customType"]}')
                             print(f'    value: {an_item["value"]}')
@@ -10445,6 +10507,11 @@ OAUTH2_SCOPES = [
         'subscopes': ['readonly'],
         'scopes': 'https://www.googleapis.com/auth/cloud-identity.groups'
     },
+    {
+        'name': 'Cloud Identity - OrgUnits',
+        'subscopes': ['readonly'],
+        'scopes': 'https://www.googleapis.com/auth/cloud-identity.orgunits',
+    },
     {
         'name': 'Cloud Identity - User Invitations',
         'subscopes': ['readonly'],
@@ -11366,6 +11433,8 @@ def ProcessGAMCommand(args):
                 gapi_directory_printers.create()
             elif argument in ['chatmessage']:
                 gapi_chat.create_message()
+            elif argument in ['caalevel']:
+                gapi_caa.create_access_level()
             else:
                 controlflow.invalid_argument_exit(argument, 'gam create')
             sys.exit(0)
@@ -11430,6 +11499,8 @@ def ProcessGAMCommand(args):
                 gapi_directory_printers.update()
             elif argument in ['chatmessage']:
                 gapi_chat.update_message()
+            elif argument in ['caalevel']:
+                gapi_caa.update_access_level()
             else:
                 controlflow.invalid_argument_exit(argument, 'gam update')
             sys.exit(0)
@@ -11570,6 +11641,8 @@ def ProcessGAMCommand(args):
                 gapi_chromepolicy.delete_policy()
             elif argument == 'chatmessage':
                 gapi_chat.delete_message()
+            elif argument == 'caalevel':
+                gapi_caa.delete_access_level()
             else:
                 controlflow.invalid_argument_exit(argument, 'gam delete')
             sys.exit(0)
@@ -11691,6 +11764,10 @@ def ProcessGAMCommand(args):
                 gapi_chat.print_spaces()
             elif argument in ['chatmembers']:
                 gapi_chat.print_members()
+            elif argument in ['caalevels']:
+                gapi_caa.printshow_access_levels(True)
+            elif argument in ['oushareddrives', 'orgunitshareddrives']:
+                gapi_cloudidentity_orgunits.printshow_orgunit_shared_drives(True)
             else:
                 controlflow.invalid_argument_exit(argument, 'gam print')
             sys.exit(0)
@@ -11721,6 +11798,10 @@ def ProcessGAMCommand(args):
                 gapi_chromepolicy.printshow_policies()
             elif argument == 'crostelemetry':
                 gapi_chromemanagement.printShowCrosTelemetry('show')
+            elif argument in ['caalevels']:
+                gapi_caa.printshow_access_levels(False)
+            elif argument in ['oushareddrives', 'orgunitshareddrives']:
+                gapi_cloudidentity_orgunits.printshow_orgunit_shared_drives(False)
             else:
                 controlflow.invalid_argument_exit(argument, 'gam show')
             sys.exit(0)
@@ -11879,8 +11960,8 @@ def ProcessGAMCommand(args):
                 gapi_calendar.showCalSettings(users)
             elif showWhat == 'drivesettings':
                 printDriveSettings(users)
-            elif showWhat == 'teamdrivethemes':
-                getTeamDriveThemes(users)
+            elif showWhat in ['teamdrivethemes', 'shareddrivethemes']:
+                getSharedDriveThemes(users)
             elif showWhat == 'drivefileacl':
                 showDriveFileACL(users)
             elif showWhat == 'filelist':
@@ -11923,10 +12004,10 @@ def ProcessGAMCommand(args):
                 printShowFilters(users, False)
             elif showWhat in ['forwardingaddress', 'forwardingaddresses']:
                 printShowForwardingAddresses(users, False)
-            elif showWhat in ['teamdrive', 'teamdrives']:
-                printShowTeamDrives(users, False)
-            elif showWhat in ['teamdriveinfo']:
-                doGetTeamDriveInfo(users)
+            elif showWhat in shared_drive_values:
+                printShowSharedDrives(users, False)
+            elif showWhat in ['shareddriveinfo', 'teamdriveinfo']:
+                doGetSharedDriveInfo(users)
             elif showWhat in ['contactdelegate', 'contactdelegates']:
                 gapi_contactdelegation.print_(users, False)
             elif showWhat in ['holds', 'vaultholds']:
@@ -11957,8 +12038,8 @@ def ProcessGAMCommand(args):
                 printShowSmime(users, True)
             elif printWhat in ['token', 'tokens', 'oauth', '3lo']:
                 printShowTokens(5, 'users', users, True)
-            elif printWhat in ['teamdrive', 'teamdrives']:
-                printShowTeamDrives(users, True)
+            elif printWhat in shared_drive_values:
+                printShowSharedDrives(users, True)
             elif printWhat in ['contactdelegate', 'contactdelegates']:
                 gapi_contactdelegation.print_(users, True)
             elif printWhat in ['labels']:
@@ -12041,8 +12122,8 @@ def ProcessGAMCommand(args):
                 deleteSendAs(users)
             elif delWhat == 'smime':
                 deleteSmime(users)
-            elif delWhat == 'teamdrive':
-                doDeleteTeamDrive(users)
+            elif delWhat in shared_drive_values:
+                doDeleteSharedDrive(users)
             elif delWhat == 'contactdelegate':
                 gapi_contactdelegation.delete(users)
             else:
@@ -12075,8 +12156,8 @@ def ProcessGAMCommand(args):
                 addUpdateSendAs(users, 5, True)
             elif addWhat == 'smime':
                 addSmime(users)
-            elif addWhat == 'teamdrive':
-                doCreateTeamDrive(users)
+            elif addWhat in shared_drive_values:
+                doCreateSharedDrive(users)
             elif addWhat == 'contactdelegate':
                 gapi_contactdelegation.create(users)
             else:
@@ -12117,8 +12198,8 @@ def ProcessGAMCommand(args):
                 addUpdateSendAs(users, 5, False)
             elif updateWhat == 'smime':
                 updateSmime(users)
-            elif updateWhat == 'teamdrive':
-                doUpdateTeamDrive(users)
+            elif updateWhat in shared_drive_values:
+                doUpdateSharedDrive(users)
             else:
                 controlflow.invalid_argument_exit(updateWhat,
                                                   'gam <users> update')

src/gam/__main__.py

@@ -18,7 +18,7 @@
 """GAM is a command line tool which allows Administrators to control their Google Workspace domain and accounts.
 
 With GAM you can programmatically create users, turn on/off services for users like POP and Forwarding and much more.
-For more information, see https://git.io/gam
+For more information, see https://jaylee.us/gam
 """
 
 import sys

src/gam/gapi/caa.py

@@ -0,0 +1,274 @@
+import string
+import sys
+
+import googleapiclient.errors
+
+import gam
+from gam.var import *
+from gam import controlflow
+from gam import display
+from gam import gapi
+from gam import utils
+from gam.gapi import errors as gapi_errors
+from gam.gapi import cloudresourcemanager as gapi_crm
+
+
+THROW_REASONS = [gapi_errors.ErrorReason.FOUR_O_THREE]
+
+def _gen_role_error(caa):
+    sa_email = caa._http.credentials.signer_email
+    role_error = f'Please grant service account {sa_email} the Access Context Manager Editor role to your GCP organization.'
+    controlflow.system_error_exit(2, role_error)
+
+
+def build():
+    return gam.buildGAPIServiceObject('accesscontextmanager',
+                                      act_as=None)
+
+
+def get_access_policy(caa=None):
+    if not caa:
+        caa = build()
+    parent = gapi_crm.get_org_id()
+    if not parent:
+        _gen_role_error(caa)
+    try:
+        aps = gapi.get_all_pages(caa.accessPolicies(),
+                                 'list',
+                                 'accessPolicies',
+                                 throw_reasons=THROW_REASONS,
+                                 parent=parent,
+                                 fields='accessPolicies(name,title)')
+    except googleapiclient.errors.HttpError:
+        _gen_role_error(caa)
+    if not aps:
+        controlflow.system_error_exit(2, 'You don\'t seem to have any access policies. That is odd.')
+    elif len(aps) == 1:
+        return aps[0]['name']
+    for ap in aps:
+        if ap.get('title') == 'Access policy created in Cloud Identity Console':
+            return ap['name']
+    controlflow.system_error_exit(2, ' Could not find a org level access policy. That is odd.')
+
+
+def printshow_access_levels(csvFormat):
+    caa = build()
+    ap_name = get_access_policy(caa)
+    if csvFormat:
+        todrive = False
+        csvRows = []
+        titles = ['name', 'title']
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if csvFormat and myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                f"gam {['show', 'print'][csvFormat]} caalevels")
+    try:
+        levels = gapi.get_all_pages(caa.accessPolicies().accessLevels(),
+                                    'list',
+                                    'accessLevels',
+                                    throw_reasons=THROW_REASONS,
+                                    parent=ap_name,
+                                    accessLevelFormat='CEL', fields='*')
+    except googleapiclient.errors.HttpError:
+        _gen_role_error(caa)
+    if not csvFormat:
+        for level in levels:
+            display.print_json(level)
+            print()
+    else:
+        for level in levels:
+            display.add_row_titles_to_csv_file(
+                utils.flatten_json(level),
+                csvRows, titles)
+        display.write_csv_file(csvRows, titles, 'CAA Levels', todrive)
+
+
+def build_os_constraints(constraints):
+    consts_obj = []
+    constraints = constraints.upper().split(',')
+    valid_os_types = ['DESKTOP_MAC', 'DESKTOP_WINDOWS', 'DESKTOP_LINUX',
+                      'DESKTOP_CHROME_OS', 'VERIFIED_DESKTOP_CHROME_OS', 'ANDROID', 'IOS']
+    for constraint in constraints:
+        new_const = {}
+        if ':' in constraint:
+            new_const['osType'], new_const['minimumVersion'] = constraint.split(':')
+        else:
+            new_const['osType'] = constraint
+        if new_const['osType'] not in valid_os_types:
+            controlflow.system_error_exit(2, f'expected os type of {", ".join(valid_os_types)} got {new_const["osType"]}')
+        if new_const['osType'] == 'VERIFIED_DESKTOP_CHROME_OS':
+            new_const['osType'] = 'DESKTOP_CHROME_OS'
+            new_const['requireVerifiedChromeOs'] = True
+        consts_obj.append(new_const)
+    return consts_obj
+
+
+def build_device_policy(i, schemas):
+    device_policy = {}
+    while True:
+        myarg = sys.argv[i].replace('_', '').lower()
+        if myarg == 'requirescreenlock':
+            device_policy['requireScreenLock'] = gam.getBoolean(sys.argv[i+1], myarg)
+            i += 2
+        elif myarg == 'allowedencryptionstatuses':
+            allowed_statuses = gapi.get_enum_values_minus_unspecified(schemas["DevicePolicy"]["properties"]["allowedEncryptionStatuses"]["items"]["enum"])
+            device_policy['allowedEncryptionStatuses'] = sys.argv[i+1].upper().split(',')
+            for status in device_policy['allowedEncryptionStatuses']:
+                if status not in allowed_statuses:
+                    controlflow.system_error_exit(2, f'expected encryption status of {", ".join(allowed_statuses)} got {status}')
+            i += 2
+        elif myarg == 'osconstraints':
+            device_policy['osConstraints'] = build_os_constraints(sys.argv[i+1])
+            i += 2
+        elif myarg == 'alloweddevicemanagementlevels':
+            allowed_levels = gapi.get_enum_values_minus_unspecified(schemas["DevicePolicy"]["properties"]["allowedDeviceManagementLevels"]["items"]["enum"])
+            device_policy['allowedDeviceManagementLevels'] = sys.argv[i+1].upper().split(',')
+            for level in device_policy['allowedDeviceManagementLevels']:
+                if level == 'ADVANCED':
+                    level = 'COMPLETE'
+                if level not in allowed_levels:
+                    controlflow.system_error_exit(2, f'expected device management level of {", ".join(allowed_levels)} got {level}')
+            i += 2
+        elif myarg == 'requireadminapproval':
+            device_policy['requireAdminApproval'] = gam.getBoolean(sys.argv[i+1], myarg)
+            i += 2
+        elif myarg == 'requirecorpowned':
+            device_policy['requireCorpOwned'] = gam.getBoolean(sys.argv[i+1], myarg)
+            i += 2
+        elif myarg == 'enddevicepolicy':
+            i += 1
+            break
+        else:
+            controlflow.invalid_argument_exit(myarg, 'gam create/update caalevel')
+    return i, device_policy
+
+
+def build_condition(i, schemas):
+    condition = {}
+    while True:
+        myarg = sys.argv[i].replace('_', '').lower()
+        if myarg == 'ipsubnetworks':
+            condition['ipSubnetworks'] = sys.argv[i+1].split(',')
+            i += 2
+        elif myarg == 'devicepolicy':
+            i += 1
+            i, condition['devicePolicy'] = build_device_policy(i, schemas)
+        elif myarg == 'requiredaccesslevels':
+            condition['requiredAccessLevels'] = sys.argv[i+1].split(',')
+            i += 2
+        elif myarg == 'negate':
+            condition['negate'] = gam.getBoolean(sys.argv[i+1], myarg)
+            i += 2
+        elif myarg == 'members':
+            condition['members'] = sys.argv[i+1].split(',')
+            i += 2
+        elif myarg == 'regions':
+            condition['regions'] = sys.argv[i+1].upper().split(',')
+            i += 2
+        elif myarg == 'endcondition':
+            i += 1
+            break
+        else:
+            controlflow.invalid_argument_exit(myarg, 'gam create/update caalevel')
+    return i, condition
+
+
+def build_basic_level(i, schemas):
+    basic_level = {'conditions': []}
+    valid_functions = gapi.get_enum_values_minus_unspecified(schemas['BasicLevel']['properties']['combiningFunction']['enum'])
+    while i < len(sys.argv):
+        myarg = sys.argv[i].replace('_', '').lower()
+        if myarg == 'combiningfunction':
+            combiningFunction = sys.argv[i+1].upper()
+            if combiningFunction not in valid_functions:
+                controlflow.system_error_exit(2, f'expected combining function of {",".join(valid_functions)} got {combiningFunction}')
+            basic_level['combiningFunction'] = combiningFunction
+            i += 2
+        elif myarg == 'condition':
+            i += 1
+            i, condition = build_condition(i, schemas)
+            basic_level['conditions'].append(condition)
+        else:
+            controlflow.invalid_argument_exit(myarg, 'gam create/update caalevel')
+    return i, basic_level
+
+
+def build_caa_level(i, caa, body):
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'basic':
+            schemas = caa._rootDesc['schemas']
+            i += 1
+            i, body['basic'] = build_basic_level(i, schemas)
+        elif myarg == 'custom':
+            body['custom'] = {'expr': {'expression': sys.argv[i+1], 'title': 'expr'}}
+            i += 2
+        elif myarg == 'description':
+            body['description'] = sys.argv[i+1]
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(myarg, 'gam create/update caalevel')
+
+
+def create_access_level():
+    caa = build()
+    ap_name = get_access_policy(caa)
+    title = sys.argv[3].replace(' ', '_')
+    allowed_title_chars = string.ascii_letters + string.digits + '_'
+    name = ''.join([c for c in title if c in allowed_title_chars])[:50]
+    name = f'{ap_name}/accessLevels/{name}'
+    body = {
+            'name': name,
+            'title': title,
+           }
+    build_caa_level(4, caa, body)
+    print(f'Creating access level {name}...')
+    try:
+        gapi.call(caa.accessPolicies().accessLevels(),
+                  'create',
+                  throw_reasons=THROW_REASONS,
+                  parent=ap_name,
+                  body=body)
+    except googleapiclient.errors.HttpError:
+        _gen_role_error(caa)
+
+def get_access_level_name(i, caa):
+    name = sys.argv[i]
+    if not name.startswith('accessPolicies/'):
+        ap_name = get_access_policy(caa)
+        name = f'{ap_name}/accessLevels/{name}'
+    return name
+
+
+def update_access_level():
+    caa = build()
+    name = get_access_level_name(3, caa)
+    body = {}
+    build_caa_level(4, caa, body)
+    updateMask = ','.join(body.keys())
+    print(f'Updating access level {name}...')
+    try:
+        gapi.call(caa.accessPolicies().accessLevels(),
+                  'patch',
+                  throw_reasons=THROW_REASONS,
+                  name=name,
+                  updateMask=updateMask,
+                  body=body)
+    except googleapiclient.errors.HttpError:
+        _gen_role_error(caa)
+
+def delete_access_level():
+    caa = build()
+    name = get_access_level_name(3, caa)
+    print(f'Deleting access level {name}...')
+    try:
+        gapi.call(caa.accessPolicies().accessLevels(),
+                  'delete',
+                  name=name)
+    except googleapiclient.errors.HttpError:
+        _gen_role_error(caa)

src/gam/gapi/cloudidentity/__init__.py

@@ -1,9 +1,12 @@
 import gam
-
+from gam.var import GC_Values, GC_ENABLE_DASA
 
 def build(api='cloudidentity'):
     return gam.buildGAPIObject(api)
 
 def build_dwd(api='cloudidentity'):
+    # If we are using DASA we don't need to use DwD.
+    if GC_Values[GC_ENABLE_DASA]:
+        return gam.buildGAPIObject(api)
     admin = gam._get_admin_email()
     return gam.buildGAPIServiceObject(api, admin, True)

src/gam/gapi/cloudidentity/devices.py

@@ -253,6 +253,13 @@ def update_state():
 
 
 def print_():
+    # This function is rather messy thanks to
+    # https://github.com/GAM-team/GAM/issues/1534
+    # I'd prefer to keep it all in this function for now but if:
+    #  - we find other list() operations that also hit this bug OR
+    #  - it looks like this issue is going to exist on Google's side
+    #    for a long time.
+    # I'll enterain some cleanup here to "functionalize" (yuck) all of this.
     ci = gapi_cloudidentity.build_dwd()
     customer = _get_device_customerid()
     parent = 'devices/-'
@@ -260,6 +267,8 @@ def print_():
     get_device_users = True
     view = None
     orderByList = []
+    # default sort order needed by our 1 hour bug workaround
+    orderBy = 'create_time'
     titles = []
     csvRows = []
     todrive = False
@@ -319,26 +328,97 @@ def print_():
       }
     if orderByList:
         orderBy = ','.join(orderByList)
-    else:
-        orderBy = None
-    devices = []
+    custom_device_filter = bool(device_filter)
+    # we store the devices in a dict keyed by name which is a unique ID.
+    # that way when we get duplicate devices we just overwrite the name
+    # with the latest copy we saw.
+    devices = {}
     page_message = gapi.got_total_items_msg(view_name_map[view], '...\n')
-    devices += gapi.get_all_pages(ci.devices(), 'list', 'devices',
-        customer=customer, page_message=page_message,
-        pageSize=100, filter=device_filter, view=view, orderBy=orderBy)
+    pageToken = None
+    newest_device_date = ''
+    total_items = 0
+    while True:
+        try:
+            a_page = gapi.call(ci.devices(),
+                               'list',
+                               customer=customer,
+                               pageSize=100,
+                               pageToken=pageToken,
+                               filter=device_filter,
+                               view=view,
+                               orderBy=orderBy,
+                               throw_reasons=[gapi_errors.ErrorReason.FOUR_O_O])
+        except googleapiclient.errors.HttpError:
+            sys.stderr.write('WARNING: GAM hit Google internal bug 237397223. Please file a Google Support ticket stating that you are encountering this bug.\n') 
+            if orderBy != 'create_time' or custom_device_filter:
+                controlflow.system_error_exit(5, 'GAM workaround for this issue only works if filter and orderby arguments are not used.\n')
+            sys.stderr.write(f' attempting to work around the bug by filtering for devices created on or after the newest we\'ve seen ({newest_device_date})...')
+            device_filter = f'register:{newest_device_date}..'
+            pageToken = None
+            continue
+        for dev in a_page.get('devices', []):
+            total_items += 1
+            devices[dev['name']] = dev
+            dev_date = dev.get('createTime', '')
+            # remove the Z
+            dev_date = dev_date[:-1]
+            # remove microseconds
+            dev_date = dev_date.split('.')[0]
+            if dev_date > newest_device_date:
+                newest_device_date = dev_date
+        pageToken = a_page.get('nextPageToken')
+        if not pageToken:
+            break
+        sys.stderr.write(page_message.replace('%%total_items%%', str(total_items)))
     if get_device_users:
         page_message = gapi.got_total_items_msg('Device Users', '...\n')
-        device_users = gapi.get_all_pages(ci.devices().deviceUsers(), 'list',
-            'deviceUsers', customer=customer, parent=parent,
-            page_message=page_message, pageSize=20, filter=device_filter)
-        for device_user in device_users:
-            for device in devices:
-                if device_user.get('name').startswith(device.get('name')):
-                    if 'users' not in device:
-                        device['users'] = []
-                    device['users'].append(device_user)
-                    break
-    for device in devices:
+        pageToken = None
+        newest_deviceuser_date = ''
+        total_items = 0
+        device_users = {}
+        if not custom_device_filter:
+            device_filter = None
+        while True:
+            try:
+                a_page = gapi.call(ci.devices().deviceUsers(),
+                                   'list',
+                                   customer=customer,
+                                   parent=parent,
+                                   pageSize=20,
+                                   orderBy=orderBy,
+                                   filter=device_filter,
+                                   pageToken=pageToken,
+                                   throw_reasons=[gapi_errors.ErrorReason.FOUR_O_O])
+            except googleapiclient.errors.HttpError:
+                sys.stderr.write('WARNING: GAM hit Google internal bug 237397223. Please file a Google Support ticket stating that you are encountering this bug.\n')
+                if orderBy != 'create_time' or custom_device_filter:
+                    controlflow.system_error_exit(5, 'GAM workaround for this issue only works if filter and orderby arguments are not used.\n')
+                sys.stderr.write(f' attempting to work around the bug by filtering for device users created on or after the newest we\'ve seen ({newest_deviceuser_date})...')
+                device_filter = f'register:{newest_deviceuser_date}..'
+                pageToken = None
+                continue
+            for device_user in a_page.get('deviceUsers', []):
+                total_items += 1
+                dev_date = device_user.get('createTime', '')
+                # remove the Z
+                dev_date = dev_date[:-1]
+                # remove microseconds
+                dev_date = dev_date.split('.')[0]
+                if dev_date > newest_deviceuser_date:
+                    newest_deviceuser_date = dev_date
+                deviceuser_name = device_user['name']
+                device_users[deviceuser_name] = device_user
+            pageToken = a_page.get('nextPageToken')
+            if not pageToken:
+                break
+            sys.stderr.write(page_message.replace('%%total_items%%', str(total_items)))
+        for deviceuser_name, device_user in device_users.items():
+            device_id = deviceuser_name.split('/')[1]
+            device_name = f'devices/{device_id}'
+            if 'users' not in devices[device_name]:
+                devices[device_name]['users'] = []
+            devices[device_name]['users'].append(device_user)
+    for device in devices.values():
         device = utils.flatten_json(device)
         for a_key in device:
             if a_key not in titles:

src/gam/gapi/cloudidentity/groups.py

@@ -866,6 +866,13 @@ def update():
                     'cloudidentity.googleapis.com/groups.discussion_forum': ''
                 }
                 i += 1
+            elif myarg == 'dynamicsecurity':
+                body['labels'] = {
+                    'cloudidentity.googleapis.com/groups.dynamic': '',
+                    'cloudidentity.googleapis.com/groups.security': '',
+                    'cloudidentity.googleapis.com/groups.discussion_forum': ''
+                }
+                i += 1
             elif myarg in ['dynamic']:
                 body['dynamicGroupMetadata'] = {
                     'queries': [{

src/gam/gapi/cloudidentity/orgunits.py

@@ -0,0 +1,72 @@
+import sys
+
+import googleapiclient
+
+import gam
+from gam.var import * # pylint: disable=unused-wildcard-import
+from gam import controlflow
+from gam import display
+from gam import gapi
+from gam import utils
+from gam.gapi import errors as gapi_errors
+from gam.gapi import cloudidentity as gapi_cloudidentity
+from gam.gapi.directory import orgunits as gapi_directory_orgunits
+
+def _get_orgunit_customerid():
+  customer = GC_Values[GC_CUSTOMER_ID]
+  if customer != MY_CUSTOMER and not customer.startswith('C'):
+      customer = f'C{customer}'
+  return f'customers/{customer}'
+
+def move_shared_drive(driveId, orgUnit):
+    _, orgUnitId = gapi_directory_orgunits.getOrgUnitId(orgUnit)
+    orgUnitId = f'orgUnits/{orgUnitId[3:]}'
+    name = f'orgUnits/-/memberships/shared_drive;{driveId}'
+    ci = gapi_cloudidentity.build('cloudidentity_beta')
+    body = {
+            'customer': _get_orgunit_customerid(),
+            'destinationOrgUnit': orgUnitId,
+           }
+    return gapi.call(ci.orgUnits().memberships(),
+              'move',
+              name=name,
+              body=body)
+
+def printshow_orgunit_shared_drives(csvFormat):
+    orgunit = '/'
+    if csvFormat:
+        todrive = False
+        csvRows = []
+        titles = ['name']
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if csvFormat and myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg in ['ou', 'org', 'orgunit']:
+          orgunit = sys.argv[i + 1]
+          i += 2
+        else:
+          controlflow.invalid_argument_exit(sys.argv[i],
+                                            f"gam {['show', 'print'][csvFormat]} oushareddrives")
+    ci = gapi_cloudidentity.build('cloudidentity_beta')
+    _, orgUnitId = gapi_directory_orgunits.getOrgUnitId(orgunit)
+    parent = f'orgUnits/{orgUnitId[3:]}'
+    filter_ = "type == 'shared_drive'"
+    sds = gapi.get_all_pages(ci.orgUnits().memberships(),
+                       'list',
+                       'orgMemberships',
+                       parent=parent,
+                       customer=_get_orgunit_customerid(),
+                       filter=filter_)
+    if not csvFormat:
+        for sd in sds:
+            display.print_json(sd)
+            print()
+    else:
+        for sd in sds:
+            display.add_row_titles_to_csv_file(
+                utils.flatten_json(sd),
+                csvRows, titles)
+        display.write_csv_file(csvRows, titles, f'OrgUnit {orgunit} Shared Drives', todrive)

src/gam/gapi/cloudresourcemanager.py

@@ -0,0 +1,24 @@
+import gam
+from gam.var import GC_Values, GC_CUSTOMER_ID
+from gam import controlflow
+from gam import gapi
+from gam.gapi.directory import customer as gapi_directory_customer
+
+def build():
+    return gam.buildGAPIServiceObject('cloudresourcemanager',
+                                      act_as=None)
+
+
+def get_org_id():
+    gapi_directory_customer.setTrueCustomerId()
+    crm = build()
+    query = f'directorycustomerid:{GC_Values[GC_CUSTOMER_ID]}'
+    orgs = gapi.get_all_pages(crm.organizations(),
+                     'search',
+                     'organizations',
+                     query=query)
+    if len(orgs) < 1:
+        # return nothing and let calling API deal with it
+        # since caller knows what GCP role would serve best
+        return 
+    return orgs[0]['name']

src/gam/gapi/directory/cros.py

@@ -304,6 +304,8 @@ def doGetCrosInfo():
         if 'autoUpdateExpiration' in cros:
             cros['autoUpdateExpiration'] = utils.formatTimestampYMD(
                 cros['autoUpdateExpiration'])
+        if 'orgUnitId' in cros:
+            cros['orgUnitId'] = f"id:{cros['orgUnitId']}"
         _checkTPMVulnerability(cros)
         for up in CROS_SCALAR_PROPERTY_PRINT_ORDER:
             if up in cros:
@@ -739,6 +741,8 @@ def doPrintCrosDevices():
                 if 'autoUpdateExpiration' in cros:
                     cros['autoUpdateExpiration'] = utils.formatTimestampYMD(
                         cros['autoUpdateExpiration'])
+                if 'orgUnitId' in cros:
+                    cros['orgUnitId'] = f"id:{cros['orgUnitId']}"
                 for cpuStatusReport in cros.get('cpuStatusReports', []):
                     tempInfos = cpuStatusReport.get('cpuTemperatureInfo', [])
                     for tempInfo in tempInfos:
@@ -753,6 +757,8 @@ def doPrintCrosDevices():
             if 'autoUpdateExpiration' in cros:
                 cros['autoUpdateExpiration'] = utils.formatTimestampYMD(
                     cros['autoUpdateExpiration'])
+            if 'orgUnitId' in cros:
+                cros['orgUnitId'] = f"id:{cros['orgUnitId']}"
             row = {}
             for attrib in cros:
                 if attrib not in {

src/gam/gapi/directory/orgunits.py

@@ -160,42 +160,15 @@ def info(name=None, return_attrib=None):
                     print('')
 
 
-def print_():
-    print_order = [
-        'orgUnitPath', 'orgUnitId', 'name', 'description', 'parentOrgUnitPath',
-        'parentOrgUnitId', 'blockInheritance'
-    ]
-    cd = gapi_directory.build()
-    listType = 'all'
-    orgUnitPath = '/'
-    todrive = False
-    fields = ['orgUnitPath', 'name', 'orgUnitId', 'parentOrgUnitId']
-    titles = []
-    csvRows = []
-    parentOrgIds = []
+def list_orgunits(listType='all', orgUnitPath=None, fields=None):
     retrievedOrgIds = []
-    i = 3
-    while i < len(sys.argv):
-        myarg = sys.argv[i].lower().replace('_', '')
-        if myarg == 'todrive':
-            todrive = True
-            i += 1
-        elif myarg == 'toplevelonly':
-            listType = 'children'
-            i += 1
-        elif myarg == 'fromparent':
-            orgUnitPath = getOrgUnitItem(sys.argv[i + 1])
-            i += 2
-        elif myarg == 'allfields':
-            fields = None
-            i += 1
-        elif myarg == 'fields':
-            fields += sys.argv[i + 1].split(',')
-            i += 2
-        else:
-            controlflow.invalid_argument_exit(sys.argv[i], 'gam print orgs')
-    gam.printGettingAllItems('Organizational Units', None)
+    parentOrgIds = []
+    cd = gapi_directory.build()
     if fields:
+        # Always get parentOrgUnitId so we can
+        # find missing parents
+        if 'parentOrgUnitId' not in fields:
+            fields.append('parentOrgUnitId')
         get_fields = ','.join(fields)
         list_fields = f'organizationUnits({get_fields})'
     else:
@@ -230,6 +203,44 @@ def print_():
             orgunits.append(result)
         except:
             pass
+    return orgunits
+
+
+def print_():
+    print_order = [
+        'orgUnitPath', 'orgUnitId', 'name', 'description', 'parentOrgUnitPath',
+        'parentOrgUnitId', 'blockInheritance'
+    ]
+    listType = 'all'
+    orgUnitPath = '/'
+    todrive = False
+    fields = ['orgUnitPath', 'name', 'orgUnitId', 'parentOrgUnitId']
+    titles = []
+    csvRows = []
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg == 'toplevelonly':
+            listType = 'children'
+            i += 1
+        elif myarg == 'fromparent':
+            orgUnitPath = getOrgUnitItem(sys.argv[i + 1])
+            i += 2
+        elif myarg == 'allfields':
+            fields = None
+            i += 1
+        elif myarg == 'fields':
+            fields += sys.argv[i + 1].split(',')
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam print orgs')
+    gam.printGettingAllItems('Organizational Units', None)
+    orgunits = list_orgunits(listType=listType,
+                             orgUnitPath=orgUnitPath,
+                             fields=fields) 
     for row in orgunits:
         orgEntity = {}
         for key, value in list(row.items()):
@@ -248,6 +259,11 @@ def print_():
     display.write_csv_file(csvRows, titles, 'Orgs', todrive)
 
 
+def orgid_to_org_map():
+    orgunits = list_orgunits(fields=['orgUnitPath', 'orgUnitId'])
+    result = {ou['orgUnitId']:ou['orgUnitPath'] for ou in orgunits}
+    return result
+
 def update():
     cd = gapi_directory.build()
     orgUnitPath = getOrgUnitItem(sys.argv[3])
@@ -357,17 +373,20 @@ def makeOrgUnitPathRelative(path):
 
 
 def encodeOrgUnitPath(path):
-    if path.find('+') == -1 and path.find('%') == -1:
-        return path
-    encpath = ''
-    for c in path:
-        if c == '+':
-            encpath += '%2B'
-        elif c == '%':
-            encpath += '%25'
-        else:
-            encpath += c
-    return encpath
+# 6.22 - This method no longer works.
+# % no longer needs encoding and + is handled incorrectly in API with or without encoding
+    return path
+#    if path.find('+') == -1 and path.find('%') == -1:
+#        return path
+#    encpath = ''
+#    for c in path:
+#        if c == '+':
+#            encpath += '%2B'
+#        elif c == '%':
+#            encpath += '%25'
+#        else:
+#            encpath += c
+#    return encpath
 
 
 def getOrgUnitItem(orgUnit, pathOnly=False, absolutePath=True):

src/gam/gapi/directory/resource.py

@@ -227,6 +227,22 @@ def printFeatures():
     display.write_csv_file(csvRows, titles, 'Features', to_drive)
 
 
+BUILDING_ADDRESS_FIELD_MAP = {
+    'address': 'addressLines',
+    'addresslines': 'addressLines',
+    'administrativearea': 'administrativeArea',
+    'city': 'locality',
+    'country': 'regionCode',
+    'language': 'languageCode',
+    'languagecode': 'languageCode',
+    'locality': 'locality',
+    'postalcode': 'postalCode',
+    'regioncode': 'regionCode',
+    'state': 'administrativeArea',
+    'sublocality': 'sublocality',
+    'zipcode': 'postalCode',
+    }
+
 def _getBuildingAttributes(args, body={}):
     i = 0
     while i < len(args):
@@ -253,6 +269,16 @@ def _getBuildingAttributes(args, body={}):
         elif myarg == 'floors':
             body['floorNames'] = args[i + 1].split(',')
             i += 2
+        elif myarg in BUILDING_ADDRESS_FIELD_MAP:
+            myarg = BUILDING_ADDRESS_FIELD_MAP[myarg]
+            body.setdefault('address', {})
+            if myarg == 'addressLines':
+                body['address'][myarg] = args[i + 1].split('\n')
+            elif myarg == 'languageCode':
+                body['address'][myarg] = LANGUAGE_CODES_MAP.get(args[i + 1].lower(), args[i + 1])
+            else:
+                body['address'][myarg] = args[i + 1]
+            i += 2
         else:
             controlflow.invalid_argument_exit(myarg,
                                               'gam create|update building')

src/gam/gapi/directory/roleassignments.py

@@ -21,6 +21,18 @@ def create():
     body['roleId'] = gapi_directory_roles.getRoleId(role)
     body['scopeType'] = sys.argv[5].upper()
     i = 6
+    if body['scopeType'] not in ['CUSTOMER', 'ORG_UNIT']:
+        controlflow.expected_argument_exit('scope type',
+                                           ', '.join(['customer', 'org_unit']),
+                                           body['scopeType'])
+    if body['scopeType'] == 'ORG_UNIT':
+        orgUnit, orgUnitId = gapi_directory_orgunits.getOrgUnitId(
+            sys.argv[i], cd)
+        body['orgUnitId'] = orgUnitId[3:]
+        scope = f'ORG_UNIT {orgUnit}'
+        i = 7
+    else:
+        scope = 'CUSTOMER'
     while i < len(sys.argv):
         myarg = sys.argv[i].lower()
         if myarg == 'condition':
@@ -33,17 +45,6 @@ def create():
             i += 2
         else:
             controlflow.invalid_argument_exit(sys.argv[i], 'gam create admin')
-    if body['scopeType'] not in ['CUSTOMER', 'ORG_UNIT']:
-        controlflow.expected_argument_exit('scope type',
-                                           ', '.join(['customer', 'org_unit']),
-                                           body['scopeType'])
-    if body['scopeType'] == 'ORG_UNIT':
-        orgUnit, orgUnitId = gapi_directory_orgunits.getOrgUnitId(
-            sys.argv[6], cd)
-        body['orgUnitId'] = orgUnitId[3:]
-        scope = f'ORG_UNIT {orgUnit}'
-    else:
-        scope = 'CUSTOMER'
     print(f'Giving {user} admin role {role} for {scope}')
     gapi.call(cd.roleAssignments(),
               'insert',

src/gam/gapi/drive/__init__.py

@@ -0,0 +1,8 @@
+import gam
+
+
+def build(user=None):
+    if not user:
+        user = gam._get_admin_email()
+    userEmail = gam.convertUIDtoEmailAddress(user)
+    return (userEmail, gam.buildGAPIServiceObject('drive3', userEmail))

src/gam/gapi/drive/drives.py

@@ -0,0 +1,26 @@
+"""Methods related to Drive API Shared Drives"""
+import sys
+
+
+import gam
+from gam.var import GC_CUSTOMER_ID, GC_Values, MY_CUSTOMER, SORTORDER_CHOICES_MAP
+from gam import controlflow
+from gam import display
+from gam import gapi
+from gam.gapi import errors as gapi_errors
+from gam.gapi import drive as gapi_drive
+
+def drive_name_to_id(name, drive=None):
+    if not drive:
+        _, drive = gapi_drive.build()
+    q = f"name = '{name}'"
+    sds = gapi.get_all_pages(drive.drives(),
+                             'list',
+                             'drives',
+                             q=q,
+                             useDomainAdminAccess=True)
+    if len(sds) == 0:
+        controlflow.system_error_exit(3, f'Could not find shared drive named "{name}"')
+    elif len(sds) > 1:
+        controlflow.system_error_exit(3, f'Got more than one shared drive named "{name}"')
+    return sds[0]['id']

src/gam/gapi/errors.py

@@ -120,6 +120,7 @@ class ErrorReason(Enum):
     FAILED_PRECONDITION = 'failedPrecondition'
     FORBIDDEN = 'forbidden'
     FIVE_O_THREE = '503'
+    FIVE_O_O = '500'
     FOUR_O_NINE = '409'
     FOUR_O_O = '400'
     FOUR_O_FOUR = '404'
@@ -159,6 +160,7 @@ DEFAULT_RETRY_REASONS = [
     ErrorReason.GATEWAY_TIMEOUT,
     ErrorReason.INTERNAL_ERROR,
     ErrorReason.FOUR_TWO_NINE,
+    ErrorReason.FIVE_O_O,
     ErrorReason.FIVE_O_THREE,
 ]
 GMAIL_THROW_REASONS = [ErrorReason.SERVICE_NOT_AVAILABLE]
@@ -231,6 +233,7 @@ ERROR_REASON_TO_EXCEPTION = {
 OAUTH2_TOKEN_ERRORS = [
     'access_denied',
     'access_denied: Requested client not authorized',
+    'access_denied: Account restricted',
     'internal_failure: Backend Error',
     'internal_failure: None',
     'invalid_grant',

src/gam/gapi/licensing.py

@@ -56,7 +56,7 @@ def create(users, sku=None):
         productId = sys.argv[i+1]
         i += 2
     for user in users:
-        print(f'Adding license {sku_name} from to {user}')
+        print(f'Adding license {sku_name} to {user}')
         gapi.call(lic.licenseAssignments(),
                   'insert',
                   soft_errors=True,

src/gam/gapi/vault.py

@@ -348,7 +348,7 @@ def print_count():
     # so we keep track of which accounts we searched and can report
     # zero data for them.
     if search_method == 'ACCOUNT':
-      query_accounts = query.get('accountInfo', [])
+      query_accounts = query.get('accountInfo', {}).get('emails', [])
     elif search_method == 'ENTIRE_ORG':
       query_accounts = gam.getUsersToModify('all', 'users')
     elif search_method == 'ORG_UNIT':
@@ -367,8 +367,9 @@ def print_count():
             if account in query_accounts: query_accounts.remove(account)
         for account in a_count.get('accountCounts', []):
             email = account.get('account', {}).get('email', '')
-            csv_rows.append({'account': email, 'count': account.get('count')})
-            if email in query_accounts: query_accounts.remove(email)
+            if email:
+                csv_rows.append({'account': email, 'count': account.get('count', 0)})
+                if email in query_accounts: query_accounts.remove(email)
     for account in query_accounts:
         csv_rows.append({'account': account, 'count': 0})
     titles = ['account', 'count', 'error']

src/gam/var.py

@@ -8,10 +8,10 @@ import platform
 import re
 
 GAM_AUTHOR = 'Jay Lee <jay0lee@gmail.com>'
-GAM_VERSION = '6.16'
+GAM_VERSION = '6.22'
 GAM_LICENSE = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
-GAM_URL = 'https://git.io/gam'
+GAM_URL = 'https://jaylee.us/gam'
 GAM_INFO = (
     f'GAM {GAM_VERSION} - {GAM_URL} / {GAM_AUTHOR} / '
     f'Python {platform.python_version()} {sys.version_info.releaselevel} / '
@@ -42,7 +42,7 @@ FN_EXTRA_ARGS_TXT = 'extra-args.txt'
 FN_LAST_UPDATE_CHECK_TXT = 'lastupdatecheck.txt'
 MY_CUSTOMER = 'my_customer'
 # See https://support.google.com/drive/answer/37603
-MAX_GOOGLE_SHEET_CELLS = 5000000
+MAX_GOOGLE_SHEET_CELLS = 10000000
 MAX_LOCAL_GOOGLE_TIME_OFFSET = 30
 
 SKUS = {
@@ -116,6 +116,11 @@ SKUS = {
         'aliases': ['gvpremier', 'voicepremier', 'googlevoicepremier'],
         'displayName': 'Google Voice Premier'
     },
+    '1010360001': {
+        'product': '101036',
+        'aliases': ['meetdialing','googlemeetglobaldialing'],
+        'displayName': 'Google Meet Global Dialing'
+    },
     '1010370001': {
         'product': '101037',
         'aliases': ['gwetlu', 'workspaceeducationupgrade'],
@@ -193,6 +198,11 @@ SKUS = {
                     'wsentplus', 'workspaceenterpriseplus'],
         'displayName': 'Workspace Enterprise Plus'
     },
+    '1010020029': {
+        'product': 'Google-Apps',
+        'aliases': ['wes', 'workspaceenterprisestarter'],
+        'displayName': 'Workspace Enterprise Starter'
+    },
     '1010020030': {
         'product': 'Google-Apps',
         'aliases': ['workspacefrontline', 'workspacefrontlineworker'],
@@ -277,6 +287,7 @@ PRODUCTID_NAME_MAPPINGS = {
     '101033': 'Google Voice',
     '101034': 'G Suite Archived',
     '101035': 'Cloud Search',
+    '101036': 'Google Meet Global Dialing',
     '101037': 'G Suite Workspace for Education',
     'Google-Apps': 'Google Workspace',
     'Google-Chrome-Device-Management': 'Google Chrome Device Management',
@@ -301,6 +312,7 @@ API_NAME_MAPPING = {
 }
 
 API_VER_MAPPING = {
+    'accesscontextmanager': 'v1',
     'alertcenter': 'v1beta1',
     'driveactivity': 'v2',
     'calendar': 'v3',
@@ -976,6 +988,7 @@ CROS_ARGUMENT_TO_PROPERTY_MAP = {
     'notes': ['notes',],
     'ordernumber': ['orderNumber',],
     'org': ['orgUnitPath',],
+    'orgunitid': ['orgUnitId',],
     'orgunitpath': ['orgUnitPath',],
     'osversion': ['osVersion',],
     'ou': ['orgUnitPath',],
@@ -1001,6 +1014,7 @@ CROS_BASIC_FIELDS_LIST = [
 ]
 
 CROS_SCALAR_PROPERTY_PRINT_ORDER = [
+    'orgUnitId',
     'orgUnitPath',
     'annotatedAssetId',
     'annotatedLocation',
@@ -1524,6 +1538,9 @@ MESSAGE_UPDATE_GAM_TO_64BIT = 'You\'re running a 32-bit version of GAM on a' \
 MESSAGE_YOUR_SYSTEM_TIME_DIFFERS_FROM_GOOGLE_BY = 'Your system time differs' \
                                                   ' from %s by %s'
 
+shared_drive_values = ['teamdrive', 'teamdrives',
+                       'shareddrive', 'shareddrives']
+
 USER_ADDRESS_TYPES = ['home', 'work', 'other']
 USER_EMAIL_TYPES = ['home', 'work', 'other']
 USER_EXTERNALID_TYPES = [

src/project-apis.txt

@@ -1,3 +1,4 @@
+accesscontextmanager.googleapis.com
 admin.googleapis.com
 alertcenter.googleapis.com
 calendar-json.googleapis.com
@@ -6,6 +7,7 @@ chromemanagement.googleapis.com
 chromepolicy.googleapis.com
 classroom.googleapis.com
 cloudidentity.googleapis.com
+cloudresourcemanager.googleapis.com
 contacts.googleapis.com
 drive.googleapis.com
 driveactivity.googleapis.com

src/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = GAM for Google Workspace
-version = 6.0.14
+version = 6.0.22
 description = Command line management for Google Workspaces
 long_description = file: readme.md
 long_description_content_type = text/markdown