From 9ee3bf3345b006a745b2ee28fee3613819011796 Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Sat, 26 Jul 2025 17:39:44 -0700 Subject: Adds session-level storage for bw cli --- worker/scripts/ansible_playbook.ts | 4 ++-- worker/scripts/build_docker_image.ts | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'worker/scripts') diff --git a/worker/scripts/ansible_playbook.ts b/worker/scripts/ansible_playbook.ts index 6eb4d47..20f85d8 100755 --- a/worker/scripts/ansible_playbook.ts +++ b/worker/scripts/ansible_playbook.ts @@ -36,12 +36,12 @@ await LogMetricTraceable.ofLogTraceable(_logJob) tEitherJob.get().flatMapAsync((job) => eitherVault.flatMapAsync(async (vault) => { const eitherKey = await vault.unlock(tEitherJob); + tEitherJob.trace.trace('unlocked vault :3'); return eitherKey.mapRight((key) => ({ job, key, vault })); }), ), ) .map(async (tEitherJobVault) => { - tEitherJobVault.trace.trace('getting ansible secwets uwu~'); const eitherJobVault = await tEitherJobVault.get(); const eitherSshKey = await eitherJobVault.flatMapAsync(({ key, vault }) => @@ -49,7 +49,7 @@ await LogMetricTraceable.ofLogTraceable(_logJob) ); const eitherSshKeyFile = await eitherSshKey.mapRight(({ notes }) => notes).flatMapAsync(saveToTempFile); const eitherAnsibleSecrets = await eitherJobVault.flatMapAsync(({ key, vault }) => - vault.fetchSecret(tEitherJobVault, key, 'ansible_playbooks'), + vault.fetchSecret(tEitherJobVault, key, 'ansible_secrets'), ); const eitherAnsibleSecretsFile = await eitherAnsibleSecrets .mapRight(({ notes }) => notes) diff --git a/worker/scripts/build_docker_image.ts b/worker/scripts/build_docker_image.ts index 6b4765c..759dfc1 100755 --- a/worker/scripts/build_docker_image.ts +++ b/worker/scripts/build_docker_image.ts @@ -58,9 +58,10 @@ await LogMetricTraceable.ofLogTraceable(_logJob) .map(async (tEitherJobVault) => { tEitherJobVault.trace.trace('logging into the wegistwy uwu~'); const eitherJobVault = await tEitherJobVault.get(); - const eitherDockerRegistryLoginItem = await eitherJobVault.flatMapAsync( - ({ job, key, vault }) => vault.fetchSecret(tEitherJobVault, key, job.arguments.registry), - // .finally(() => vault.lock(tEitherJobVault, key)), + const eitherDockerRegistryLoginItem = await eitherJobVault.flatMapAsync(({ job, key, vault }) => + vault + .fetchSecret(tEitherJobVault, key, job.arguments.registry) + .finally(() => vault.lock(tEitherJobVault, key)), ); return eitherDockerRegistryLoginItem.flatMapAsync(({ login }) => eitherJobVault.flatMapAsync(async ({ job }) => { @@ -83,7 +84,7 @@ await LogMetricTraceable.ofLogTraceable(_logJob) const eitherBuiltImage = await eitherWithAuthdRegistryBuildJob.flatMapAsync(({ arguments: args }) => tEitherWithAuthdRegistryBuildJob .move(getBuildCommand(args)) - .peek(t => t.trace.trace('finally building the image~ (◕ᴗ◕✿)')) + .peek((t) => t.trace.trace('finally building the image~ (◕ᴗ◕✿)')) .map((tBuildCmd) => getStdout(tBuildCmd, { env: {}, -- cgit v1.2.3-70-g09d2