From 9c43518a156ca3426db0e11724fd9fc74dcc4da3 Mon Sep 17 00:00:00 2001 From: monopole Date: Mon, 12 Apr 2021 07:51:01 -0700 Subject: [PATCH] Fix nits, add internal GetRoot func. --- api/internal/target/kusttarget_configplugin.go | 6 +++--- api/testutils/kusttest/harnessenhanced.go | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/api/internal/target/kusttarget_configplugin.go b/api/internal/target/kusttarget_configplugin.go index 712b0cc6a..c7af3e7cb 100644 --- a/api/internal/target/kusttarget_configplugin.go +++ b/api/internal/target/kusttarget_configplugin.go @@ -112,7 +112,8 @@ var generatorConfigurators = map[builtinhelpers.BuiltinPluginType]func( return }, - builtinhelpers.HelmChartInflationGenerator: func(kt *KustTarget, bpt builtinhelpers.BuiltinPluginType, f gFactory) ( + builtinhelpers.HelmChartInflationGenerator: func( + kt *KustTarget, bpt builtinhelpers.BuiltinPluginType, f gFactory) ( result []resmap.Generator, err error) { var c struct { types.HelmChartArgs @@ -120,8 +121,7 @@ var generatorConfigurators = map[builtinhelpers.BuiltinPluginType]func( for _, args := range kt.kustomization.HelmChartInflationGenerator { c.HelmChartArgs = args p := f() - err := kt.configureBuiltinPlugin(p, c, bpt) - if err != nil { + if err = kt.configureBuiltinPlugin(p, c, bpt); err != nil { return nil, err } result = append(result, p) diff --git a/api/testutils/kusttest/harnessenhanced.go b/api/testutils/kusttest/harnessenhanced.go index fbe485840..611453f91 100644 --- a/api/testutils/kusttest/harnessenhanced.go +++ b/api/testutils/kusttest/harnessenhanced.go @@ -59,6 +59,10 @@ func MakeEnhancedHarness(t *testing.T) *HarnessEnhanced { return result } +func (th *HarnessEnhanced) GetRoot() string { + return th.ldr.Root() +} + func (th *HarnessEnhanced) Reset() { th.pte.reset() }