Skip to content

Commit 116a4ee

Browse files
committed
secrets need to be loaded synchronously
1 parent b90499b commit 116a4ee

4 files changed

Lines changed: 16 additions & 15 deletions

File tree

automation/database_queries.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,20 @@ def get_database_parameters(
7373
else:
7474
# Load Prefect secrets
7575
print("Loading database config from Prefect secrets")
76-
db_name = Secret.load("database-name").get()
77-
db_user = Secret.load("database-user").get()
78-
db_pass = Secret.load("database-password").get()
79-
db_host = Secret.load("database-host").get()
80-
db_port = Secret.load("database-port").get()
76+
db_name = Secret.load("database-name", _sync=True).get()
77+
db_user = Secret.load("database-user", _sync=True).get()
78+
db_pass = Secret.load("database-password", _sync=True).get()
79+
db_host = Secret.load("database-host", _sync=True).get()
80+
db_port = Secret.load("database-port", _sync=True).get()
8181

8282
if not all([db_name, db_user, db_pass, db_host, db_port]):
8383
# fall back on Prefect secrets if any of the parameters are missing
8484
print("Some database parameters are missing from the config file. Loading from Prefect secrets.")
85-
db_name = db_name or Secret.load("database-name").get()
86-
db_user = db_user or Secret.load("database-user").get()
87-
db_pass = db_pass or Secret.load("database-password").get()
88-
db_host = db_host or Secret.load("database-host").get()
89-
db_port = db_port or Secret.load("database-port").get()
85+
db_name = db_name or Secret.load("database-name", _sync=True).get()
86+
db_user = db_user or Secret.load("database-user", _sync=True).get()
87+
db_pass = db_pass or Secret.load("database-password", _sync=True).get()
88+
db_host = db_host or Secret.load("database-host", _sync=True).get()
89+
db_port = db_port or Secret.load("database-port", _sync=True).get()
9090

9191
return {
9292
"dbname": db_name,

automation/prefect/refresh_cadc_proxy_pem.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
def main():
1414
# Load the secret from prefect
1515
print('Loading cadc-proxy-pem secret..')
16-
secret_block = Secret.load("cadc-proxy-pem")
16+
secret_block = Secret.load("cadc-proxy-pem",_sync=True)
1717
pem_str = secret_block.get()
1818
if pem_str:
1919
#rewrite the pem file

possum_pipeline_control/check_status_and_launch_3Dpipeline_v2.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,5 +512,6 @@ def run_prefect_db_backup():
512512
)
513513
args = parser.parse_args()
514514

515-
asyncio.run(launch_band1_3Dpipeline(args.database_config_path))
515+
from prefect.utilities.asyncutils import run_coro_as_sync
516+
run_coro_as_sync(launch_band1_3Dpipeline(args.database_config_path))
516517

possum_pipeline_control/util.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def stage_cadc_certificate(
6666
src = Path(os.path.expanduser(source_cert))
6767
if not src.exists():
6868
# Try the secret from prefect
69-
secret_block = Secret.load("cadc-proxy-pem")
69+
secret_block = Secret.load("cadc-proxy-pem", _sync=True)
7070
pem_str = secret_block.get()
7171
if pem_str:
7272
write_cadcproxy_pem(pem_str)
@@ -140,7 +140,7 @@ def initiate_possum_status_sheet_and_token(database_config_path=None):
140140
# load secrets into environment variables
141141
Google_API_token = write_possum_token_file()
142142
os.environ["POSSUM_STATUS_TOKEN"] = Google_API_token
143-
possum_status_sheet = Secret.load("possum-status-sheet").get()
143+
possum_status_sheet = Secret.load("possum-status-sheet", _sync=True).get()
144144
os.environ["POSSUM_STATUS_SHEET"] = possum_status_sheet
145145

146146
return Google_API_token
@@ -172,7 +172,7 @@ def write_to_file(dir, file_path, secret_name):
172172
# Write the content to the file
173173
try:
174174
with open(file_path, "w") as f:
175-
secret_block = Secret.load(secret_name)
175+
secret_block = Secret.load(secret_name, _sync=True)
176176
secret_str = secret_block.get()
177177
if secret_str:
178178
if isinstance(secret_str, dict):

0 commit comments

Comments
 (0)