zecfoundation
/
cloud-foundation-fabric
mirror of https://github.com/ZcashFoundation/cloud-foundation-fabric.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Network dashboard - fixing 2 bugs: overriden variable and page token … (#1976) 

* Network dashboard - fixing 2 bugs: overriden variable and page token not handled properly

* changing pageToken in the regexp
This commit is contained in:
Aurélien Legrand 2024-01-15 14:28:17 +01:00 committed by GitHub
parent cec11d2d55
commit eee6aaff2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blueprints/cloud-operations/network-quota-monitoring/src/plugins/core-discover-cai-nodes.py
View File

@ -43,9 +43,9 @@ def _handle_discovery(resources, response, data):
yield Resource('folders', name, {'name': result['displayName']})
elif asset_type == 'Project':
number = result['project'].split('/')[1]
data = {'number': number, 'project_id': name}
yield Resource('projects', name, data)
yield Resource('projects:number', number, data)
data_proj = {'number': number, 'project_id': name}
yield Resource('projects', name, data_proj)
yield Resource('projects:number', number, data_proj)
else:
LOGGER.info(f'unknown resource {name}')
next_url = parse_page_token(data, response.request.url)

8
blueprints/cloud-operations/network-quota-monitoring/src/plugins/utils.py
View File

@ -34,7 +34,7 @@ Accept-Encoding: gzip, deflate
Host: compute.googleapis.com
'''
RE_URL = re.compile(r'nextPageToken=[^&]+&?')
RE_URL = re.compile(r'pageToken=[^&]+&?')
def batched(iterable, n):
@ -65,8 +65,10 @@ def parse_page_token(data, url):
page_token = data.get('nextPageToken')
if page_token:
logging.info(f'page token {page_token}')
if page_token:
return RE_URL.sub(f'pageToken={page_token}&', url)
if 'pageToken' in url:
return RE_URL.sub(f'pageToken={page_token}', url)
else:
return f'{url}&pageToken={page_token}'
def poor_man_mp_request(urls, boundary='1234567890'):