Addressing comments from bcrochet

redhat-openshift-ecosystem · Jan 24, 2024 · bb672db · bb672db
1 parent b878fb7
commit bb672db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/container/check_container.go b/container/check_container.go
@@ -91,15 +91,16 @@ func (c *containerCheck) resolve(ctx context.Context) error {
 
 		c.policy = override
 	}
-	var err error
-	c.checks, err = engine.InitializeContainerChecks(ctx, c.policy, engine.ContainerCheckConfig{
+
+	newChecks, err := engine.InitializeContainerChecks(ctx, c.policy, engine.ContainerCheckConfig{
 		DockerConfig:           c.dockerconfigjson,
 		PyxisAPIToken:          c.pyxisToken,
 		CertificationProjectID: c.certificationProjectID,
 	})
 	if err != nil {
 		return fmt.Errorf("%w: %s", preflighterr.ErrCannotInitializeChecks, err)
 	}
+	c.checks = newChecks
 	c.resolved = true
 
 	return nil
@@ -108,8 +109,7 @@ func (c *containerCheck) resolve(ctx context.Context) error {
 // List the available container checks. Policy exceptions will be resolved if the proper
 // pyxis information is provided.
 func (c *containerCheck) List(ctx context.Context) (policy.Policy, []check.Check, error) {
-	err := c.resolve(ctx)
-	return c.policy, c.checks, err
+	return c.policy, c.checks, c.resolve(ctx)
 }
 
 // hasPyxisData returns true of the values necessary to make a pyxis

diff --git a/operator/check_operator.go b/operator/check_operator.go
@@ -83,8 +83,7 @@ func (c *operatorCheck) resolve(ctx context.Context) error {
 	}
 
 	c.policy = policy.PolicyOperator
-	var err error
-	c.checks, err = engine.InitializeOperatorChecks(ctx, c.policy, engine.OperatorCheckConfig{
+	newChecks, err := engine.InitializeOperatorChecks(ctx, c.policy, engine.OperatorCheckConfig{
 		ScorecardImage:          c.scorecardImage,
 		ScorecardWaitTime:       c.scorecardWaitTime,
 		ScorecardNamespace:      c.scorecardNamespace,
@@ -97,15 +96,15 @@ func (c *operatorCheck) resolve(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("%w: %s", preflighterr.ErrCannotInitializeChecks, err)
 	}
+	c.checks = newChecks
 	c.resolved = true
 
 	return nil
 }
 
 // List the available operator checks.
 func (c operatorCheck) List(ctx context.Context) (policy.Policy, []check.Check, error) {
-	err := c.resolve(ctx)
-	return c.policy, c.checks, err
+	return c.policy, c.checks, c.resolve(ctx)
 }
 
 // WithScorecardNamespace configures the namespace value to use for OperatorSDK Scorecard checks.