..

Author: nfx

cmd/labs/project/installer.go

@@ -35,11 +35,21 @@ type hook struct {
 	WarehouseTypes           whTypes `yaml:"warehouse_types,omitempty"`
 }
 
+func (h *hook) RequireRunningCluster() bool {
+	if h.Entrypoint == nil {
+		return false
+	}
+	return h.Entrypoint.RequireRunningCluster
+}
+
 func (h *hook) HasPython() bool {
 	return strings.HasSuffix(h.Script, ".py")
 }
 
 func (h *hook) runHook(cmd *cobra.Command) error {
+	if h.Script == "" {
+		return nil
+	}
 	ctx := cmd.Context()
 	envs, err := h.Prepare(cmd)
 	if err != nil {

cmd/labs/project/installer_test.go

@@ -73,6 +73,7 @@ func zipballFromFolder(src string) ([]byte, error) {
 func copyTestdata(t *testing.T, name string) string {
 	// TODO: refactor fs.cp command into a reusable util
 	tempDir := t.TempDir()
+	name = strings.ReplaceAll(name, "/", string(os.PathSeparator))
 	err := filepath.WalkDir(name, func(path string, d fs.DirEntry, err error) error {
 		require.NoError(t, err)
 		dst := strings.TrimPrefix(path, name)

cmd/labs/project/login.go

@@ -74,6 +74,7 @@ func (lc *loginConfig) askCluster(ctx context.Context, w *databricks.WorkspaceCl
 	if err != nil {
 		return fmt.Errorf("select: %w", err)
 	}
+	w.Config.ClusterID = clusterID
 	lc.ClusterID = clusterID
 	return
 }

cmd/labs/project/project.go

@@ -53,7 +53,7 @@ func readFromBytes(ctx context.Context, labsYmlRaw []byte) (*Project, error) {
 }
 
 type Project struct {
-	SpecVersion int `yaml:"version"`
+	SpecVersion int `yaml:"$version"`
 
 	Name        string   `yaml:"name"`
 	Description string   `yaml:"description"`
@@ -92,7 +92,7 @@ func (p *Project) metaEntrypoint(ctx context.Context) *Entrypoint {
 }
 
 func (p *Project) requireRunningCluster() bool {
-	if p.Installer != nil && p.Installer.RequireRunningCluster {
+	if p.Installer != nil && p.Installer.RequireRunningCluster() {
 		return true
 	}
 	for _, v := range p.Commands {

cmd/labs/project/schema.json

@@ -0,0 +1,126 @@
+{
+    "id": "https://raw.githubusercontent.com/databricks/cli/feat/labs/cmd/labs/project/schema.json#",
+    "$schema": "http://json-schema.org/draft-04/schema",
+    "definitions": {
+        "entrypoint": {
+            "type": "object",
+            "properties": {
+                "require_running_cluster": {
+                    "type": "boolean",
+                    "default": false
+                },
+                "is_unauthenticated": {
+                    "type": "boolean",
+                    "default": false
+                },
+                "is_account_level": {
+                    "type": "boolean",
+                    "default": false
+                },
+                "is_bundle_aware": {
+                    "type": "boolean",
+                    "default": false
+                }
+            }
+        },
+        "hook": {
+            "type": "object",
+            "$ref": "#/definitions/entrypoint",
+            "unevaluatedProperties": true,
+            "properties": {
+                "script": {
+                    "type": "string",
+                    "pattern": "^[A-Za-z0-9_-/\\.]+$"
+                },
+                "min_runtime_version": {
+                    "type": "string",
+                    "pattern": "^[0-9]+.[0-9]+$"
+                },
+                "require_databricks_connect": {
+                    "type": "boolean",
+                    "default": false
+                },
+                "warehouse_types": {
+                    "enum": [ "PRO", "CLASSIC", "TYPE_UNSPECIFIED" ]
+                }
+            }
+        },
+        "alphanum": {
+            "type": "string",
+            "pattern": "^[a-z0-9-]$"
+        },
+        "command": {
+            "type": "object",
+            "$ref": "#/definitions/entrypoint",
+            "unevaluatedProperties": true,
+            "required": ["name", "description"],
+            "properties": {
+                "name": {
+                    "$ref": "#/definitions/alphanum"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "table_template": {
+                    "type": "string"
+                },
+                "flags": {
+                    "$ref": "#/definitions/flag"
+                }
+            }
+        },
+        "flag": {
+            "type": "object",
+            "required": ["name", "description"],
+            "properties": {
+                "name": {
+                    "$ref": "#/definitions/alphanum"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "default": {}
+            }
+        }
+    },
+    "type": "object",
+    "additionalProperties": false,
+    "required": ["name", "description", "entrypoint"],
+    "properties": {
+        "$version": {
+            "type": "integer",
+            "default": 1
+        },
+        "name": {
+            "$ref": "#/definitions/alphanum",
+            "description": "Name of the project"
+        },
+        "description": {
+            "type": "string",
+            "description": "Short description of the project"
+        },
+        "entrypoint": {
+            "type": "string",
+            "description": "Script that routes subcommands"
+        },
+        "min_python": {
+            "type": "string",
+            "pattern": "^3.[0-9]+$",
+            "description": "Minimal Python version required"
+        },
+        "install": {
+            "$ref": "#/definitions/hook",
+            "description": "Installation configuration"
+        },
+        "uninstall": {
+            "$ref": "#/definitions/hook"
+        },
+        "commands": {
+            "type": "array",
+            "description": "Exposed commands",
+            "items": {
+                "$ref": "#/definitions/command"
+            }
+        }
+    }
+}