From 85f34898e7ba6ba5ca2f5576685ddd6b1446d1bc Mon Sep 17 00:00:00 2001 From: Adrian Richter Date: Mon, 1 Jun 2026 12:05:55 +0200 Subject: [PATCH 1/3] Use basename in getFilename() --- internal/instance/config/config.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/instance/config/config.go b/internal/instance/config/config.go index e701e89..c038ba0 100644 --- a/internal/instance/config/config.go +++ b/internal/instance/config/config.go @@ -241,7 +241,8 @@ func getFilename(cfg map[string]any, tplFile string) string { if fn, ok := cfg["filename"].(string); ok && fn != "" { return fn } - if tplFilePretty, found := strings.CutSuffix(tplFile, constants.TemplateSuffix); found { + tplBase := filepath.Base(tplFile) + if tplFilePretty, found := strings.CutSuffix(tplBase, constants.TemplateSuffix); found { return tplFilePretty } return constants.DefaultConfigFile @@ -251,6 +252,7 @@ type TemplateFunctions struct { baseDir string } + // GetFuncMap returns the template function map with context func (tf *TemplateFunctions) GetFuncMap() template.FuncMap { return template.FuncMap{ From 965c5d2ecdad6fff51abae04ba692e8ed211c010 Mon Sep 17 00:00:00 2001 From: Adrian Richter Date: Mon, 1 Jun 2026 12:10:45 +0200 Subject: [PATCH 2/3] make format --- internal/instance/config/config.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/instance/config/config.go b/internal/instance/config/config.go index c038ba0..c305021 100644 --- a/internal/instance/config/config.go +++ b/internal/instance/config/config.go @@ -252,7 +252,6 @@ type TemplateFunctions struct { baseDir string } - // GetFuncMap returns the template function map with context func (tf *TemplateFunctions) GetFuncMap() template.FuncMap { return template.FuncMap{ From e8d77c9a38267df734a4e46cebb315b42c99e7ea Mon Sep 17 00:00:00 2001 From: Adrian Richter Date: Mon, 1 Jun 2026 12:16:10 +0200 Subject: [PATCH 3/3] Improve constant value to be more intuitive Constant is also renamed in code DefaultConfigFile -> DefaultTemplatingOutputFilename --- internal/constants/constants.go | 4 ++-- internal/instance/config/config.go | 2 +- internal/instance/config/config_test.go | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/constants/constants.go b/internal/constants/constants.go index d41e578..0bc2cb6 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -43,8 +43,8 @@ const ( // TlsCertSecretYAML is the manifest file for the kubernetes secret enabling HTTPS TlsCertSecretYAML string = "tls-letsencrypt-secret.yaml" - // DefaultConfigFile is the filename used, if none is set in config file(s) - DefaultConfigFile string = "os-config.yaml" + // DefaultTemplatingOutputFilename is the filename used, if none is set in config file(s) + DefaultTemplatingOutputFilename string = "os-deployment.yaml" // TemplateSuffix is the recognized suffix for template files TemplateSuffix string = ".tmpl" diff --git a/internal/instance/config/config.go b/internal/instance/config/config.go index c305021..35c0c78 100644 --- a/internal/instance/config/config.go +++ b/internal/instance/config/config.go @@ -245,7 +245,7 @@ func getFilename(cfg map[string]any, tplFile string) string { if tplFilePretty, found := strings.CutSuffix(tplBase, constants.TemplateSuffix); found { return tplFilePretty } - return constants.DefaultConfigFile + return constants.DefaultTemplatingOutputFilename } type TemplateFunctions struct { diff --git a/internal/instance/config/config_test.go b/internal/instance/config/config_test.go index 3478ec6..8041b35 100644 --- a/internal/instance/config/config_test.go +++ b/internal/instance/config/config_test.go @@ -385,8 +385,8 @@ func TestGetFilename(t *testing.T) { "other": "value", } result := getFilename(cfg, "myspecial.yaml") - if result != constants.DefaultConfigFile { - t.Errorf("Expected %s, got %s", constants.DefaultConfigFile, result) + if result != constants.DefaultTemplatingOutputFilename { + t.Errorf("Expected %s, got %s", constants.DefaultTemplatingOutputFilename, result) } }) t.Run("empty filename in config, with template file", func(t *testing.T) { @@ -532,7 +532,7 @@ func TestCreateDirAndFiles(t *testing.T) { t.Run("invalid template path", func(t *testing.T) { cfg := map[string]any{ - "filename": constants.DefaultConfigFile, + "filename": constants.DefaultTemplatingOutputFilename, } err := CreateDirAndFiles(tmpdir, false, "nonexistent-template", cfg) if err == nil { @@ -580,7 +580,7 @@ func TestCreateDirAndFiles(t *testing.T) { outDir := filepath.Join(tmpdir, "output2") cfg := map[string]any{ - "filename": constants.DefaultConfigFile, + "filename": constants.DefaultTemplatingOutputFilename, } err := CreateDirAndFiles(outDir, true, tplDir, cfg)