From c9de37cd41b5b086ade175902b72e41094e5b1e2 Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Tue, 26 Aug 2025 08:10:19 +0200 Subject: [PATCH] feat: allow template string --- squadron.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/squadron.go b/squadron.go index 7721e9c..c42cdd3 100644 --- a/squadron.go +++ b/squadron.go @@ -54,13 +54,16 @@ func New(basePath, namespace string, files []string) *Squadron { // ------------------------------------------------------------------------------------------------ func (sq *Squadron) Namespace(ctx context.Context, squadron, unit string, u *config.Unit) (string, error) { - if u.Namespace != "" { - return u.Namespace, nil - } - if sq.namespace == "" { + var tpl string + switch { + case u.Namespace != "": + tpl = u.Namespace + case sq.namespace != "": + tpl = sq.namespace + default: return "default", nil } - return util.RenderTemplateString(sq.namespace, map[string]string{"Squadron": squadron, "Unit": unit}) + return util.RenderTemplateString(tpl, map[string]string{"Squadron": squadron, "Unit": unit}) } func (sq *Squadron) Config() config.Config {