fixup! feat: Add golangci-lint

Signed-off-by: Mateus Oliveira <[email protected]>
openshift · Feb 22, 2024 · 75944d0 · 75944d0
1 parent 63a0f36
commit 75944d0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/controllers/bsl.go b/controllers/bsl.go
@@ -5,12 +5,6 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-<<<<<<< HEAD
-	oadpv1alpha1 "github.com/openshift/oadp-operator/api/v1alpha1"
-	"github.com/openshift/oadp-operator/pkg/common"
-	"github.com/openshift/oadp-operator/pkg/storage/aws"
-=======
->>>>>>> 9a85d2f (feat: Add golangci-lint)
 	velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -19,6 +13,7 @@ import (
 
 	oadpv1alpha1 "github.com/openshift/oadp-operator/api/v1alpha1"
 	"github.com/openshift/oadp-operator/pkg/common"
+	"github.com/openshift/oadp-operator/pkg/storage/aws"
 )
 
 func (r *DPAReconciler) ValidateBackupStorageLocations(dpa oadpv1alpha1.DataProtectionApplication) (bool, error) {

diff --git a/main.go b/main.go
@@ -23,10 +23,6 @@ import (
 	"fmt"
 	"os"
 
-	"k8s.io/apimachinery/pkg/types"
-
-	"k8s.io/client-go/rest"
-
 	routev1 "github.com/openshift/api/route/v1"
 	security "github.com/openshift/api/security/v1"
 	monitor "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
@@ -37,13 +33,15 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/kubernetes"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
+	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"

diff --git a/main_test.go b/main_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"testing"
 
-	coreV1 "k8s.io/api/core/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 )
@@ -80,7 +80,7 @@ func TestAddPodSecurityPrivilegedLabels(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			// Create a new namespace with the existing labels
-			namespace := coreV1.Namespace{
+			namespace := corev1.Namespace{
 				ObjectMeta: v1.ObjectMeta{
 					Name:   testNamespaceName,
 					Labels: tt.existingLabels,

diff --git a/pkg/storage/aws/s3.go b/pkg/storage/aws/s3.go
@@ -2,7 +2,6 @@ package aws
 
 import (
 	"context"
-
 	"errors"
 
 	"github.com/aws/aws-sdk-go/aws/endpoints"
@@ -21,15 +20,15 @@ func BucketRegionIsDiscoverable(bucket string) bool {
 func GetBucketRegion(bucket string) (string, error) {
 	var region string
 
-	session, err := session.NewSession()
+	sessionInstance, err := session.NewSession()
 	if err != nil {
 		// return "", errors.WithStack(err) // don't need stack trace, not inside velero-plugin
 		return "", err
 	}
 
 	for _, partition := range endpoints.DefaultPartitions() {
 		for regionHint := range partition.Regions() {
-			region, _ = s3manager.GetBucketRegion(context.Background(), session, bucket, regionHint)
+			region, _ = s3manager.GetBucketRegion(context.Background(), sessionInstance, bucket, regionHint)
 
 			// we only need to try a single region hint per partition, so break after the first
 			break