diff --git a/.nextchanges/air/container-env-preflight.md b/.nextchanges/air/container-env-preflight.md new file mode 100644 index 00000000000..8ba5ca890a3 --- /dev/null +++ b/.nextchanges/air/container-env-preflight.md @@ -0,0 +1 @@ +* Validate container environment variable names during `air run` preflight checks. ([#7614](https://github.com/databricks/cli/pull/7614)) diff --git a/cmd/air/runsubmit.go b/cmd/air/runsubmit.go index df79fc3a9ca..231977b40b5 100644 --- a/cmd/air/runsubmit.go +++ b/cmd/air/runsubmit.go @@ -134,6 +134,7 @@ type submittedContainer struct { CommandPath string Ranks []int UnityCatalogImagePath string + EnvironmentVariables map[string]string } func submitRun(ctx context.Context, w *databricks.WorkspaceClient, payload jobs.SubmitRun, poolID, priorityClass, unityCatalogImagePath string, containers []submittedContainer) (int64, error) { @@ -482,11 +483,16 @@ func workspaceIDForRunLink(ctx context.Context, w *databricks.WorkspaceClient) i func submittedContainers(cfg *runConfig, funcDir string) []submittedContainer { containers := make([]submittedContainer, 0, len(cfg.Containers)) for _, container := range cfg.Containers { + var environmentVariables map[string]string + if container.EnvironmentVariables != nil { + environmentVariables = container.EnvironmentVariables.Variables + } containers = append(containers, submittedContainer{ Name: container.Name, CommandPath: path.Join(funcDir, "containers", container.Name, commandScriptName), Ranks: container.Ranks, UnityCatalogImagePath: container.UnityCatalogImage, + EnvironmentVariables: environmentVariables, }) } return containers diff --git a/cmd/air/runsubmit_test.go b/cmd/air/runsubmit_test.go index e101bbc28af..520b3022ae2 100644 --- a/cmd/air/runsubmit_test.go +++ b/cmd/air/runsubmit_test.go @@ -650,7 +650,7 @@ func TestInjectContainers(t *testing.T) { require.NoError(t, json.Unmarshal(raw, &body)) err = injectContainers(body, []submittedContainer{ - {Name: "inference", CommandPath: "/Workspace/run/containers/inference/command.sh", Ranks: []int{0, 1}, UnityCatalogImagePath: "main.ml.inference:v1"}, + {Name: "inference", CommandPath: "/Workspace/run/containers/inference/command.sh", Ranks: []int{0, 1}, UnityCatalogImagePath: "main.ml.inference:v1", EnvironmentVariables: map[string]string{"MODEL_NAME": "llama"}}, {Name: "dataproc", CommandPath: "/Workspace/run/containers/dataproc/command.sh", Ranks: []int{2}, UnityCatalogImagePath: "main.ml.dataproc:v1"}, }) require.NoError(t, err) diff --git a/cmd/air/validateconfig.go b/cmd/air/validateconfig.go index 137347b985b..3b7bec75840 100644 --- a/cmd/air/validateconfig.go +++ b/cmd/air/validateconfig.go @@ -290,12 +290,18 @@ func validateConfigRequest(ctx context.Context, cfg *runConfig, commandPath stri } else { raw := make([]any, 0, len(containers)) for _, container := range containers { - raw = append(raw, map[string]any{ + rawContainer := map[string]any{ "name": container.Name, "command_path": container.CommandPath, "ranks": container.Ranks, "unity_catalog_image_path": container.UnityCatalogImagePath, - }) + } + if len(container.EnvironmentVariables) > 0 { + rawContainer["environment_variables"] = map[string]any{ + "variables": container.EnvironmentVariables, + } + } + raw = append(raw, rawContainer) } deployment["containers"] = raw } diff --git a/cmd/air/validateconfig_test.go b/cmd/air/validateconfig_test.go index 437f811a259..3d24ee85cfc 100644 --- a/cmd/air/validateconfig_test.go +++ b/cmd/air/validateconfig_test.go @@ -492,3 +492,33 @@ func TestValidateConfigRequestCarriesEnvironment(t *testing.T) { require.NoError(t, err) assert.JSONEq(t, `{"base_environment":"workspace-base-environments/databricks_ai_v6","dependencies":["torch==2.3.0","numpy"]}`, string(raw)) } + +func TestValidateConfigRequestCarriesContainerEnvironmentVariables(t *testing.T) { + cfg := baseRunConfig() + command := "python train.py" + cfg.Containers = []containerConfig{ + { + Name: "trainer", + Command: &command, + Ranks: []int{0}, + UnityCatalogImage: "main.ml.trainer:v1", + EnvironmentVariables: &containerEnvironmentVariablesConfig{ + Variables: map[string]string{"MODEL_NAME": "llama"}, + }, + }, + } + + request := validateConfigRequest( + t.Context(), + cfg, + "", + submittedContainers(cfg, "/Workspace/Users/me/run"), + "token", + ) + task := request["task"].(map[string]any) + deployment := task["deployments"].([]any)[0].(map[string]any) + container := deployment["containers"].([]any)[0].(map[string]any) + assert.Equal(t, map[string]any{ + "variables": map[string]string{"MODEL_NAME": "llama"}, + }, container["environment_variables"]) +}