Merge branch 'master' into 1570-import-cmd-keys-options

This commit is contained in:
Yuce Tekol 2018-09-05 22:59:13 +03:00
commit 4efd11bb1f
No known key found for this signature in database
GPG key ID: CB59E46D2FB90573
5 changed files with 9 additions and 14 deletions

View file

@ -18,7 +18,6 @@ import (
"context"
"fmt"
"io"
"os"
"github.com/spf13/cobra"
@ -27,8 +26,8 @@ import (
var checker *ctl.CheckCommand
func newCheckCommand(_ io.Reader, _, _ io.Writer) *cobra.Command {
checker = ctl.NewCheckCommand(os.Stdin, os.Stdout, os.Stderr)
func newCheckCommand(stdin io.Reader, stdout io.Writer, stderr io.Writer) *cobra.Command {
checker = ctl.NewCheckCommand(stdin, stdout, stderr)
checkCmd := &cobra.Command{
Use: "check <path> [path2]...",
Short: "Do a consistency check on a pilosa data file.",

View file

@ -17,7 +17,6 @@ package cmd
import (
"context"
"io"
"os"
"github.com/spf13/cobra"
@ -28,7 +27,7 @@ import (
var conf *ctl.ConfigCommand
func newConfigCommand(stdin io.Reader, stdout, stderr io.Writer) *cobra.Command {
conf = ctl.NewConfigCommand(os.Stdin, os.Stdout, os.Stderr)
conf = ctl.NewConfigCommand(stdin, stdout, stderr)
Server := server.NewCommand(stdin, stdout, stderr)
confCmd := &cobra.Command{
Use: "config",

View file

@ -17,7 +17,6 @@ package cmd
import (
"context"
"io"
"os"
"github.com/spf13/cobra"
@ -26,8 +25,8 @@ import (
var Exporter *ctl.ExportCommand
func newExportCommand(_ io.Reader, _, _ io.Writer) *cobra.Command {
Exporter = ctl.NewExportCommand(os.Stdin, os.Stdout, os.Stderr)
func newExportCommand(stdin io.Reader, stdout, stderr io.Writer) *cobra.Command {
Exporter = ctl.NewExportCommand(stdin, stdout, stderr)
exportCmd := &cobra.Command{
Use: "export",
Short: "Export data from pilosa.",

View file

@ -17,7 +17,6 @@ package cmd
import (
"context"
"io"
"os"
"github.com/spf13/cobra"
@ -26,8 +25,8 @@ import (
var generateConf *ctl.GenerateConfigCommand
func newGenerateConfigCommand(_ io.Reader, _, _ io.Writer) *cobra.Command {
generateConf = ctl.NewGenerateConfigCommand(os.Stdin, os.Stdout, os.Stderr)
func newGenerateConfigCommand(stdin io.Reader, stdout io.Writer, stderr io.Writer) *cobra.Command {
generateConf = ctl.NewGenerateConfigCommand(stdin, stdout, stderr)
confCmd := &cobra.Command{
Use: "generate-config",
Short: "Print the default configuration.",

View file

@ -18,7 +18,6 @@ import (
"context"
"fmt"
"io"
"os"
"github.com/spf13/cobra"
@ -27,8 +26,8 @@ import (
var inspector *ctl.InspectCommand
func newInspectCommand(_ io.Reader, _, _ io.Writer) *cobra.Command {
inspector = ctl.NewInspectCommand(os.Stdin, os.Stdout, os.Stderr)
func newInspectCommand(stdin io.Reader, stdout, stderr io.Writer) *cobra.Command {
inspector = ctl.NewInspectCommand(stdin, stdout, stderr)
inspectCmd := &cobra.Command{
Use: "inspect",