fix lint errors

ydb-platform · Oct 13, 2023 · be40cab · be40cab
1 parent 1c66c5c
commit be40cab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/internal/connection/connection.go b/internal/connection/connection.go
@@ -9,11 +9,12 @@ import (
 	"time"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3"
-	ydbv1alpha1 "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+
+	ydbv1alpha1 "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
 )
 
 func Open(ctx context.Context, endpoint string, opts ...ydb.Option) (*ydb.Driver, error) {
@@ -55,8 +56,7 @@ func buildYDBTLSOption(endpoint string) ydb.Option {
 	tlsConfig := &tls.Config{ //nolint
 		RootCAs: certPool,
 	}
-	if strings.HasPrefix(ydbv1alpha1.GRPCSProto, endpoint) {
-
+	if strings.HasPrefix(endpoint, ydbv1alpha1.GRPCSProto) {
 		return ydb.WithTLSConfig(tlsConfig)
 	}
 	return ydb.WithTLSSInsecureSkipVerify()
@@ -68,7 +68,7 @@ func BuildGRPCTLSOption(endpoint string) grpc.DialOption {
 	tlsConfig := &tls.Config{ //nolint
 		RootCAs: certPool,
 	}
-	if strings.HasPrefix(ydbv1alpha1.GRPCSProto, endpoint) {
+	if strings.HasPrefix(endpoint, ydbv1alpha1.GRPCSProto) {
 		return grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig))
 	}
 	return grpc.WithTransportCredentials(insecure.NewCredentials())

diff --git a/internal/controllers/database/sync.go b/internal/controllers/database/sync.go
@@ -511,7 +511,7 @@ func (r *Reconciler) getYDBCredentials(
 				auth.AccessToken.SecretKeyRef,
 			)
 			if err != nil {
-				return nil, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, nil
+				return nil, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
 			}
 			return ydbCredentials.NewAccessTokenCredentials(token), ctrl.Result{Requeue: false}, nil
 		case auth.StaticCredentials != nil:
@@ -525,7 +525,7 @@ func (r *Reconciler) getYDBCredentials(
 					auth.StaticCredentials.Password.SecretKeyRef,
 				)
 				if err != nil {
-					return nil, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, nil
+					return nil, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
 				}
 			}
 			endpoint := database.GetStorageEndpoint()

diff --git a/internal/controllers/storage/sync.go b/internal/controllers/storage/sync.go
@@ -303,7 +303,7 @@ func (r *Reconciler) getYDBCredentials(
 				auth.AccessToken.SecretKeyRef,
 			)
 			if err != nil {
-				return nil, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, nil
+				return nil, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
 			}
 			return ydbCredentials.NewAccessTokenCredentials(token), ctrl.Result{Requeue: false}, nil
 		case auth.StaticCredentials != nil:
@@ -317,7 +317,7 @@ func (r *Reconciler) getYDBCredentials(
 					auth.StaticCredentials.Password.SecretKeyRef,
 				)
 				if err != nil {
-					return nil, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, nil
+					return nil, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
 				}
 			}
 			endpoint := storage.GetGRPCEndpoint()