From d7504b926623ee65ace338ca29890f746fa46745 Mon Sep 17 00:00:00 2001 From: Jan Schlicht Date: Tue, 21 Jul 2020 12:53:37 +0200 Subject: [PATCH 1/2] Don't warn if parameter is only used as trigger Parameters can be used to only trigger plans without being used in any templates. In this case no warning should be printed when verifying a package. Signed-off-by: Jan Schlicht --- pkg/kudoctl/packages/verifier/template/verify_parameters.go | 5 ++++- .../packages/verifier/template/verify_parameters_test.go | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/kudoctl/packages/verifier/template/verify_parameters.go b/pkg/kudoctl/packages/verifier/template/verify_parameters.go index 142ddfefa..55c8062e2 100644 --- a/pkg/kudoctl/packages/verifier/template/verify_parameters.go +++ b/pkg/kudoctl/packages/verifier/template/verify_parameters.go @@ -81,7 +81,10 @@ func paramsDefinedNotUsed(pf *packages.Files) verifier.Result { } for _, value := range pf.Params.Parameters { if _, ok := tparams[value.Name]; !ok { - res.AddParamWarning(value.Name, "defined but not used.") + // A parameter could be use to trigger a plan while not being used in templates. + if value.Trigger == "" { + res.AddParamWarning(value.Name, "defined but not used.") + } } } return res diff --git a/pkg/kudoctl/packages/verifier/template/verify_parameters_test.go b/pkg/kudoctl/packages/verifier/template/verify_parameters_test.go index 28bf17d6f..503768ee7 100644 --- a/pkg/kudoctl/packages/verifier/template/verify_parameters_test.go +++ b/pkg/kudoctl/packages/verifier/template/verify_parameters_test.go @@ -17,6 +17,7 @@ func TestTemplateParametersVerifier(t *testing.T) { {Name: "UsedViaRoot"}, {Name: "BROKER_COUNT"}, {Name: "EXTERNAL_NODE_PORT"}, + {Name: "TRIGGER_ONLY", Trigger: "foo"}, } paramFile := packages.ParamsFile{Parameters: params} templates := make(map[string]string) From 962068cecd01a7d8abefdb251d77e33e6f3e64d4 Mon Sep 17 00:00:00 2001 From: Jan Schlicht Date: Tue, 21 Jul 2020 13:10:48 +0200 Subject: [PATCH 2/2] Update golden file Signed-off-by: Jan Schlicht --- pkg/kudoctl/cmd/testdata/invalid-params.golden | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/kudoctl/cmd/testdata/invalid-params.golden b/pkg/kudoctl/cmd/testdata/invalid-params.golden index 6bad8fa0e..d939a6565 100644 --- a/pkg/kudoctl/cmd/testdata/invalid-params.golden +++ b/pkg/kudoctl/cmd/testdata/invalid-params.golden @@ -1,6 +1,5 @@ -Warnings -parameter "Cpus" defined but not used. -parameter "comma," defined but not used. +Warnings +parameter "Cpus" defined but not used. Errors parameter "Cpus" has a duplicate parameter "comma," contains invalid character ','