From e78e826ce737d34ee71e3ec6b9a6c01a1ebeab84 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Wed, 15 Apr 2026 14:43:18 +0200 Subject: [PATCH] Simplify cluster-id flag handling in cmd/bundle Merge two separate if-blocks for compute-id and cluster-id flags into one since both bind to the same variable. Remove unnecessary outer conditional in plan.go that guarded InitFunc (deploy.go already sets it unconditionally). Task: 001.md Co-authored-by: Isaac --- cmd/bundle/deploy.go | 6 +----- cmd/bundle/plan.go | 15 ++++----------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/cmd/bundle/deploy.go b/cmd/bundle/deploy.go index 31ffe7090d..0a7df9d927 100644 --- a/cmd/bundle/deploy.go +++ b/cmd/bundle/deploy.go @@ -50,11 +50,7 @@ See https://docs.databricks.com/en/dev-tools/bundles/index.html for more informa b.Config.Bundle.Deployment.Lock.Force = forceLock b.AutoApprove = autoApprove - if cmd.Flag("compute-id").Changed { - b.Config.Bundle.ClusterId = clusterId - } - - if cmd.Flag("cluster-id").Changed { + if cmd.Flag("compute-id").Changed || cmd.Flag("cluster-id").Changed { b.Config.Bundle.ClusterId = clusterId } if cmd.Flag("fail-on-active-runs").Changed { diff --git a/cmd/bundle/plan.go b/cmd/bundle/plan.go index e3dd63929e..10d700e717 100644 --- a/cmd/bundle/plan.go +++ b/cmd/bundle/plan.go @@ -41,18 +41,11 @@ It is useful for previewing changes before running 'bundle deploy'.`, PreDeployChecks: true, } - // Only add InitFunc if we need to set force or cluster ID - if force || cmd.Flag("compute-id").Changed || cmd.Flag("cluster-id").Changed { - opts.InitFunc = func(b *bundle.Bundle) { - b.Config.Bundle.Force = force + opts.InitFunc = func(b *bundle.Bundle) { + b.Config.Bundle.Force = force - if cmd.Flag("compute-id").Changed { - b.Config.Bundle.ClusterId = clusterId - } - - if cmd.Flag("cluster-id").Changed { - b.Config.Bundle.ClusterId = clusterId - } + if cmd.Flag("compute-id").Changed || cmd.Flag("cluster-id").Changed { + b.Config.Bundle.ClusterId = clusterId } }