Fix last code smells

Author: leoparente

otlpinf/otlpinf_test.go

@@ -19,6 +19,7 @@ const (
 	POLICIES_API      = "/api/v1/policies"
 	HTTP_YAML_CONTENT = "application/x-yaml"
 	ERROR_MSG         = "HTTP status code = %v, wanted %v"
+	NEW_ERR_MSG       = "New() error = %v"
 	POST_ERR_MSG      = "http.Post() error = %v"
 	YAML_ERR_MSG      = "yaml.NewEncoder() error = %v"
 )
@@ -34,7 +35,7 @@ func TestOtlpInfRestApis(t *testing.T) {
 
 	otlp, err := New(logger, &cfg)
 	if err != nil {
-		t.Errorf("New() error = %v", err)
+		t.Errorf(NEW_ERR_MSG, err)
 	}
 
 	otlp.setupRouter()
@@ -125,7 +126,7 @@ func TestOtlpinfCreateDeletePolicy(t *testing.T) {
 	// Act and Assert
 	otlp, err := New(logger, &cfg)
 	if err != nil {
-		t.Errorf("New() error = %v", err)
+		t.Errorf(NEW_ERR_MSG, err)
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())
@@ -253,7 +254,7 @@ func TestOtlpinfCreateInvalidPolicy(t *testing.T) {
 	// Act and Assert
 	otlp, err := New(logger, &cfg)
 	if err != nil {
-		t.Errorf("New() error = %v", err)
+		t.Errorf(NEW_ERR_MSG, err)
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())

runner/runner.go

@@ -54,6 +54,7 @@ type Runner struct {
 	policyFile    string
 	featureGates  string
 	sets          []string
+	options       []string
 	selfTelemetry bool
 	state         State
 	cancelFunc    context.CancelFunc
@@ -108,37 +109,37 @@ func (r *Runner) Configure(c *config.Policy) error {
 		}
 	}
 
-	return nil
-}
-
-func (r *Runner) Start(ctx context.Context, cancelFunc context.CancelFunc) error {
-	r.cancelFunc = cancelFunc
-	r.ctx = ctx
-
-	sOptions := []string{
+	r.options = []string{
 		"--config",
 		r.policyFile,
 	}
 
 	if !r.selfTelemetry {
-		sOptions = append(sOptions, "--set=service.telemetry.metrics.level=None")
+		r.options = append(r.options, "--set=service.telemetry.metrics.level=None")
 	}
 
 	if len(r.featureGates) > 0 {
-		sOptions = append(sOptions, "--feature-gates", r.featureGates)
+		r.options = append(r.options, "--feature-gates", r.featureGates)
 	}
 
 	if len(r.sets) > 0 {
-		sOptions = append(sOptions, r.sets...)
+		r.options = append(r.options, r.sets...)
 	}
 
+	return nil
+}
+
+func (r *Runner) Start(ctx context.Context, cancelFunc context.CancelFunc) error {
+	r.cancelFunc = cancelFunc
+	r.ctx = ctx
+
 	exe, err := memexec.New(otel_contrib)
 	if err != nil {
 		return err
 	}
 	defer exe.Close()
 
-	r.cmd = exe.CommandContext(ctx, sOptions...)
+	r.cmd = exe.CommandContext(ctx, r.options...)
 	if r.cmd.Err != nil {
 		return r.cmd.Err
 	}