Add missed changes and bypass linter error

workflow/yaml.go

@@ -61,21 +61,31 @@ const YamlOneOfTag = "!oneof"
 
 func buildOneOfExpressions(data yaml.Node, path []string) (any, error) {
 	if data.Type() != yaml.TypeIDMap {
-		return nil, fmt.Errorf("!oneof found on non-map node at %s; expected a map with a list of options and the discriminator ", strings.Join(path, " -> "))
+		return nil, fmt.Errorf(
+			"!oneof found on non-map node at %s; expected a map with a list of options and the discriminator ",
+			strings.Join(path, " -> "))
 	}
 	discriminatorNode, found := data.MapKey(YamlDiscriminatorKey)
 	if !found {
-		return nil, fmt.Errorf("key %q not present within !oneof at %q", YamlDiscriminatorKey, strings.Join(path, " -> "))
+		return nil, fmt.Errorf("key %q not present within %s at %q",
+			YamlDiscriminatorKey, YamlOneOfTag, strings.Join(path, " -> "))
 	}
 	if discriminatorNode.Type() != yaml.TypeIDString {
-		return nil, fmt.Errorf("%q within !oneof should be a string; got %s", discriminatorNode.Type(), YamlDiscriminatorKey)
+		return nil, fmt.Errorf("%q within %s should be a string; got %s",
+			YamlDiscriminatorKey, YamlOneOfTag, discriminatorNode.Type())
+	}
+	discriminator := discriminatorNode.Value()
+	if len(discriminator) == 0 {
+		return nil, fmt.Errorf("%q within %s is empty", YamlDiscriminatorKey, YamlOneOfTag)
 	}
 	oneOfOptionsNode, found := data.MapKey(YamlOneOfKey)
 	if !found {
-		return nil, fmt.Errorf("key %q not present within !oneof at %q", YamlOneOfKey, strings.Join(path, " -> "))
+		return nil, fmt.Errorf("key %q not present within %s at %q",
+			YamlOneOfKey, YamlOneOfTag, strings.Join(path, " -> "))
 	}
 	if oneOfOptionsNode.Type() != yaml.TypeIDMap {
-		return nil, fmt.Errorf("%q within !oneof should be a map; got %s", YamlOneOfKey, discriminatorNode.Type())
+		return nil, fmt.Errorf("%q within %q should be a map; got %s",
+			YamlOneOfKey, YamlOneOfTag, discriminatorNode.Type())
 	}
 	options := map[string]any{}
 	for _, optionNodeKey := range oneOfOptionsNode.MapKeys() {
@@ -87,7 +97,6 @@ func buildOneOfExpressions(data yaml.Node, path []string) (any, error) {
 		}
 	}
 
-	discriminator := discriminatorNode.Value()
 	return &infer.OneOfExpression{
 		Discriminator: discriminator,
 		Options:       options,

workflow/yaml_test.go

@@ -1,4 +1,4 @@
-package workflow
+package workflow //nolint:testpackage // Tests internal functions for unit testing.
 
 import (
 	"go.arcalot.io/assert"