From 450cdb28ee9fe174ce53c44c1fbb0e3988ed9fb2 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Thu, 29 Oct 2026 10:44:29 +0100 Subject: [PATCH] refactor(transform): load the service node once for the yaml replacements ReplaceExtendsFile and ReplaceEnvFile started with the same parsing and lookup of the service node. Move it to a helper. Signed-off-by: Nicolas De Loof --- pkg/compose/transform/replace.go | 63 +++++++++++++------------------- 1 file changed, 25 insertions(+), 38 deletions(-) diff --git a/pkg/compose/transform/replace.go b/pkg/compose/transform/replace.go index d15dc1d0b..9f0394acf 100644 --- a/pkg/compose/transform/replace.go +++ b/pkg/compose/transform/replace.go @@ -24,25 +24,7 @@ import ( // ReplaceExtendsFile changes value for service.extends.file in input yaml stream, preserving formatting func ReplaceExtendsFile(in []byte, serviceName string, value string) ([]byte, error) { - var doc yaml.Node - err := yaml.Unmarshal(in, &doc) - if err != nil { - return nil, err - } - if doc.Kind != yaml.DocumentNode { - return nil, fmt.Errorf("expected document kind %v, got %v", yaml.DocumentNode, doc.Kind) - } - root := doc.Content[0] - if root.Kind != yaml.MappingNode { - return nil, fmt.Errorf("expected document root to be a mapping, got %v", root.Kind) - } - - services, err := getMapping(root, "services") - if err != nil { - return nil, err - } - - target, err := getMapping(services, serviceName) + target, err := loadService(in, serviceName) if err != nil { return nil, err } @@ -63,25 +45,7 @@ func ReplaceExtendsFile(in []byte, serviceName string, value string) ([]byte, er // ReplaceEnvFile changes value for service.extends.env_file in input yaml stream, preserving formatting func ReplaceEnvFile(in []byte, serviceName string, i int, value string) ([]byte, error) { - var doc yaml.Node - err := yaml.Unmarshal(in, &doc) - if err != nil { - return nil, err - } - if doc.Kind != yaml.DocumentNode { - return nil, fmt.Errorf("expected document kind %v, got %v", yaml.DocumentNode, doc.Kind) - } - root := doc.Content[0] - if root.Kind != yaml.MappingNode { - return nil, fmt.Errorf("expected document root to be a mapping, got %v", root.Kind) - } - - services, err := getMapping(root, "services") - if err != nil { - return nil, err - } - - target, err := getMapping(services, serviceName) + target, err := loadService(in, serviceName) if err != nil { return nil, err } @@ -106,6 +70,29 @@ func ReplaceEnvFile(in []byte, serviceName string, i int, value string) ([]byte, } } +// loadService parses the yaml stream and returns the node of the given service. +func loadService(in []byte, serviceName string) (*yaml.Node, error) { + var doc yaml.Node + err := yaml.Unmarshal(in, &doc) + if err != nil { + return nil, err + } + if doc.Kind != yaml.DocumentNode { + return nil, fmt.Errorf("expected document kind %v, got %v", yaml.DocumentNode, doc.Kind) + } + root := doc.Content[0] + if root.Kind != yaml.MappingNode { + return nil, fmt.Errorf("expected document root to be a mapping, got %v", root.Kind) + } + + services, err := getMapping(root, "services") + if err != nil { + return nil, err + } + + return getMapping(services, serviceName) +} + func getMapping(root *yaml.Node, key string) (*yaml.Node, error) { var node *yaml.Node l := len(root.Content)