Skip to content

Commit

Permalink
[misc] format files
Browse files Browse the repository at this point in the history
  • Loading branch information
shmel1k committed Jul 30, 2024
1 parent 7f52ca2 commit 1e99f96
Show file tree
Hide file tree
Showing 42 changed files with 74 additions and 32 deletions.
1 change: 1 addition & 0 deletions cmd/maintenance/complete/complete.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"

"github.com/spf13/cobra"

"github.com/ydb-platform/ydbops/pkg/cli"
"github.com/ydb-platform/ydbops/pkg/cmdutil"
"github.com/ydb-platform/ydbops/pkg/prettyprint"
Expand Down
3 changes: 2 additions & 1 deletion cmd/maintenance/create/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ import (

"github.com/google/uuid"
"github.com/spf13/cobra"
"google.golang.org/protobuf/types/known/durationpb"

"github.com/ydb-platform/ydbops/pkg/cli"
"github.com/ydb-platform/ydbops/pkg/client/cms"
"github.com/ydb-platform/ydbops/pkg/cmdutil"
"github.com/ydb-platform/ydbops/pkg/rolling"
"google.golang.org/protobuf/types/known/durationpb"
)

func New(f cmdutil.Factory) *cobra.Command {
Expand Down
1 change: 1 addition & 0 deletions cmd/maintenance/create/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package create

import (
"github.com/spf13/pflag"

"github.com/ydb-platform/ydbops/pkg/rolling"
)

Expand Down
1 change: 1 addition & 0 deletions cmd/maintenance/drop/drop.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package drop

import (
"github.com/spf13/cobra"

"github.com/ydb-platform/ydbops/pkg/cli"
"github.com/ydb-platform/ydbops/pkg/cmdutil"
)
Expand Down
1 change: 1 addition & 0 deletions cmd/maintenance/list/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"

"github.com/spf13/cobra"

"github.com/ydb-platform/ydbops/pkg/cli"
"github.com/ydb-platform/ydbops/pkg/cmdutil"
"github.com/ydb-platform/ydbops/pkg/prettyprint"
Expand Down
1 change: 1 addition & 0 deletions cmd/maintenance/maintenance.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package maintenance

import (
"github.com/spf13/cobra"

"github.com/ydb-platform/ydbops/cmd/maintenance/complete"
"github.com/ydb-platform/ydbops/cmd/maintenance/create"
"github.com/ydb-platform/ydbops/cmd/maintenance/drop"
Expand Down
1 change: 1 addition & 0 deletions cmd/maintenance/refresh/refresh.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"

"github.com/spf13/cobra"

"github.com/ydb-platform/ydbops/pkg/cli"
"github.com/ydb-platform/ydbops/pkg/cmdutil"
"github.com/ydb-platform/ydbops/pkg/prettyprint"
Expand Down
1 change: 1 addition & 0 deletions cmd/restart/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package restart

import (
"github.com/spf13/pflag"

"github.com/ydb-platform/ydbops/pkg/rolling"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/restart/restart.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import (
"time"

"github.com/spf13/cobra"
"go.uber.org/zap"

"github.com/ydb-platform/ydbops/pkg/cli"
"github.com/ydb-platform/ydbops/pkg/cmdutil"
"github.com/ydb-platform/ydbops/pkg/command"
"github.com/ydb-platform/ydbops/pkg/options"
"github.com/ydb-platform/ydbops/pkg/rolling"
"github.com/ydb-platform/ydbops/pkg/rolling/restarters"
"go.uber.org/zap"
)

var RestartCommandDescription = command.NewDescription(
Expand Down
5 changes: 3 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import (
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"

"github.com/ydb-platform/ydbops/cmd/maintenance"
"github.com/ydb-platform/ydbops/cmd/restart"
"github.com/ydb-platform/ydbops/cmd/run"
Expand All @@ -12,8 +15,6 @@ import (
"github.com/ydb-platform/ydbops/pkg/cmdutil"
"github.com/ydb-platform/ydbops/pkg/command"
"github.com/ydb-platform/ydbops/pkg/options"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)

var RootCommandDescription = command.NewDescription(
Expand Down
1 change: 1 addition & 0 deletions cmd/run/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"os"

"github.com/spf13/pflag"

"github.com/ydb-platform/ydbops/pkg/rolling"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/run/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import (
"fmt"

"github.com/spf13/cobra"
"go.uber.org/zap"

"github.com/ydb-platform/ydbops/pkg/cli"
"github.com/ydb-platform/ydbops/pkg/cmdutil"
"github.com/ydb-platform/ydbops/pkg/command"
"github.com/ydb-platform/ydbops/pkg/options"
"github.com/ydb-platform/ydbops/pkg/rolling"
"github.com/ydb-platform/ydbops/pkg/rolling/restarters"
"go.uber.org/zap"
)

var RunCommandDescription = command.NewDescription(
Expand Down
5 changes: 3 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ package main
import (
"os"

"go.uber.org/zap"
"go.uber.org/zap/zapcore"

"github.com/ydb-platform/ydbops/cmd"
"github.com/ydb-platform/ydbops/pkg/client/auth/credentials"
"github.com/ydb-platform/ydbops/pkg/client/cms"
Expand All @@ -11,8 +14,6 @@ import (
"github.com/ydb-platform/ydbops/pkg/cmdutil"
"github.com/ydb-platform/ydbops/pkg/command"
"github.com/ydb-platform/ydbops/pkg/options"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)

func createLogger(level string) (zap.AtomicLevel, *zap.Logger) {
Expand Down
1 change: 1 addition & 0 deletions pkg/cli/cobra.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"strings"

"github.com/spf13/cobra"

"github.com/ydb-platform/ydbops/internal/cli"
"github.com/ydb-platform/ydbops/pkg/command"
"github.com/ydb-platform/ydbops/pkg/options"
Expand Down
5 changes: 3 additions & 2 deletions pkg/client/auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ import (
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Auth"
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Operations"
"go.uber.org/zap"
"google.golang.org/protobuf/proto"

"github.com/ydb-platform/ydbops/pkg/client"
"github.com/ydb-platform/ydbops/pkg/client/connectionsfactory"
"github.com/ydb-platform/ydbops/pkg/utils"
"go.uber.org/zap"
"google.golang.org/protobuf/proto"
)

type Client interface {
Expand Down
3 changes: 2 additions & 1 deletion pkg/client/auth/credentials/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import (
"fmt"
"sync"

"go.uber.org/zap"

"github.com/ydb-platform/ydbops/pkg/client/connectionsfactory"
"github.com/ydb-platform/ydbops/pkg/command"
"github.com/ydb-platform/ydbops/pkg/options"
"go.uber.org/zap"
)

type Provider interface {
Expand Down
5 changes: 3 additions & 2 deletions pkg/client/auth/credentials/static.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import (
"context"
"sync"

"github.com/ydb-platform/ydbops/pkg/client/auth"
"github.com/ydb-platform/ydbops/pkg/client/connectionsfactory"
"go.uber.org/zap"
"google.golang.org/grpc/metadata"

"github.com/ydb-platform/ydbops/pkg/client/auth"
"github.com/ydb-platform/ydbops/pkg/client/connectionsfactory"
)

type staticCredentialsProvider struct {
Expand Down
7 changes: 4 additions & 3 deletions pkg/client/cms/cms.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ import (
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Cms"
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Operations"
"go.uber.org/zap"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/durationpb"

"github.com/ydb-platform/ydbops/internal/collections"
"github.com/ydb-platform/ydbops/pkg/client"
"github.com/ydb-platform/ydbops/pkg/client/auth/credentials"
"github.com/ydb-platform/ydbops/pkg/client/connectionsfactory"
"github.com/ydb-platform/ydbops/pkg/utils"
"go.uber.org/zap"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/durationpb"
)

const (
Expand Down
1 change: 1 addition & 0 deletions pkg/client/cms/maintenance.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (

"github.com/ydb-platform/ydb-go-genproto/draft/Ydb_Maintenance_V1"
"github.com/ydb-platform/ydb-go-genproto/draft/protos/Ydb_Maintenance"

"github.com/ydb-platform/ydbops/pkg/client"
)

Expand Down
3 changes: 2 additions & 1 deletion pkg/client/connectionsfactory/connections_factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ import (
"time"

"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Operations"
"github.com/ydb-platform/ydbops/pkg/command"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/protobuf/types/known/durationpb"

"github.com/ydb-platform/ydbops/pkg/command"
)

const (
Expand Down
5 changes: 3 additions & 2 deletions pkg/client/discovery/discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ import (
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Discovery"
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Operations"
"go.uber.org/zap"
"google.golang.org/protobuf/proto"

"github.com/ydb-platform/ydbops/pkg/client"
"github.com/ydb-platform/ydbops/pkg/client/auth/credentials"
"github.com/ydb-platform/ydbops/pkg/client/connectionsfactory"
"github.com/ydb-platform/ydbops/pkg/utils"
"go.uber.org/zap"
"google.golang.org/protobuf/proto"
)

type Discovery struct {
Expand Down
1 change: 1 addition & 0 deletions pkg/cmdutil/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package cmdutil

import (
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Operations"

"github.com/ydb-platform/ydbops/pkg/client/auth/credentials"
"github.com/ydb-platform/ydbops/pkg/client/cms"
"github.com/ydb-platform/ydbops/pkg/client/discovery"
Expand Down
1 change: 1 addition & 0 deletions pkg/command/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"path/filepath"

"github.com/spf13/pflag"

"github.com/ydb-platform/ydbops/pkg/options"
)

Expand Down
3 changes: 2 additions & 1 deletion pkg/maintenance/host.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import (

"github.com/google/uuid"
"github.com/ydb-platform/ydb-go-genproto/draft/protos/Ydb_Maintenance"
"github.com/ydb-platform/ydbops/pkg/client/cms"
"google.golang.org/protobuf/types/known/durationpb"

"github.com/ydb-platform/ydbops/pkg/client/cms"
)

const (
Expand Down
3 changes: 2 additions & 1 deletion pkg/options/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import (
"strings"

"github.com/spf13/pflag"
"github.com/ydb-platform/ydbops/pkg/profile"
"go.uber.org/zap"

"github.com/ydb-platform/ydbops/pkg/profile"
)

const (
Expand Down
1 change: 1 addition & 0 deletions pkg/options/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"strings"

"github.com/spf13/pflag"

"github.com/ydb-platform/ydbops/pkg/profile"
)

Expand Down
3 changes: 2 additions & 1 deletion pkg/options/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package options

import (
"github.com/spf13/pflag"
"github.com/ydb-platform/ydbops/internal/collections"
"go.uber.org/multierr"

"github.com/ydb-platform/ydbops/internal/collections"
)

// AdditionalFlag allows adding extra flags not defined in command
Expand Down
1 change: 1 addition & 0 deletions pkg/options/options_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

"github.com/ydb-platform/ydbops/pkg/utils"
)

Expand Down
1 change: 1 addition & 0 deletions pkg/prettyprint/prettyprint.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"time"

"github.com/ydb-platform/ydb-go-genproto/draft/protos/Ydb_Maintenance"

"github.com/ydb-platform/ydbops/pkg/client/cms"
)

Expand Down
3 changes: 2 additions & 1 deletion pkg/rolling/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ import (

"github.com/spf13/pflag"
"github.com/ydb-platform/ydb-go-genproto/draft/protos/Ydb_Maintenance"
"google.golang.org/protobuf/types/known/durationpb"

"github.com/ydb-platform/ydbops/internal/collections"
"github.com/ydb-platform/ydbops/pkg/options"
"github.com/ydb-platform/ydbops/pkg/profile"
"github.com/ydb-platform/ydbops/pkg/rolling/restarters"
"github.com/ydb-platform/ydbops/pkg/utils"
"google.golang.org/protobuf/types/known/durationpb"
)

const (
Expand Down
1 change: 1 addition & 0 deletions pkg/rolling/restarters/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package restarters

import (
"github.com/ydb-platform/ydb-go-genproto/draft/protos/Ydb_Maintenance"

"github.com/ydb-platform/ydbops/pkg/options"
)

Expand Down
3 changes: 2 additions & 1 deletion pkg/rolling/restarters/primitives.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import (
"strconv"

"github.com/ydb-platform/ydb-go-genproto/draft/protos/Ydb_Maintenance"
"go.uber.org/zap"

"github.com/ydb-platform/ydbops/internal/collections"
"github.com/ydb-platform/ydbops/pkg/options"
"go.uber.org/zap"
)

const (
Expand Down
1 change: 1 addition & 0 deletions pkg/rolling/restarters/storage_k8s_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

"github.com/ydb-platform/ydbops/pkg/options"
"github.com/ydb-platform/ydbops/tests/mock"
)
Expand Down
3 changes: 2 additions & 1 deletion pkg/rolling/restarters/storage_ssh_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"go.uber.org/zap"

"github.com/ydb-platform/ydbops/pkg/options"
"github.com/ydb-platform/ydbops/tests/mock"
"go.uber.org/zap"
)

var _ = Describe("Test storage ssh Filter", func() {
Expand Down
1 change: 1 addition & 0 deletions pkg/rolling/restarters/tenant_k8s_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

"github.com/ydb-platform/ydbops/pkg/options"
"github.com/ydb-platform/ydbops/tests/mock"
)
Expand Down
Loading

0 comments on commit 1e99f96

Please sign in to comment.