Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .nextchanges/air/container-env-preflight.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Validate container environment variable names during `air run` preflight checks. ([#7614](https://github.com/databricks/cli/pull/7614))
6 changes: 6 additions & 0 deletions cmd/air/runsubmit.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/air/runsubmit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 8 additions & 2 deletions cmd/air/validateconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
30 changes: 30 additions & 0 deletions cmd/air/validateconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
}
Loading