From 4ec49a9b91fc86a505861d81eecf368258124527 Mon Sep 17 00:00:00 2001 From: chatton Date: Thu, 10 Jun 2021 13:29:09 +0100 Subject: [PATCH 1/2] Include MongoDBCommunity resource spec in diagnostics --- scripts/dev/dump_diagnostic.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/dev/dump_diagnostic.py b/scripts/dev/dump_diagnostic.py index 1f9cc46e4..16780ec9f 100644 --- a/scripts/dev/dump_diagnostic.py +++ b/scripts/dev/dump_diagnostic.py @@ -41,10 +41,17 @@ def dump_persistent_volume(diagnostic_file: TextIO) -> None: def dump_stateful_sets_namespaced(diagnostic_file: TextIO, namespace: str) -> None: - sst = k8s_request_data.get_stateful_sets_namespaced(namespace) - if sst is not None: + sts = k8s_request_data.get_stateful_sets_namespaced(namespace) + if sts is not None: diagnostic_file.write(header("Stateful Sets")) - diagnostic_file.write(yaml.dump(clean_nones(sst))) + diagnostic_file.write(yaml.dump(clean_nones(sts))) + + +def dump_mongodbcommunity_namespaced(diagnostic_file: TextIO, namespace: str) -> None: + mdb = k8s_request_data.get_all_mongodb_namespaced(namespace) + if mdb is not None: + diagnostic_file.write(header("MongoDBCommunity")) + diagnostic_file.write(yaml.dump(clean_nones(mdb))) def dump_pod_log_namespaced(namespace: str, name: str, containers: list) -> None: @@ -115,6 +122,7 @@ def dump_all(namespace: str) -> None: with open( "logs/e2e/diagnostics.txt", mode="w", encoding="utf-8" ) as diagnostic_file: + dump_mongodbcommunity_namespaced(diagnostic_file, namespace) dump_persistent_volume(diagnostic_file) dump_stateful_sets_namespaced(diagnostic_file, namespace) dump_pods_and_logs_namespaced(diagnostic_file, namespace) From 75e980df24cdfef0134d1c2c5ac22a9185561fb2 Mon Sep 17 00:00:00 2001 From: chatton Date: Thu, 10 Jun 2021 13:32:33 +0100 Subject: [PATCH 2/2] added Union to type hinting --- scripts/dev/dump_diagnostic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/dev/dump_diagnostic.py b/scripts/dev/dump_diagnostic.py index 16780ec9f..3abb5617a 100644 --- a/scripts/dev/dump_diagnostic.py +++ b/scripts/dev/dump_diagnostic.py @@ -1,13 +1,13 @@ import os import shutil import yaml -from typing import Dict, TextIO, List +from typing import Dict, TextIO, List, Union from base64 import b64decode import json import k8s_request_data -def clean_nones(value: Dict) -> Dict: +def clean_nones(value: Dict) -> Union[List, Dict]: """ Recursively remove all None values from dictionaries and lists, and returns the result as a new dictionary or list.