From b52b8b1416b8884e933b3caacbdb29ae49917fbb Mon Sep 17 00:00:00 2001 From: Yuto Nishida Date: Fri, 29 Aug 2025 22:25:40 -0700 Subject: [PATCH] Jupiter generates value in export --- jupiter/__main__.py | 3 +-- jupiter/app/src/share.py | 8 ++------ jupiter/generated-nixie.json | 4 ---- jupiter/generated-serverref.json | 5 ----- 4 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 jupiter/generated-nixie.json delete mode 100644 jupiter/generated-serverref.json diff --git a/jupiter/__main__.py b/jupiter/__main__.py index 9f78f85..cfcf1e0 100644 --- a/jupiter/__main__.py +++ b/jupiter/__main__.py @@ -98,8 +98,7 @@ def write_dict_to_json_at(data, file_path): def on_generated_data_complete(data): logging.info("Data finished generating") logging.debug(f"Data: {data}") - write_dict_to_json_at(data['nixie'], share.generated_nixie_path) - write_dict_to_json_at(data['serverref'], share.generated_serverref_path) + write_dict_to_json_at(data, share.generated_json_path) # The lambda will run once the value in `generated_data` (an async variable) is available generated_data.apply(on_generated_data_complete) diff --git a/jupiter/app/src/share.py b/jupiter/app/src/share.py index 24d5c4d..b932ae8 100644 --- a/jupiter/app/src/share.py +++ b/jupiter/app/src/share.py @@ -33,9 +33,5 @@ def get_cwd(): raise Exception(f"Pulumi was called when CWD was an unexpected value. Update the list in share.py as appropriate.") return pathlib.Path(os.getcwd()) -# Deprecate generated_json_path -#generated_json_path = get_cwd().joinpath('generated.json') -generated_nixie_path = get_cwd().joinpath('generated-nixie.json') -generated_serverref_path = get_cwd().joinpath('generated-serverref.json') -octodns_config_template_path = get_cwd().joinpath('octodns-config-template') -octodns_config_build_path = get_cwd().joinpath('octodns-config-build') \ No newline at end of file +# We assume that CWD is in everything/jupiter +generated_json_path = get_cwd().joinpath('..', 'exports', 'jupiter', 'generated.json') \ No newline at end of file diff --git a/jupiter/generated-nixie.json b/jupiter/generated-nixie.json deleted file mode 100644 index d83c39f..0000000 --- a/jupiter/generated-nixie.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "nixie", - "ipAddress": "24.199.97.98" -} \ No newline at end of file diff --git a/jupiter/generated-serverref.json b/jupiter/generated-serverref.json deleted file mode 100644 index 81b4a34..0000000 --- a/jupiter/generated-serverref.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "serverref", - "ipAddress": "143.198.229.127", - "nix-store-volume": "serverref-nix-store-e3d26ed" -} \ No newline at end of file -- 2.51.2