lint

pkg/apis/logstash/v1alpha1/name_test.go

@@ -78,4 +78,4 @@ func TestLogstashName(t *testing.T) {
 			}
 		})
 	}
-}
+}

pkg/controller/logstash/config_test.go

@@ -185,7 +185,7 @@ log:
 			}
 			require.NoError(t, err)
 
-			gotBytes, err := got.Render()
+			gotBytes, _ := got.Render()
 			gotStr := string(gotBytes)
 			if gotStr != tt.want {
 				t.Errorf("newConfig() got = \n%v\n, want \n%v\n", gotStr, tt.want)

pkg/controller/logstash/driver.go

@@ -109,11 +109,11 @@ func internalReconcile(params Params) (*reconciler.Results, logstashv1alpha1.Log
 
 	configHash := fnv.New32a()
 
-	if cfg, err := reconcileConfig(params, configHash); err != nil {
+	cfg, err := reconcileConfig(params, configHash)
+	if err != nil {
 		return results.WithError(err), params.Status
-	} else {
-		params.LogstashConfig = cfg
 	}
+	params.LogstashConfig = cfg
 
 	// reconcile beats config secrets if Stack Monitoring is defined
 	if err := stackmon.ReconcileConfigSecrets(params.Context, params.Client, params.Logstash, params.UseTLS, params.LogstashConfig); err != nil {

pkg/controller/logstash/pod.go

@@ -161,14 +161,14 @@ func readinessProbe(params Params) corev1.Probe {
 // getHttpHeaders when api.auth.basic.type is set, take api.auth.basic.username and api.auth.basic.password from logstash.yml
 // to build Authorization header
 func getHttpHeaders(params Params) []corev1.HTTPHeader {
-	var credentials stackmon.ApiServerCredentials
+	var credentials stackmon.APIServerCredentials
 	_ = params.LogstashConfig.Unpack(&credentials)
 
-	if strings.ToLower(credentials.Api.Auth.Type) != "basic" {
+	if strings.ToLower(credentials.API.Auth.Type) != "basic" {
 		return nil
 	}
 
-	usernamePassword := fmt.Sprintf("%s:%s", credentials.Api.Auth.Basic.Username, credentials.Api.Auth.Basic.Password)
+	usernamePassword := fmt.Sprintf("%s:%s", credentials.API.Auth.Basic.Username, credentials.API.Auth.Basic.Password)
 	encodedUsernamePassword := base64.StdEncoding.EncodeToString([]byte(usernamePassword))
 	authHeader := corev1.HTTPHeader{Name: "Authorization", Value: fmt.Sprintf("Basic %s", encodedUsernamePassword)}
 

pkg/controller/logstash/pod_test.go

@@ -11,10 +11,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/elastic/cloud-on-k8s/v2/pkg/controller/common/settings"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/elastic/cloud-on-k8s/v2/pkg/controller/common/settings"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/controller/logstash/sset/sset.go

@@ -95,4 +95,4 @@ func Reconcile(ctx context.Context, c k8s.Client, expected appsv1.StatefulSet, o
 // EqualTemplateHashLabels reports whether actual and expected StatefulSets have the same template hash label value.
 func EqualTemplateHashLabels(expected, actual appsv1.StatefulSet) bool {
 	return expected.Labels[hash.TemplateHashLabelName] == actual.Labels[hash.TemplateHashLabelName]
-}
+}

pkg/controller/logstash/stackmon/sidecar.go

@@ -27,8 +27,8 @@ const (
 	cfgHashAnnotation = "logstash.k8s.elastic.co/monitoring-config-hash"
 )
 
-type ApiServerCredentials struct {
-	Api struct {
+type APIServerCredentials struct {
+	API struct {
 		Auth struct {
 			Type  string `yaml:"type"`
 			Basic struct {
@@ -45,7 +45,7 @@ func Metricbeat(ctx context.Context, client k8s.Client, logstash logstashv1alpha
 		protocol = "https"
 	}
 
-	var credentials ApiServerCredentials
+	var credentials APIServerCredentials
 	_ = logstashConfig.Unpack(&credentials)
 
 	metricbeat, err := stackmon.NewMetricBeatSidecar(
@@ -57,8 +57,8 @@ func Metricbeat(ctx context.Context, client k8s.Client, logstash logstashv1alpha
 		metricbeatConfigTemplate,
 		logstashv1alpha1.Namer,
 		fmt.Sprintf("%s://localhost:%d", protocol, network.HTTPPort),
-		credentials.Api.Auth.Basic.Username,
-		credentials.Api.Auth.Basic.Password,
+		credentials.API.Auth.Basic.Username,
+		credentials.API.Auth.Basic.Password,
 		useTLS,
 	)
 	if err != nil {

pkg/controller/logstash/volume/volumes.go

@@ -7,9 +7,10 @@ package volume
 import (
 	"fmt"
 
-	"github.com/elastic/cloud-on-k8s/v2/pkg/controller/common/certificates"
 	corev1 "k8s.io/api/core/v1"
 
+	"github.com/elastic/cloud-on-k8s/v2/pkg/controller/common/certificates"
+
 	commonv1 "github.com/elastic/cloud-on-k8s/v2/pkg/apis/common/v1"
 	logstashv1alpha1 "github.com/elastic/cloud-on-k8s/v2/pkg/apis/logstash/v1alpha1"
 	"github.com/elastic/cloud-on-k8s/v2/pkg/controller/common/volume"

test/e2e/test/enterprisesearch/http_client.go

@@ -127,7 +127,7 @@ type CredentialsCollection struct {
 func (a AppSearchClient) GetAPIKey() (string, error) {
 	url := a.endpoint + "/as/credentials/collection"
 
-	req, err := http.NewRequest(http.MethodGet, url, nil) //nolint:noctx
+	req, err := http.NewRequest(http.MethodGet, url, nil)
 	if err != nil {
 		return "", err
 	}