fix(verify): fix logic around the conditional prepare step

corrects a logic bug that allows prepare steps to build when not in dry run mode
esatterwhite · Mar 25, 2024 · ae8335a · ae8335a
1 parent 202308c
commit ae8335a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/build-config.js b/lib/build-config.js
@@ -58,7 +58,7 @@ async function buildConfig(build_id, config, context) {
   , publish
   , tags: array.toArray(tags)
   , verifycmd
-  , dry_run
+  , dry_run: !!typeCast(dry_run || context.dryRun)
   , args: {
       SRC_DIRECTORY: path.basename(context.cwd)
     , TARGET_PATH: target

diff --git a/lib/verify.js b/lib/verify.js
@@ -48,7 +48,8 @@ async function verify(opts, context) {
     await doLogin({...opts, USERNAME, PASSWORD}, context)
   }
 
-  if (!opts.verifycmd && !opts.dry_run) return true
+  if (!opts.verifycmd) return true
+  if (!opts.dry_run) return true
 
   const img = await prepare(opts, context)
   const output = await img.run(opts.verifycmd)

diff --git a/test/integration/prepare.js b/test/integration/prepare.js
@@ -41,7 +41,6 @@ test('steps::prepare', async (t) => {
     , logger: logger
     }
 
-
     const config = await buildConfig(build_id, {
       dockerRegistry: DOCKER_REGISTRY_HOST
     , dockerProject: 'docker-prepare'
@@ -57,7 +56,7 @@ test('steps::prepare', async (t) => {
       }
     , dockerFile: 'docker/Dockerfile.prepare'
     , dockerContext: 'docker'
-    }, context)
+    }, {...context, dryRun: true})
 
     tt.match(
       await verify(config, context)