From 0fab2076723f1b325dfb0c2d3c0e6ba062543798 Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 8 Apr 2024 15:22:10 +0200 Subject: [PATCH 1/2] Fixed pre-init script order --- bundle/config/mutator/mutator.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bundle/config/mutator/mutator.go b/bundle/config/mutator/mutator.go index fda1182716..b08751566f 100644 --- a/bundle/config/mutator/mutator.go +++ b/bundle/config/mutator/mutator.go @@ -9,14 +9,17 @@ import ( func DefaultMutators() []bundle.Mutator { return []bundle.Mutator{ + // Execute preinit script before loading any configuration files. + // It needs to be done before processing cnfiguration files to allow + // the script to modify the configuration or add own configuration files. + scripts.Execute(config.ScriptPreInit), + loader.EntryPoint(), loader.ProcessRootIncludes(), // Verify that the CLI version is within the specified range. VerifyCliVersion(), - // Execute preinit script after loading all configuration files. - scripts.Execute(config.ScriptPreInit), EnvironmentsToTargets(), InitializeVariables(), DefineDefaultTarget(), From db46563df492a37473c5a1d6f3ddcc25f73e8a8f Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 8 Apr 2024 15:23:14 +0200 Subject: [PATCH 2/2] typo --- bundle/config/mutator/mutator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/config/mutator/mutator.go b/bundle/config/mutator/mutator.go index b08751566f..9a2c828b2b 100644 --- a/bundle/config/mutator/mutator.go +++ b/bundle/config/mutator/mutator.go @@ -10,7 +10,7 @@ import ( func DefaultMutators() []bundle.Mutator { return []bundle.Mutator{ // Execute preinit script before loading any configuration files. - // It needs to be done before processing cnfiguration files to allow + // It needs to be done before processing configuration files to allow // the script to modify the configuration or add own configuration files. scripts.Execute(config.ScriptPreInit),