mirror of
https://github.com/GAM-team/GAM.git
synced 2026-07-04 12:51:36 +00:00
Fixed bug in `gam calendars <CalendarEntity> print events matchfield
Some checks are pending
Build and test GAM / build (Win64, build, 10, VC-WIN64A, windows-2022) (push) Waiting to run
Build and test GAM / build (aarch64, build, 3, linux-aarch64, ubuntu-24.04-arm) (push) Waiting to run
Build and test GAM / build (aarch64, build, 4, linux-aarch64, ubuntu-22.04-arm) (push) Waiting to run
Build and test GAM / build (aarch64, build, 6, linux-aarch64, ubuntu-22.04-arm, yes) (push) Waiting to run
Build and test GAM / build (aarch64, build, 8, darwin64-arm64, macos-14) (push) Waiting to run
Build and test GAM / build (aarch64, build, 9, darwin64-arm64, macos-15) (push) Waiting to run
Build and test GAM / build (x86_64, build, 1, linux-x86_64, ubuntu-22.04) (push) Waiting to run
Build and test GAM / build (x86_64, build, 2, linux-x86_64, ubuntu-24.04) (push) Waiting to run
Build and test GAM / build (x86_64, build, 5, linux-x86_64, ubuntu-22.04, yes) (push) Waiting to run
Build and test GAM / build (x86_64, build, 7, darwin64-x86_64, macos-13) (push) Waiting to run
Build and test GAM / build (x86_64, test, 11, ubuntu-24.04, 3.10) (push) Waiting to run
Build and test GAM / build (x86_64, test, 12, ubuntu-24.04, 3.11) (push) Waiting to run
Build and test GAM / build (x86_64, test, 13, ubuntu-24.04, 3.12) (push) Waiting to run
Build and test GAM / merge (push) Blocked by required conditions
Build and test GAM / publish (push) Blocked by required conditions
CodeQL / Analyze (python) (push) Waiting to run
Check for Google Root CA Updates / check-apis (push) Waiting to run
Some checks are pending
Build and test GAM / build (Win64, build, 10, VC-WIN64A, windows-2022) (push) Waiting to run
Build and test GAM / build (aarch64, build, 3, linux-aarch64, ubuntu-24.04-arm) (push) Waiting to run
Build and test GAM / build (aarch64, build, 4, linux-aarch64, ubuntu-22.04-arm) (push) Waiting to run
Build and test GAM / build (aarch64, build, 6, linux-aarch64, ubuntu-22.04-arm, yes) (push) Waiting to run
Build and test GAM / build (aarch64, build, 8, darwin64-arm64, macos-14) (push) Waiting to run
Build and test GAM / build (aarch64, build, 9, darwin64-arm64, macos-15) (push) Waiting to run
Build and test GAM / build (x86_64, build, 1, linux-x86_64, ubuntu-22.04) (push) Waiting to run
Build and test GAM / build (x86_64, build, 2, linux-x86_64, ubuntu-24.04) (push) Waiting to run
Build and test GAM / build (x86_64, build, 5, linux-x86_64, ubuntu-22.04, yes) (push) Waiting to run
Build and test GAM / build (x86_64, build, 7, darwin64-x86_64, macos-13) (push) Waiting to run
Build and test GAM / build (x86_64, test, 11, ubuntu-24.04, 3.10) (push) Waiting to run
Build and test GAM / build (x86_64, test, 12, ubuntu-24.04, 3.11) (push) Waiting to run
Build and test GAM / build (x86_64, test, 13, ubuntu-24.04, 3.12) (push) Waiting to run
Build and test GAM / merge (push) Blocked by required conditions
Build and test GAM / publish (push) Blocked by required conditions
CodeQL / Analyze (python) (push) Waiting to run
Check for Google Root CA Updates / check-apis (push) Waiting to run
This commit is contained in:
@@ -1,3 +1,8 @@
|
|||||||
|
7.05.09
|
||||||
|
|
||||||
|
Fixed bug in `gam calendars <CalendarEntity> print events matchfield attendeesstatus required accepted resource_calendar@resource.calendar.google.com`
|
||||||
|
that caused a trap.
|
||||||
|
|
||||||
7.05.08
|
7.05.08
|
||||||
|
|
||||||
Added error message to `gam report` commands to indicate forbidden access;
|
Added error message to `gam report` commands to indicate forbidden access;
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
|
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
|
||||||
__version__ = '7.05.08'
|
__version__ = '7.05.09'
|
||||||
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
|
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
|
||||||
|
|
||||||
#pylint: disable=wrong-import-position
|
#pylint: disable=wrong-import-position
|
||||||
@@ -909,6 +909,8 @@ def getBoolean(defaultValue=True):
|
|||||||
Cmd.Advance()
|
Cmd.Advance()
|
||||||
return False
|
return False
|
||||||
if defaultValue is not None:
|
if defaultValue is not None:
|
||||||
|
if not Cmd.Current().strip(): # If current argument is empty, skip over it
|
||||||
|
Cmd.Advance()
|
||||||
return defaultValue
|
return defaultValue
|
||||||
invalidChoiceExit(boolean, TRUE_FALSE, False)
|
invalidChoiceExit(boolean, TRUE_FALSE, False)
|
||||||
if defaultValue is not None:
|
if defaultValue is not None:
|
||||||
@@ -1482,6 +1484,8 @@ def getInteger(minVal=None, maxVal=None, default=None):
|
|||||||
return number
|
return number
|
||||||
except ValueError:
|
except ValueError:
|
||||||
if default is not None:
|
if default is not None:
|
||||||
|
if not Cmd.Current().strip(): # If current argument is empty, skip over it
|
||||||
|
Cmd.Advance()
|
||||||
return default
|
return default
|
||||||
invalidArgumentExit(integerLimits(minVal, maxVal))
|
invalidArgumentExit(integerLimits(minVal, maxVal))
|
||||||
elif default is not None:
|
elif default is not None:
|
||||||
@@ -11842,7 +11846,7 @@ def doCreateProject():
|
|||||||
# Try to set policy on project to allow Service Account Key Upload
|
# Try to set policy on project to allow Service Account Key Upload
|
||||||
# orgp = getAPIService(API.ORGPOLICY, httpObj)
|
# orgp = getAPIService(API.ORGPOLICY, httpObj)
|
||||||
# projectParent = f"projects/{projectInfo['projectId']}"
|
# projectParent = f"projects/{projectInfo['projectId']}"
|
||||||
# policyName = f'{projectParent}/policies/iam.disableServiceAccountKeyUpload'
|
# policyName = f'{projectParent}/policies/iam.managed.disableServiceAccountKeyUpload'
|
||||||
# try:
|
# try:
|
||||||
# result = callGAPI(orgp.projects().policies(), 'get',
|
# result = callGAPI(orgp.projects().policies(), 'get',
|
||||||
# throwReasons=[GAPI.NOT_FOUND, GAPI.FAILED_PRECONDITION, GAPI.PERMISSION_DENIED],
|
# throwReasons=[GAPI.NOT_FOUND, GAPI.FAILED_PRECONDITION, GAPI.PERMISSION_DENIED],
|
||||||
@@ -12646,7 +12650,7 @@ def doProcessSvcAcctKeys(mode=None, iam=None, projectId=None, clientEmail=None,
|
|||||||
return False
|
return False
|
||||||
except GAPI.failedPrecondition as e:
|
except GAPI.failedPrecondition as e:
|
||||||
entityActionFailedWarning([Ent.PROJECT, projectId, Ent.SVCACCT, clientEmail], str(e))
|
entityActionFailedWarning([Ent.PROJECT, projectId, Ent.SVCACCT, clientEmail], str(e))
|
||||||
if 'iam.disableServiceAccountKeyUpload' not in str(e):
|
if 'iam.disableServiceAccountKeyUpload' not in str(e) and 'iam.managed.disableServiceAccountKeyUpload' not in str(e):
|
||||||
return False
|
return False
|
||||||
if retry == maxRetries or mode != 'upload':
|
if retry == maxRetries or mode != 'upload':
|
||||||
sys.stdout.write(Msg.ENABLE_SERVICE_ACCOUNT_PRIVATE_KEY_UPLOAD.format(projectId))
|
sys.stdout.write(Msg.ENABLE_SERVICE_ACCOUNT_PRIVATE_KEY_UPLOAD.format(projectId))
|
||||||
@@ -38688,7 +38692,7 @@ def _getEventMatchFields(calendarEventEntity, fieldsList):
|
|||||||
else:
|
else:
|
||||||
fieldsList.append('attendees/email')
|
fieldsList.append('attendees/email')
|
||||||
if match[0][1] == 'status':
|
if match[0][1] == 'status':
|
||||||
fieldsList.extend('attendees/optional', 'attendees/responseStatus')
|
fieldsList.extend(['attendees/optional', 'attendees/responseStatus'])
|
||||||
|
|
||||||
def _eventMatches(event, match):
|
def _eventMatches(event, match):
|
||||||
if match[0][0] != 'attendees':
|
if match[0][0] != 'attendees':
|
||||||
@@ -43027,7 +43031,7 @@ def getUserAttributes(cd, updateCmd, noUid=False):
|
|||||||
if value:
|
if value:
|
||||||
entry[argument] = value
|
entry[argument] = value
|
||||||
else:
|
else:
|
||||||
entry[argument] = getInteger(minVal=0, maxVal=100000)
|
entry[argument] = getInteger(minVal=0, maxVal=100000, default=0)
|
||||||
elif primaryNotPrimary(argument, entry):
|
elif primaryNotPrimary(argument, entry):
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -12,4 +12,4 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
__version__ = "2.156.0"
|
__version__ = "2.164.0"
|
||||||
|
|||||||
Reference in New Issue
Block a user