go fmt

Author: Konstantin Bogdanov

api/v1alpha1/database_types.go

@@ -30,7 +30,7 @@ type DatabaseSpec struct {
 
 	// (Optional) Database storage and compute resources
 	// +optional
-	Resources *DatabaseResources `json:"resources,omitempty"`  // TODO: Add validation webhook: some resources must be specified
+	Resources *DatabaseResources `json:"resources,omitempty"` // TODO: Add validation webhook: some resources must be specified
 
 	// (Optional) Shared resources can be used by serverless databases.
 	// +optional

internal/cms/tenant.go

@@ -5,9 +5,9 @@ import (
 	"errors"
 	"fmt"
 
-	ydbv1alpha1 "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Cms"
+	ydbv1alpha1 "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
 	"github.com/ydb-platform/ydb-kubernetes-operator/internal/grpc"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
@@ -17,11 +17,11 @@ const (
 )
 
 type Tenant struct {
-	StorageEndpoint string
-	Path string
-	StorageUnits []ydbv1alpha1.StorageUnit
-	Shared bool
-	SharedDatabasePath string
+	StorageEndpoint      string
+	Path                 string
+	StorageUnits         []ydbv1alpha1.StorageUnit
+	Shared               bool
+	SharedDatabasePath   string
 	UseGrpcSecureChannel bool
 }
 
@@ -51,7 +51,7 @@ func (t *Tenant) makeCreateDatabaseRequest() *Ydb_Cms.CreateDatabaseRequest {
 	request := &Ydb_Cms.CreateDatabaseRequest{Path: t.Path}
 	if t.SharedDatabasePath != "" {
 		request.ResourcesKind = &Ydb_Cms.CreateDatabaseRequest_ServerlessResources{
-			ServerlessResources:  &Ydb_Cms.ServerlessResources{
+			ServerlessResources: &Ydb_Cms.ServerlessResources{
 				SharedDatabasePath: t.SharedDatabasePath,
 			},
 		}

internal/controllers/database/sync.go

@@ -2,10 +2,10 @@ package database
 
 import (
 	"context"
+	"errors"
 	"fmt"
-	"time"
 	"reflect"
-	"errors"
+	"time"
 
 	ydbv1alpha1 "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
 	"github.com/ydb-platform/ydb-kubernetes-operator/internal/cms"
@@ -27,7 +27,7 @@ const (
 	Ready        ClusterState = "Ready"
 
 	DefaultRequeueDelay             = 10 * time.Second
-	StatusUpdateRequeueDelay        =  1 * time.Second
+	StatusUpdateRequeueDelay        = 1 * time.Second
 	TenantCreationRequeueDelay      = 30 * time.Second
 	StorageAwaitRequeueDelay        = 60 * time.Second
 	SharedDatabaseAwaitRequeueDelay = 60 * time.Second
@@ -173,12 +173,12 @@ func (r *DatabaseReconciler) handleResourcesSync(ctx context.Context, database *
 	r.Log.Info("running step handleResourcesSync")
 
 	for _, builder := range database.GetResourceBuilders() {
-		new_resource := builder.Placeholder(database)
+		newResource := builder.Placeholder(database)
 
-		result, err := resources.CreateOrUpdateIgnoreStatus(ctx, r.Client, new_resource, func() error {
+		result, err := resources.CreateOrUpdateIgnoreStatus(ctx, r.Client, newResource, func() error {
 			var err error
 
-			err = builder.Build(new_resource)
+			err = builder.Build(newResource)
 			if err != nil {
 				r.Recorder.Event(
 					database,
@@ -189,7 +189,7 @@ func (r *DatabaseReconciler) handleResourcesSync(ctx context.Context, database *
 				return err
 			}
 
-			err = ctrl.SetControllerReference(database.Unwrap(), new_resource, r.Scheme)
+			err = ctrl.SetControllerReference(database.Unwrap(), newResource, r.Scheme)
 			if err != nil {
 				r.Recorder.Event(
 					database,
@@ -205,24 +205,24 @@ func (r *DatabaseReconciler) handleResourcesSync(ctx context.Context, database *
 
 		var eventMessage string = fmt.Sprintf(
 			"Resource: %s, Namespace: %s, Name: %s",
-			reflect.TypeOf(new_resource),
-			new_resource.GetNamespace(),
-			new_resource.GetName(),
+			reflect.TypeOf(newResource),
+			newResource.GetNamespace(),
+			newResource.GetName(),
 		)
 		if err != nil {
 			r.Recorder.Event(
 				database,
 				corev1.EventTypeWarning,
 				"ProvisioningFailed",
-				eventMessage + fmt.Sprintf(", failed to sync, error: %s", err),
+				eventMessage+fmt.Sprintf(", failed to sync, error: %s", err),
 			)
 			return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
-		} else if (result == controllerutil.OperationResultCreated || result == controllerutil.OperationResultUpdated) {
+		} else if result == controllerutil.OperationResultCreated || result == controllerutil.OperationResultUpdated {
 			r.Recorder.Event(
 				database,
 				corev1.EventTypeNormal,
 				"Provisioning",
-				eventMessage + fmt.Sprintf(", changed, result: %s", result),
+				eventMessage+fmt.Sprintf(", changed, result: %s", result),
 			)
 		}
 	}
@@ -321,7 +321,14 @@ func (r *DatabaseReconciler) handleTenantCreation(ctx context.Context, database
 		r.Recorder.Event(database, corev1.EventTypeWarning, "ControllerError", msg)
 		return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, errors.New(msg)
 	}
-	tenant := cms.Tenant{database.GetStorageEndpoint(), Path, StorageUnits, Shared, SharedDatabasePath, database.Spec.Service.GRPC.TLSConfiguration.Enabled}
+	tenant := cms.Tenant{
+		StorageEndpoint:      database.GetStorageEndpoint(),
+		Path:                 Path,
+		StorageUnits:         StorageUnits,
+		Shared:               Shared,
+		SharedDatabasePath:   SharedDatabasePath,
+		UseGrpcSecureChannel: database.Spec.Service.GRPC.TLSConfiguration.Enabled,
+	}
 	err := tenant.Create(ctx)
 	if err != nil {
 		r.Recorder.Event(

internal/resources/resource.go

@@ -1,16 +1,16 @@
 package resources
 
 import (
-	"fmt"
 	"context"
+	"fmt"
 
+	"github.com/banzaicloud/k8s-objectmatcher/patch"
 	appsv1 "k8s.io/api/apps/v1"
-	ctrl "sigs.k8s.io/controller-runtime"
-	ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
+	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"github.com/banzaicloud/k8s-objectmatcher/patch"
+	ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
 const (