projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17717: address further review comments: remove unused code and refactor
[arvados.git]
/
lib
/
costanalyzer
/
cmd.go
diff --git
a/lib/costanalyzer/cmd.go
b/lib/costanalyzer/cmd.go
index 9b0685225b788ba2bf35b469eded10575367e2c3..c44f328620bdf3f6c9ba9afbde46cf1e9de35cc1 100644
(file)
--- a/
lib/costanalyzer/cmd.go
+++ b/
lib/costanalyzer/cmd.go
@@
-6,15
+6,21
@@
package costanalyzer
import (
"io"
import (
"io"
+ "time"
- "git.arvados.org/arvados.git/lib/config"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
"github.com/sirupsen/logrus"
)
"git.arvados.org/arvados.git/sdk/go/ctxlog"
"github.com/sirupsen/logrus"
)
-var Command
command
+var Command
= &command{}
-type command struct{}
+type command struct {
+ uuids arrayFlags
+ resultsDir string
+ cache bool
+ begin time.Time
+ end time.Time
+}
type NoPrefixFormatter struct{}
type NoPrefixFormatter struct{}
@@
-23,7
+29,7
@@
func (f *NoPrefixFormatter) Format(entry *logrus.Entry) ([]byte, error) {
}
// RunCommand implements the subcommand "costanalyzer <collection> <collection> ..."
}
// RunCommand implements the subcommand "costanalyzer <collection> <collection> ..."
-func (command) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
+func (c
*c
ommand) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
var err error
logger := ctxlog.New(stderr, "text", "info")
defer func() {
var err error
logger := ctxlog.New(stderr, "text", "info")
defer func() {
@@
-34,10
+40,7
@@
func (command) RunCommand(prog string, args []string, stdin io.Reader, stdout, s
logger.SetFormatter(new(NoPrefixFormatter))
logger.SetFormatter(new(NoPrefixFormatter))
- loader := config.NewLoader(stdin, logger)
- loader.SkipLegacy = true
-
- exitcode, err := costanalyzer(prog, args, loader, logger, stdout, stderr)
+ exitcode, err := c.costAnalyzer(prog, args, logger, stdout, stderr)
return exitcode
}
return exitcode
}