chore: make linter happy and initialize Programs only if assertions a…

…re present

Signed-off-by: Kumar Mallikarjuna <[email protected]>

pkg/apis/testharness/v1beta1/expression.go

@@ -33,15 +33,16 @@ func (t *TestResourceRef) BuildResourceReference() (namespacedName types.Namespa
 
 func (t *TestResourceRef) Validate() error {
 	apiVersionSplit := strings.Split(t.APIVersion, "/")
-	if t.APIVersion == "" || (len(apiVersionSplit) != 1 && len(apiVersionSplit) != 2) {
+	switch {
+	case t.APIVersion == "" || (len(apiVersionSplit) != 1 && len(apiVersionSplit) != 2):
 		return fmt.Errorf("apiVersion '%v' not of the format (<group>/)<version>", t.APIVersion)
-	} else if t.Kind == "" {
+	case t.Kind == "":
 		return errors.New("kind not specified")
-	} else if t.Namespace == "" {
+	case t.Namespace == "":
 		return errors.New("namespace not specified")
-	} else if t.Name == "" {
+	case t.Name == "":
 		return errors.New("name not specified")
-	} else if t.Ref == "" {
+	case t.Ref == "":
 		return errors.New("ref not specified")
 	}
 

pkg/test/step.go

@@ -426,7 +426,7 @@ func (s *Step) CheckAssertExpressions(
 		return []error{err}
 	}
 
-	return testutils.RunAssertExpressions(ctx, s.Logger, client, s.Programs, resourceRefs, assertAny, assertAll)
+	return testutils.RunAssertExpressions(ctx, client, s.Programs, resourceRefs, assertAny, assertAll)
 }
 
 // Check checks if the resources defined in Asserts and Errors are in the correct state.
@@ -533,8 +533,6 @@ func (s *Step) String() string {
 //     if seen, mark a test immediately failed.
 //   - All other YAML files are considered resources to create.
 func (s *Step) LoadYAML(file string) error {
-	s.Programs = make(map[string]cel.Program)
-
 	skipFile, objects, err := s.loadOrSkipFile(file)
 	if skipFile || err != nil {
 		return err
@@ -574,6 +572,10 @@ func (s *Step) LoadYAML(file string) error {
 				return fmt.Errorf("failed to load TestAssert object from %s: %w", file, err)
 			}
 
+			if len(assertions) > 0 {
+				s.Programs = make(map[string]cel.Program)
+			}
+
 			for _, assertion := range assertions {
 				if prg, err := assertion.BuildProgram(env); err != nil {
 					errs = append(errs, err)

pkg/test/utils/kubernetes.go

@@ -1222,7 +1222,6 @@ func RunAssertCommands(ctx context.Context, logger Logger, namespace string, com
 // RunAssertExpressions evaluates a set of CEL expressions specified as AnyAllExpressions
 func RunAssertExpressions(
 	ctx context.Context,
-	logger Logger,
 	cl client.Client,
 	programs map[string]cel.Program,
 	resourceRefs []harness.TestResourceRef,