Skip to content

Commit 3d11cf7

Browse files
ldmonsterldmonster
authored
[deckhouse-cli] fix/lint another (#217)
Signed-off-by: Pavel Okhlopkov <[email protected]>
1 parent 9e1616f commit 3d11cf7

File tree

32 files changed

+122
-139
lines changed

32 files changed

+122
-139
lines changed

‎internal/backup/cmd/etcd/etcd.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
"k8s.io/apimachinery/pkg/runtime"
3434
"k8s.io/client-go/kubernetes"
35-
_ "k8s.io/client-go/plugin/pkg/client/auth"
35+
_ "k8s.io/client-go/plugin/pkg/client/auth" // Register auth plugins
3636
"k8s.io/client-go/rest"
3737
"k8s.io/client-go/tools/remotecommand"
3838
"k8s.io/kubectl/pkg/util/templates"
@@ -55,7 +55,7 @@ func NewCommand() *cobra.Command {
5555
ValidArgs: []string{"snapshot-path"},
5656
SilenceErrors: true,
5757
SilenceUsage: true,
58-
PreRunE: func(cmd *cobra.Command, args []string) error {
58+
PreRunE: func(cmd *cobra.Command, _ []string) error {
5959
return validateFlags(cmd)
6060
},
6161
RunE: etcd,

‎internal/backup/cmd/loki/flags.go‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ limitations under the License.
1717
package loki
1818

1919
import (
20-
"fmt"
21-
"os"
22-
23-
"github.com/spf13/cobra"
2420
"github.com/spf13/pflag"
2521
)
2622

@@ -50,20 +46,3 @@ func addFlags(flagSet *pflag.FlagSet) {
5046
"Limit maximum number of days in range to output per queue from Loki. (Default 5 maximum number of days in range per queue.)",
5147
)
5248
}
53-
54-
func validateFlags(cmd *cobra.Command) error {
55-
kubeconfigPath, err := cmd.Flags().GetString("kubeconfig")
56-
if err != nil {
57-
return fmt.Errorf("Failed to setup Kubernetes client: %w", err)
58-
}
59-
60-
stats, err := os.Stat(kubeconfigPath)
61-
if err != nil {
62-
return fmt.Errorf("Invalid --kubeconfig: %w", err)
63-
}
64-
if !stats.Mode().IsRegular() {
65-
return fmt.Errorf("Invalid --kubeconfig: %s is not a regular file", kubeconfigPath)
66-
}
67-
68-
return nil
69-
}

‎internal/backup/cmd/loki/loki.go‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/spf13/cobra"
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
"k8s.io/client-go/kubernetes"
33-
_ "k8s.io/client-go/plugin/pkg/client/auth"
33+
_ "k8s.io/client-go/plugin/pkg/client/auth" // Register auth plugins
3434
"k8s.io/client-go/rest"
3535
"k8s.io/client-go/tools/remotecommand"
3636
"k8s.io/kubectl/pkg/util/templates"
@@ -130,6 +130,9 @@ func backupLoki(cmd *cobra.Command, _ []string) error {
130130
chunkStart := chunkEnd - chunkSize.Nanoseconds()
131131
if startTimestamp != "" {
132132
chunkStart, err = getStartTimestamp()
133+
if err != nil {
134+
return err
135+
}
133136
}
134137
curlParamStreamList := CurlRequest{
135138
BaseURL: "series",
@@ -152,7 +155,7 @@ func backupLoki(cmd *cobra.Command, _ []string) error {
152155
}
153156

154157
for _, r := range streamListDumpJSON.Data {
155-
err := fetchLogs(chunkStart, chunkEnd, endDumpTimestamp, token, r, config, kubeCl)
158+
err := fetchLogs(chunkStart, endDumpTimestamp, token, r, config, kubeCl)
156159
if err != nil {
157160
return fmt.Errorf("error get logs from loki: %w", err)
158161
}
@@ -161,14 +164,14 @@ func backupLoki(cmd *cobra.Command, _ []string) error {
161164
return nil
162165
}
163166

164-
func fetchLogs(chunkStart, chunkEnd, endDumpTimestamp int64, token string, r map[string]string, config *rest.Config, kubeCl kubernetes.Interface) error {
165-
var filters []string
167+
func fetchLogs(chunkStart, endDumpTimestamp int64, token string, r map[string]string, config *rest.Config, kubeCl kubernetes.Interface) error {
168+
filters := make([]string, 0, len(r))
166169
for key, value := range r {
167170
filters = append(filters, fmt.Sprintf(`%s=%q`, key, value))
168171
}
169172
q := fmt.Sprintf(`{%s}`, strings.Join(filters, ", "))
170173

171-
chunkEnd = endDumpTimestamp
174+
chunkEnd := endDumpTimestamp
172175
for chunkEnd > chunkStart {
173176
curlParamDumpLog := CurlRequest{
174177
BaseURL: "query_range",
@@ -213,7 +216,7 @@ func fetchLogs(chunkStart, chunkEnd, endDumpTimestamp int64, token string, r map
213216
}
214217

215218
func (c *CurlRequest) GenerateCurlCommand() []string {
216-
curlParts := append([]string{"curl", "--insecure", "-v"})
219+
curlParts := []string{"curl", "--insecure", "-v"}
217220
curlParts = append(curlParts, fmt.Sprintf("%s/%s", lokiURL, c.BaseURL))
218221
for key, value := range c.Params {
219222
if value != "" {
@@ -341,7 +344,7 @@ func getLogWithRetry(config *rest.Config, kubeCl kubernetes.Interface, fullComma
341344
context.TODO(),
342345
Logger,
343346
"error get json response from Loki",
344-
task.WithConstantRetries(5, 10*time.Second, func(ctx context.Context) error {
347+
task.WithConstantRetries(5, 10*time.Second, func(_ context.Context) error {
345348
QueryRangeDump, SeriesAPIDump, err = getLogTimestamp(config, kubeCl, fullCommand)
346349
if err != nil {
347350
return fmt.Errorf("error get JSON response from loki: %w", err)

‎internal/backup/configs/crds/custom_resources.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,5 @@ func BackupCustomResources(
9494
})
9595
})
9696

97-
result := append(nsResources, cwResources...)
98-
return lo.Flatten(result), nil
97+
return lo.Flatten(append(nsResources, cwResources...)), nil
9998
}

‎internal/backup/configs/secrets/backup.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func BackupSecrets(
2424
return strings.HasPrefix(item, "d8-") || strings.HasPrefix(item, "kube-")
2525
})
2626

27-
secrets := lo.Map(namespaces, func(namespace string, index int) []runtime.Object {
27+
secrets := lo.Map(namespaces, func(namespace string, _ int) []runtime.Object {
2828
list, err := kubeCl.CoreV1().Secrets(namespace).List(context.TODO(), metav1.ListOptions{})
2929
if err != nil {
3030
log.Fatalf("Failed to list secrets from : %v", err)

‎internal/data/cmd/data.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
deDelete "github.com/deckhouse/deckhouse-cli/internal/data/dataexport/cmd/delete"
2828
deDownload "github.com/deckhouse/deckhouse-cli/internal/data/dataexport/cmd/download"
2929
deList "github.com/deckhouse/deckhouse-cli/internal/data/dataexport/cmd/list"
30-
3130
diCreate "github.com/deckhouse/deckhouse-cli/internal/data/dataimport/cmd/create"
3231
diDelete "github.com/deckhouse/deckhouse-cli/internal/data/dataimport/cmd/delete"
3332
diUpload "github.com/deckhouse/deckhouse-cli/internal/data/dataimport/cmd/upload"
@@ -51,7 +50,7 @@ func NewCommand() *cobra.Command {
5150
SilenceUsage: true,
5251
SilenceErrors: true,
5352
Run: func(cmd *cobra.Command, _ []string) {
54-
cmd.Help()
53+
_ = cmd.Help()
5554
},
5655
}
5756

@@ -65,7 +64,7 @@ func NewCommand() *cobra.Command {
6564
Short: "Export data (DataExport)",
6665
SilenceUsage: true,
6766
SilenceErrors: true,
68-
Run: func(cmd *cobra.Command, _ []string) { cmd.Help() },
67+
Run: func(cmd *cobra.Command, _ []string) { _ = cmd.Help() },
6968
}
7069
exportCmd.AddCommand(
7170
deCreate.NewCommand(ctx, logger),
@@ -79,7 +78,7 @@ func NewCommand() *cobra.Command {
7978
Short: "Import data (DataImport)",
8079
SilenceUsage: true,
8180
SilenceErrors: true,
82-
Run: func(cmd *cobra.Command, _ []string) { cmd.Help() },
81+
Run: func(cmd *cobra.Command, _ []string) { _ = cmd.Help() },
8382
}
8483
importCmd.AddCommand(
8584
diCreate.NewCommand(ctx, logger),
@@ -109,7 +108,7 @@ func NewCommand() *cobra.Command {
109108
RunE: func(c *cobra.Command, args []string) error {
110109
c.Println("WARNING: 'd8 data list' is deprecated and will be removed. Use 'd8 data export list'.")
111110
return exportListRun(ctx, logger, c, args)
112-
},
111+
},
113112
}
114113
deprecatedList.Flags().StringP("namespace", "n", "d8-data-exporter", "data volume namespace")
115114
deprecatedList.Flags().Bool("publish", false, "Provide access outside of cluster")

‎internal/data/common.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ func AskYesNoWithTimeout(prompt string, timeout time.Duration) bool {
4040
if slices.Contains([]string{"y", "n"}, input) {
4141
inputChan <- strings.TrimSpace(input)
4242
return
43-
} else {
44-
fmt.Println("Invalid input. Please press 'y' or 'n'.")
4543
}
44+
fmt.Println("Invalid input. Please press 'y' or 'n'.")
4645
}
4746
}()
4847

‎internal/data/dataexport/api/v1alpha1/data_export.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v1alpha1
22

33
import (
4-
_ "k8s.io/apimachinery/pkg/api/resource"
4+
_ "k8s.io/apimachinery/pkg/api/resource" // Register resource.Quantity types
55
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
66
)
77

‎internal/data/dataexport/cmd/create/create.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525

2626
"github.com/spf13/cobra"
2727

28+
dataio "github.com/deckhouse/deckhouse-cli/internal/data"
2829
"github.com/deckhouse/deckhouse-cli/internal/data/dataexport/api/v1alpha1"
2930
"github.com/deckhouse/deckhouse-cli/internal/data/dataexport/util"
30-
dataio "github.com/deckhouse/deckhouse-cli/internal/data"
3131
safeClient "github.com/deckhouse/deckhouse-cli/pkg/libsaferequest/client"
3232
)
3333

@@ -53,7 +53,7 @@ func NewCommand(ctx context.Context, log *slog.Logger) *cobra.Command {
5353
RunE: func(cmd *cobra.Command, args []string) error {
5454
return Run(ctx, log, cmd, args)
5555
},
56-
Args: func(cmd *cobra.Command, args []string) error {
56+
Args: func(_ *cobra.Command, args []string) error {
5757
_, _, _, err := parseArgs(args)
5858
return err
5959
},

‎internal/data/dataexport/cmd/dataexport.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func NewCommand() *cobra.Command {
4242
SilenceUsage: true,
4343
SilenceErrors: true,
4444
Run: func(cmd *cobra.Command, _ []string) {
45-
cmd.Help()
45+
_ = cmd.Help()
4646
},
4747
}
4848

0 commit comments

Comments
 (0)