Fix panic when parsing a YAML file with an empty environment override (#7737)

begelundmuller · web-flow · commit 591b68e5cf5d · 2025-08-06T12:40:02.000+02:00
diff --git a/runtime/parser/parse_node.go b/runtime/parser/parse_node.go
@@ -150,7 +150,7 @@ func (p *Parser) parseStem(paths []string, ymlPath, yml, sqlPath, sql string) (*
 			res.YAMLOverride = &envOverride
 
 			// Apply the override immediately in case it changes any of the commonYAML fields
-			err := res.YAMLOverride.Decode(&cfg)
+			err := res.YAMLOverride.Decode(cfg)
 			if err != nil {
 				return nil, pathError{path: ymlPath, err: newYAMLError(err)}
 			}
diff --git a/runtime/parser/parser_test.go b/runtime/parser/parser_test.go
@@ -1060,6 +1060,30 @@ dev:
   refresh:
     cron: "0 0 * * *"
     run_in_dev: true
+`,
+		// model m1
+		`m1.yaml`: `
+type: model
+sql: SELECT 1
+# Test that an empty property doesn't break it
+dev:
+`,
+		// model m2
+		`m2.yaml`: `
+type: model
+sql: SELECT 1
+# Test empty property in environment_overrides doesn't break it
+environment_overrides:
+  dev:
+`,
+		// model m3
+		`m3.yaml`: `
+type: model
+sql: SELECT 1
+# Test environment_overrides
+environment_overrides:
+  dev:
+    sql: SELECT 2
 `,
 	})
 
@@ -1091,15 +1115,63 @@ dev:
 		},
 	}
 
+	m1Base := &Resource{
+		Name:  ResourceName{Kind: ResourceKindModel, Name: "m1"},
+		Paths: []string{"/m1.yaml"},
+		ModelSpec: &runtimev1.ModelSpec{
+			RefreshSchedule: &runtimev1.Schedule{RefUpdate: true},
+			InputConnector:  "duckdb",
+			InputProperties: must(structpb.NewStruct(map[string]any{"sql": "SELECT 1"})),
+			OutputConnector: "duckdb",
+			ChangeMode:      runtimev1.ModelChangeMode_MODEL_CHANGE_MODE_RESET,
+		},
+	}
+
+	m2Base := &Resource{
+		Name:  ResourceName{Kind: ResourceKindModel, Name: "m2"},
+		Paths: []string{"/m2.yaml"},
+		ModelSpec: &runtimev1.ModelSpec{
+			RefreshSchedule: &runtimev1.Schedule{RefUpdate: true},
+			InputConnector:  "duckdb",
+			InputProperties: must(structpb.NewStruct(map[string]any{"sql": "SELECT 1"})),
+			OutputConnector: "duckdb",
+			ChangeMode:      runtimev1.ModelChangeMode_MODEL_CHANGE_MODE_RESET,
+		},
+	}
+
+	m3Base := &Resource{
+		Name:  ResourceName{Kind: ResourceKindModel, Name: "m3"},
+		Paths: []string{"/m3.yaml"},
+		ModelSpec: &runtimev1.ModelSpec{
+			RefreshSchedule: &runtimev1.Schedule{RefUpdate: true},
+			InputConnector:  "duckdb",
+			InputProperties: must(structpb.NewStruct(map[string]any{"sql": "SELECT 1"})),
+			OutputConnector: "duckdb",
+			ChangeMode:      runtimev1.ModelChangeMode_MODEL_CHANGE_MODE_RESET,
+		},
+	}
+
+	m3Test := &Resource{
+		Name:  ResourceName{Kind: ResourceKindModel, Name: "m3"},
+		Paths: []string{"/m3.yaml"},
+		ModelSpec: &runtimev1.ModelSpec{
+			RefreshSchedule: &runtimev1.Schedule{RefUpdate: true},
+			InputConnector:  "duckdb",
+			InputProperties: must(structpb.NewStruct(map[string]any{"sql": "SELECT 2"})),
+			OutputConnector: "duckdb",
+			ChangeMode:      runtimev1.ModelChangeMode_MODEL_CHANGE_MODE_RESET,
+		},
+	}
+
 	// Parse without environment
 	p, err := Parse(ctx, repo, "", "", "duckdb")
 	require.NoError(t, err)
-	requireResourcesAndErrors(t, p, []*Resource{s1Base}, nil)
+	requireResourcesAndErrors(t, p, []*Resource{s1Base, m1Base, m2Base, m3Base}, nil)
 
 	// Parse in environment "dev"
 	p, err = Parse(ctx, repo, "", "dev", "duckdb")
 	require.NoError(t, err)
-	requireResourcesAndErrors(t, p, []*Resource{s1Test}, nil)
+	requireResourcesAndErrors(t, p, []*Resource{s1Test, m1Base, m2Base, m3Test}, nil)
 }
 
 func TestMetricsViewSecurity(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func (p Parser) parseStem(paths []string, ymlPath, yml, sqlPath, sql string) (`
`150`	`150`	`res.YAMLOverride = &envOverride`
`151`	`151`
`152`	`152`	`// Apply the override immediately in case it changes any of the commonYAML fields`
`153`		`- err := res.YAMLOverride.Decode(&cfg)`
	`153`	`+ err := res.YAMLOverride.Decode(cfg)`
`154`	`154`	`if err != nil {`
`155`	`155`	`return nil, pathError{path: ymlPath, err: newYAMLError(err)}`
`156`	`156`	`}`