Merge branch 'main' into fix/pass-system-team-uri

Author: andrewnester

NEXT_CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Notable Changes
 
 ### CLI
+* Skip non-exportable objects (e.g., `MLFLOW_EXPERIMENT`) during `workspace export-dir` instead of failing ([#4081](https://github.com/databricks/cli/issues/4081))
 
 ### Bundles
 

acceptance/cmd/workspace/export-dir-file-size-limit/output.txt

@@ -1,9 +1,5 @@
 
 >>> [CLI] workspace export-dir /test-dir [TEST_TMP_DIR]/export
 Exporting files from /test-dir
-Warning: /test-dir/file.py (skipped; file too large)
-
-The following files were skipped because they exceed the maximum size limit:
-  - /test-dir/file.py (skipped; file too large)
-
+/test-dir/file.py (skipped; file too large)
 Export complete

acceptance/cmd/workspace/export-dir-skip-experiments/out.test.toml

@@ -0,0 +1,5 @@
+
+>>> [CLI] workspace export-dir /test-dir [TEST_TMP_DIR]/export
+Exporting files from /test-dir
+/test-dir/experiment (skipped; cannot export MLFLOW_EXPERIMENT)
+Export complete

acceptance/cmd/workspace/export-dir-skip-experiments/output.txt

@@ -0,0 +1,2 @@
+mkdir -p "$TEST_TMP_DIR/export"
+trace $CLI workspace export-dir /test-dir "$TEST_TMP_DIR/export"

acceptance/cmd/workspace/export-dir-skip-experiments/script

@@ -0,0 +1,29 @@
+Local = true
+Cloud = false
+
+[Env]
+MSYS_NO_PATHCONV = "1"
+
+[[Server]]
+Pattern = "GET /api/2.0/workspace/list"
+Response.Body = '''
+{
+  "objects": [
+    {
+      "path": "/test-dir/experiment",
+      "object_type": "MLFLOW_EXPERIMENT",
+      "object_id": 125
+    }
+  ]
+}
+'''
+
+[[Server]]
+Pattern = "GET /api/2.0/workspace/get-status"
+Response.Body = '''
+{
+  "path": "/test-dir",
+  "object_type": "DIRECTORY",
+  "object_id": 123
+}
+'''

acceptance/cmd/workspace/export-dir-skip-experiments/test.toml

@@ -3,11 +3,13 @@ package dresources
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/databricks/cli/bundle/config/resources"
 	"github.com/databricks/cli/bundle/deployplan"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/databricks-sdk-go"
+	"github.com/databricks/databricks-sdk-go/apierr"
 	"github.com/databricks/databricks-sdk-go/retries"
 	"github.com/databricks/databricks-sdk-go/service/apps"
 )
@@ -61,7 +63,10 @@ func (r *ResourceApp) DoUpdate(ctx context.Context, id string, config *apps.App,
 
 func (r *ResourceApp) DoDelete(ctx context.Context, id string) error {
 	_, err := r.client.Apps.DeleteByName(ctx, id)
-	return err
+	if err != nil {
+		return err
+	}
+	return r.waitForDeletion(ctx, id)
 }
 
 func (*ResourceApp) FieldTriggers(_ bool) map[string]deployplan.ActionType {
@@ -74,6 +79,34 @@ func (r *ResourceApp) WaitAfterCreate(ctx context.Context, config *apps.App) (*a
 	return r.waitForApp(ctx, r.client, config.Name)
 }
 
+func (r *ResourceApp) waitForDeletion(ctx context.Context, name string) error {
+	retrier := retries.New[struct{}](retries.WithTimeout(10*time.Minute), retries.WithRetryFunc(shouldRetry))
+	_, err := retrier.Run(ctx, func(ctx context.Context) (*struct{}, error) {
+		app, err := r.client.Apps.GetByName(ctx, name)
+		if err != nil {
+			if apierr.IsMissing(err) {
+				return nil, nil
+			}
+			return nil, retries.Halt(err)
+		}
+
+		if app.ComputeStatus == nil {
+			return nil, retries.Continues("waiting for compute status")
+		}
+
+		switch app.ComputeStatus.State {
+		case apps.ComputeStateDeleting:
+			return nil, retries.Continues("app is deleting")
+		case apps.ComputeStateActive, apps.ComputeStateStopped, apps.ComputeStateError:
+			err := fmt.Errorf("app %s was not deleted, current state: %s", name, app.ComputeStatus.State)
+			return nil, retries.Halt(err)
+		default:
+			return nil, retries.Continues(fmt.Sprintf("app is in %s state", app.ComputeStatus.State))
+		}
+	})
+	return err
+}
+
 // waitForApp waits for the app to reach the target state. The target state is either ACTIVE or STOPPED.
 // Apps with no_compute set to true will reach the STOPPED state, otherwise they will reach the ACTIVE state.
 // We can't use the default waiter from SDK because it only waits on ACTIVE state but we need also STOPPED state.

bundle/direct/dresources/app.go

@@ -3,6 +3,7 @@ package workspace
 import (
 	"context"
 	"errors"
+	"fmt"
 	"io"
 	"io/fs"
 	"net/http"
@@ -24,7 +25,6 @@ type exportDirOptions struct {
 	sourceDir string
 	targetDir string
 	overwrite bool
-	warnings  []string
 }
 
 // isFileSizeError checks if the error is due to file size limits.
@@ -51,6 +51,26 @@ func isFileSizeError(err error) bool {
 	return false
 }
 
+// Object types that cannot be exported via the workspace export API.
+// These will be skipped with a warning during export-dir.
+var nonExportableTypes = []workspace.ObjectType{
+	workspace.ObjectTypeLibrary,
+	workspace.ObjectTypeDashboard,
+	workspace.ObjectTypeRepo,
+	// MLFLOW_EXPERIMENT is not defined as a constant in the SDK
+	workspace.ObjectType("MLFLOW_EXPERIMENT"),
+}
+
+// isNonExportable checks if an object type cannot be exported.
+func isNonExportable(objectType workspace.ObjectType) bool {
+	for _, t := range nonExportableTypes {
+		if objectType == t {
+			return true
+		}
+	}
+	return false
+}
+
 // The callback function exports the file specified at relPath. This function is
 // meant to be used in conjunction with fs.WalkDir
 func (opts *exportDirOptions) callback(ctx context.Context, workspaceFiler filer.Filer) func(string, fs.DirEntry, error) error {
@@ -77,6 +97,13 @@ func (opts *exportDirOptions) callback(ctx context.Context, workspaceFiler filer
 			return err
 		}
 		objectInfo := info.Sys().(workspace.ObjectInfo)
+
+		// Skip non-exportable objects (e.g., MLFLOW_EXPERIMENT, LIBRARY)
+		if isNonExportable(objectInfo.ObjectType) {
+			cmdio.LogString(ctx, fmt.Sprintf("%s (skipped; cannot export %s)", sourcePath, objectInfo.ObjectType))
+			return nil
+		}
+
 		targetPath += notebook.GetExtensionByLanguage(&objectInfo)
 
 		// Skip file if a file already exists in path.
@@ -92,9 +119,7 @@ func (opts *exportDirOptions) callback(ctx context.Context, workspaceFiler filer
 		if err != nil {
 			// Check if this is a file size limit error
 			if isFileSizeError(err) {
-				warning := sourcePath + " (skipped; file too large)"
-				cmdio.LogString(ctx, "Warning: "+warning)
-				opts.warnings = append(opts.warnings, warning)
+				cmdio.LogString(ctx, sourcePath+" (skipped; file too large)")
 				return nil
 			}
 			return err
@@ -140,7 +165,6 @@ func newExportDir() *cobra.Command {
 		w := cmdctx.WorkspaceClient(ctx)
 		opts.sourceDir = args[0]
 		opts.targetDir = args[1]
-		opts.warnings = []string{}
 
 		// Initialize a filer and a file system on the source directory
 		workspaceFiler, err := filer.NewWorkspaceFilesClient(w, opts.sourceDir)
@@ -159,16 +183,6 @@ func newExportDir() *cobra.Command {
 			return err
 		}
 
-		// Print all warnings at the end if any were collected
-		if len(opts.warnings) > 0 {
-			cmdio.LogString(ctx, "")
-			cmdio.LogString(ctx, "The following files were skipped because they exceed the maximum size limit:")
-			for _, warning := range opts.warnings {
-				cmdio.LogString(ctx, "  - "+warning)
-			}
-			cmdio.LogString(ctx, "")
-		}
-
 		return cmdio.RenderWithTemplate(ctx, newExportCompletedEvent(opts.targetDir), "", "Export complete\n")
 	}
 

cmd/workspace/workspace/export_dir.go

@@ -38,7 +38,7 @@ export const querySchemas = {
 
 ```typescript
 // client/src/App.tsx
-import { BarChart } from '@databricks/app-kit-ui/react';
+import { BarChart } from '@databricks/appkit-ui/react';
 
 <BarChart queryKey="my_data" parameters={{}} />
 ```
@@ -73,7 +73,7 @@ See the databricks experimental apps-mcp tools validate instead of running these
 **IMPORTANT**: Read the relevant docs below before implementing features. They contain critical information about common pitfalls (e.g., SQL numeric type handling, schema definitions, Radix UI constraints).
 
 - [SQL Queries](docs/sql-queries.md) - query files, schemas, type handling, parameterization
-- [App Kit SDK](docs/app-kit-sdk.md) - TypeScript imports, server setup, useAnalyticsQuery hook
+- [App Kit SDK](docs/appkit-sdk.md) - TypeScript imports, server setup, useAnalyticsQuery hook
 - [Frontend](docs/frontend.md) - visualization components, styling, layout, Radix constraints
 - [tRPC](docs/trpc.md) - custom endpoints for non-SQL operations (mutations, Databricks APIs)
 - [Testing](docs/testing.md) - vitest unit tests, Playwright smoke/E2E tests

experimental/apps-mcp/templates/appkit/template/{{.project_name}}/CLAUDE.md

@@ -1,10 +1,22 @@
-import { useAnalyticsQuery, AreaChart, LineChart, RadarChart } from '@databricks/app-kit-ui/react';
-import { sql } from "@databricks/app-kit-ui/js";
+import {
+  useAnalyticsQuery,
+  AreaChart,
+  LineChart,
+  RadarChart,
+  Card,
+  CardContent,
+  CardHeader,
+  CardTitle,
+  Skeleton,
+  Label,
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@databricks/appkit-ui/react';
+import { sql } from "@databricks/appkit-ui/js";
 import { Line, XAxis, YAxis, CartesianGrid, Tooltip } from 'recharts';
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
-import { Skeleton } from '@/components/ui/skeleton';
-import { Label } from '@/components/ui/label';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
 import { trpc } from './lib/trpc';
 import { useState, useEffect } from 'react';
 
@@ -98,8 +110,8 @@ function App() {
             {health && (
               <div className="space-y-2">
                 <div className="flex items-center gap-2">
-                  <div className="w-2 h-2 rounded-full bg-[hsl(var(--success))] animate-pulse"></div>
-                  <div className="text-lg font-semibold text-[hsl(var(--success))]">{health.status.toUpperCase()}</div>
+                  <div className="w-2 h-2 rounded-full bg-success animate-pulse"></div>
+                  <div className="text-lg font-semibold text-success">{health.status.toUpperCase()}</div>
                 </div>
                 <div className="text-sm text-muted-foreground">
                   Last checked: {new Date(health.timestamp).toLocaleString()}