Revert "Don't support databricks bundle run --deploy for now"

lennartkats-db · lennartkats-db · commit 669c06468e34 · 2023-07-03T18:00:52.000+02:00
This reverts commit ddcd613.
diff --git a/cmd/bundle/run.go b/cmd/bundle/run.go
@@ -14,6 +14,7 @@ import (
 )
 
 var runOptions run.Options
+var deployFlag bool
 var noWait bool
 
 var runCmd = &cobra.Command{
@@ -25,6 +26,17 @@ var runCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		b := bundle.Get(cmd.Context())
 
+		if deployFlag {
+			err := deploy(cmd, b)
+			if err != nil {
+				return err
+			}
+		} else if computeID != "" {
+			// Running notebooks is not yet implemented, otherwise we could
+			// use --compute with a notebook
+			return fmt.Errorf("not supported: --compute specified without --deploy")
+		}
+
 		err := bundle.Apply(cmd.Context(), b, bundle.Seq(
 			phases.Initialize(),
 			terraform.Interpolate(),
@@ -92,5 +104,8 @@ var runCmd = &cobra.Command{
 func init() {
 	runOptions.Define(runCmd.Flags())
 	rootCmd.AddCommand(runCmd)
+	runCmd.Flags().BoolVar(&deployFlag, "deploy", false, "Call deploy before run.")
+	runCmd.Flags().BoolVar(&forceDeploy, "force", false, "Force acquisition of deployment lock.")
 	runCmd.Flags().BoolVar(&noWait, "no-wait", false, "Don't wait for the run to complete.")
+	runCmd.Flags().StringVar(&computeID, "compute", "", "Override compute in the deployment with the given compute ID.")
 }
