fix quota records operation bug

kerrychu · Jan 23, 2024 · 1252e17 · 1252e17
1 parent 562c7f4
commit 1252e17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/quota_limit.py b/quota_limit.py
@@ -21,9 +21,7 @@ def monitor():
     for project_id in PROJECT_IDs:
         raw_quota = get_fileset_quota(project_id)
         quota_record = stdout_to_quota_records(raw_quota)
-        file_set = {"FileSet": project_id}
-        data = {**file_set, **quota_record}
-        send_slack_message(data=data, webhook=SLACK_WEBHOOK)
+        send_slack_message(data=quota_record, webhook=SLACK_WEBHOOK)
 
 
 if __name__ == "__main__":

diff --git a/utils/subprocess_operations.py b/utils/subprocess_operations.py
@@ -55,10 +55,10 @@ def stdout_to_job_records(s: str) -> JOB_RECORDS:
 def stdout_to_quota_records(s: str) -> QUOTA_RECORD:
     s = s.strip()
     s_list = s.split()
-    headers = ["Used Storage (GB)", "Storage Limit (GB)", "Current File Number", "File Number Limit"]
+    headers = ["FileSet", "Used Storage (GB)", "Storage Limit (GB)", "Current File Number", "File Number Limit"]
     quota_record = {}
     assert len(s_list) == len(
         headers), f"unexpected error: quota size different from headers size. quota: {s_list}, headers: {headers}"
-    for header, quota in zip_longest(headers, s_list[1:]):
+    for header, quota in zip(headers, s_list):
         quota_record[header] = quota
     return quota_record