mirror of
https://github.com/GAM-team/GAM.git
synced 2026-07-03 20:31:35 +00:00
use search endpoint when cigroup query is specified
This commit is contained in:
@@ -217,6 +217,7 @@ def print_():
|
|||||||
gapi_directory_customer.setTrueCustomerId()
|
gapi_directory_customer.setTrueCustomerId()
|
||||||
parent = f'customers/{GC_Values[GC_CUSTOMER_ID]}'
|
parent = f'customers/{GC_Values[GC_CUSTOMER_ID]}'
|
||||||
usemember = None
|
usemember = None
|
||||||
|
query = None
|
||||||
memberDelimiter = '\n'
|
memberDelimiter = '\n'
|
||||||
todrive = False
|
todrive = False
|
||||||
titles = []
|
titles = []
|
||||||
@@ -235,6 +236,9 @@ def print_():
|
|||||||
elif myarg == 'delimiter':
|
elif myarg == 'delimiter':
|
||||||
memberDelimiter = sys.argv[i + 1]
|
memberDelimiter = sys.argv[i + 1]
|
||||||
i += 2
|
i += 2
|
||||||
|
elif myarg == 'query':
|
||||||
|
query = sys.argv[i + 1]
|
||||||
|
i += 2
|
||||||
elif myarg == 'sortheaders':
|
elif myarg == 'sortheaders':
|
||||||
sortHeaders = True
|
sortHeaders = True
|
||||||
i += 1
|
i += 1
|
||||||
@@ -314,14 +318,20 @@ def print_():
|
|||||||
if entity['relationType'] == 'DIRECT':
|
if entity['relationType'] == 'DIRECT':
|
||||||
entityList.append(gapi.call(ci.groups(), 'get', name=entity['group']))
|
entityList.append(gapi.call(ci.groups(), 'get', name=entity['group']))
|
||||||
else:
|
else:
|
||||||
|
if query:
|
||||||
|
method = 'search'
|
||||||
|
kwargs = {'query': query}
|
||||||
|
else:
|
||||||
|
method = 'list'
|
||||||
|
kwargs = {'parent': parent}
|
||||||
entityList = gapi.get_all_pages(ci.groups(),
|
entityList = gapi.get_all_pages(ci.groups(),
|
||||||
'list',
|
method,
|
||||||
'groups',
|
'groups',
|
||||||
page_message=page_message,
|
page_message=page_message,
|
||||||
message_attribute=['groupKey', 'id'],
|
message_attribute=['groupKey', 'id'],
|
||||||
parent=parent,
|
|
||||||
view='FULL',
|
view='FULL',
|
||||||
pageSize=500)
|
pageSize=500,
|
||||||
|
**kwargs)
|
||||||
i = 0
|
i = 0
|
||||||
count = len(entityList)
|
count = len(entityList)
|
||||||
for groupEntity in entityList:
|
for groupEntity in entityList:
|
||||||
|
|||||||
Reference in New Issue
Block a user