ran goimports

ohsu-comp-bio · Jan 30, 2018 · 7af0be3 · 7af0be3
1 parent 84c117f
commit 7af0be3
Show file tree

Hide file tree

Showing 146 changed files with 378 additions and 232 deletions.
diff --git a/client/client.go b/client/client.go
@@ -4,16 +4,17 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/golang/protobuf/jsonpb"
-	"github.com/ohsu-comp-bio/funnel/proto/tes"
-	"github.com/ohsu-comp-bio/funnel/util"
-	"golang.org/x/net/context"
 	"net/http"
 	"net/url"
 	"os"
 	"regexp"
 	"strings"
 	"time"
+
+	"github.com/golang/protobuf/jsonpb"
+	"github.com/ohsu-comp-bio/funnel/proto/tes"
+	"github.com/ohsu-comp-bio/funnel/util"
+	"golang.org/x/net/context"
 )
 
 // NewClient returns a new HTTP client for accessing

diff --git a/client/client_test.go b/client/client_test.go
@@ -1,13 +1,14 @@
 package client
 
 import (
-	"github.com/ohsu-comp-bio/funnel/proto/tes"
-	"golang.org/x/net/context"
 	"net"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 	"time"
+
+	"github.com/ohsu-comp-bio/funnel/proto/tes"
+	"golang.org/x/net/context"
 )
 
 func testServer(mux http.Handler) *httptest.Server {

diff --git a/cmd/aws/batch/batchsvc.go b/cmd/aws/batch/batchsvc.go
@@ -3,14 +3,15 @@ package batch
 import (
 	"encoding/json"
 	"fmt"
+	"sort"
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/batch"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/iam"
 	util "github.com/ohsu-comp-bio/funnel/util/aws"
-	"sort"
-	"strings"
 )
 
 type errResourceExists struct{}

diff --git a/cmd/aws/batch/config.go b/cmd/aws/batch/config.go
@@ -1,8 +1,9 @@
 package batch
 
 import (
-	"github.com/ohsu-comp-bio/funnel/config"
 	"time"
+
+	"github.com/ohsu-comp-bio/funnel/config"
 )
 
 // Config represents configuration of the AWS proxy, including

diff --git a/cmd/aws/batch/createall.go b/cmd/aws/batch/createall.go
@@ -2,6 +2,7 @@ package batch
 
 import (
 	"fmt"
+
 	"github.com/ohsu-comp-bio/funnel/cmd/util"
 	"github.com/ohsu-comp-bio/funnel/config"
 	"github.com/ohsu-comp-bio/funnel/logger"

diff --git a/cmd/aws/batch/createjobdef.go b/cmd/aws/batch/createjobdef.go
@@ -2,6 +2,7 @@ package batch
 
 import (
 	"fmt"
+
 	"github.com/ohsu-comp-bio/funnel/cmd/util"
 	"github.com/ohsu-comp-bio/funnel/config"
 	"github.com/ohsu-comp-bio/funnel/logger"

diff --git a/cmd/examples/examples.go b/cmd/examples/examples.go
@@ -2,11 +2,12 @@ package examples
 
 import (
 	"fmt"
+	"path/filepath"
+	"strings"
+
 	"github.com/ohsu-comp-bio/funnel/config"
 	ex "github.com/ohsu-comp-bio/funnel/examples"
 	"github.com/spf13/cobra"
-	"path/filepath"
-	"strings"
 )
 
 // Cmd represents the examples command

diff --git a/cmd/gce/gce.go b/cmd/gce/gce.go
@@ -3,15 +3,16 @@ package gce
 import (
 	"context"
 	"fmt"
+	"syscall"
+	"time"
+
 	"github.com/ohsu-comp-bio/funnel/cmd/node"
 	"github.com/ohsu-comp-bio/funnel/cmd/server"
 	"github.com/ohsu-comp-bio/funnel/config"
 	"github.com/ohsu-comp-bio/funnel/config/gce"
 	"github.com/ohsu-comp-bio/funnel/logger"
 	"github.com/ohsu-comp-bio/funnel/util"
 	"github.com/spf13/cobra"
-	"syscall"
-	"time"
 )
 
 // Cmd represents the 'funnel gce" CLI command set.

diff --git a/cmd/gendocs.go b/cmd/gendocs.go
@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"os"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
-	"os"
 )
 
 var genMarkdownCmd = &cobra.Command{

diff --git a/cmd/node/node.go b/cmd/node/node.go
@@ -3,6 +3,7 @@ package node
 import (
 	"context"
 	"fmt"
+
 	cmdutil "github.com/ohsu-comp-bio/funnel/cmd/util"
 	"github.com/ohsu-comp-bio/funnel/config"
 	"github.com/ohsu-comp-bio/funnel/logger"

diff --git a/cmd/node/node_test.go b/cmd/node/node_test.go
@@ -2,11 +2,12 @@ package node
 
 import (
 	"context"
-	"github.com/ohsu-comp-bio/funnel/config"
-	"github.com/ohsu-comp-bio/funnel/logger"
 	"os"
 	"path"
 	"testing"
+
+	"github.com/ohsu-comp-bio/funnel/config"
+	"github.com/ohsu-comp-bio/funnel/logger"
 )
 
 func TestPersistentPreRun(t *testing.T) {

diff --git a/cmd/node/run.go b/cmd/node/run.go
@@ -2,13 +2,14 @@ package node
 
 import (
 	"context"
+	"syscall"
+	"time"
+
 	workerCmd "github.com/ohsu-comp-bio/funnel/cmd/worker"
 	"github.com/ohsu-comp-bio/funnel/compute/scheduler"
 	"github.com/ohsu-comp-bio/funnel/config"
 	"github.com/ohsu-comp-bio/funnel/logger"
 	"github.com/ohsu-comp-bio/funnel/util"
-	"syscall"
-	"time"
 )
 
 // Run runs a node with the given config, blocking until the node exits.

diff --git a/cmd/run/cmd.go b/cmd/run/cmd.go
@@ -2,11 +2,12 @@ package run
 
 import (
 	"bufio"
+	"os"
+
 	"github.com/kballard/go-shellquote"
 	"github.com/ohsu-comp-bio/funnel/client"
 	"github.com/ohsu-comp-bio/funnel/proto/tes"
 	"github.com/spf13/cobra"
-	"os"
 )
 
 // *********************************************************************

diff --git a/cmd/run/cmd_test.go b/cmd/run/cmd_test.go
@@ -1,10 +1,11 @@
 package run
 
 import (
-	"github.com/go-test/deep"
-	"github.com/ohsu-comp-bio/funnel/proto/tes"
 	"os"
 	"testing"
+
+	"github.com/go-test/deep"
+	"github.com/ohsu-comp-bio/funnel/proto/tes"
 )
 
 func TestParse(t *testing.T) {

diff --git a/cmd/run/flags.go b/cmd/run/flags.go
@@ -2,11 +2,12 @@ package run
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
+
 	"github.com/kballard/go-shellquote"
 	"github.com/ohsu-comp-bio/funnel/cmd/util"
 	"github.com/spf13/pflag"
-	"io/ioutil"
-	"os"
 )
 
 // *********************************************************************

diff --git a/cmd/run/parse_vars.go b/cmd/run/parse_vars.go
@@ -3,12 +3,13 @@ package run
 import (
 	"errors"
 	"fmt"
-	"github.com/kballard/go-shellquote"
-	"github.com/ohsu-comp-bio/funnel/proto/tes"
 	"io/ioutil"
 	"path/filepath"
 	"regexp"
 	"strings"
+
+	"github.com/kballard/go-shellquote"
+	"github.com/ohsu-comp-bio/funnel/proto/tes"
 )
 
 // ErrKeyFmt describes an error in input/output/env/tag flag formatting

diff --git a/cmd/run/task_group.go b/cmd/run/task_group.go
@@ -2,10 +2,11 @@ package run
 
 import (
 	"fmt"
+	"sync"
+
 	"github.com/ohsu-comp-bio/funnel/client"
 	"github.com/ohsu-comp-bio/funnel/proto/tes"
 	"golang.org/x/net/context"
-	"sync"
 )
 
 type taskGroup struct {

diff --git a/cmd/server/run.go b/cmd/server/run.go
@@ -3,6 +3,8 @@ package server
 import (
 	"context"
 	"fmt"
+	"strings"
+
 	"github.com/ohsu-comp-bio/funnel/compute/batch"
 	"github.com/ohsu-comp-bio/funnel/compute/gridengine"
 	"github.com/ohsu-comp-bio/funnel/compute/htcondor"
@@ -22,7 +24,6 @@ import (
 	"github.com/ohsu-comp-bio/funnel/server/dynamodb"
 	"github.com/ohsu-comp-bio/funnel/server/elastic"
 	"github.com/ohsu-comp-bio/funnel/server/mongodb"
-	"strings"
 )
 
 // Run runs the "server run" command.

diff --git a/cmd/server/server.go b/cmd/server/server.go
@@ -3,13 +3,14 @@ package server
 import (
 	"context"
 	"fmt"
+	"syscall"
+	"time"
+
 	cmdutil "github.com/ohsu-comp-bio/funnel/cmd/util"
 	"github.com/ohsu-comp-bio/funnel/config"
 	"github.com/ohsu-comp-bio/funnel/logger"
 	"github.com/ohsu-comp-bio/funnel/util"
 	"github.com/spf13/cobra"
-	"syscall"
-	"time"
 )
 
 // NewCommand returns the node command

diff --git a/cmd/server/server_test.go b/cmd/server/server_test.go
@@ -2,9 +2,10 @@ package server
 
 import (
 	"context"
+	"testing"
+
 	"github.com/ohsu-comp-bio/funnel/config"
 	"github.com/ohsu-comp-bio/funnel/logger"
-	"testing"
 )
 
 func TestPersistentPreRun(t *testing.T) {

diff --git a/cmd/task/cancel.go b/cmd/task/cancel.go
@@ -2,10 +2,11 @@ package task
 
 import (
 	"fmt"
+	"io"
+
 	"github.com/ohsu-comp-bio/funnel/client"
 	"github.com/ohsu-comp-bio/funnel/proto/tes"
 	"golang.org/x/net/context"
-	"io"
 )
 
 // Cancel runs the "task cancel" CLI command, which connects to the server,

diff --git a/cmd/task/create.go b/cmd/task/create.go
@@ -2,12 +2,13 @@ package task
 
 import (
 	"fmt"
+	"io"
+	"os"
+
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/ohsu-comp-bio/funnel/client"
 	"github.com/ohsu-comp-bio/funnel/proto/tes"
 	"golang.org/x/net/context"
-	"io"
-	"os"
 )
 
 // Create runs the "task create" CLI command, connecting to the server,

diff --git a/cmd/task/get.go b/cmd/task/get.go
@@ -2,10 +2,11 @@ package task
 
 import (
 	"fmt"
+	"io"
+
 	"github.com/ohsu-comp-bio/funnel/client"
 	"github.com/ohsu-comp-bio/funnel/proto/tes"
 	"golang.org/x/net/context"
-	"io"
 )
 
 // Get runs the "task get" CLI command, which connects to the server,

diff --git a/cmd/task/list.go b/cmd/task/list.go
@@ -2,10 +2,11 @@ package task
 
 import (
 	"fmt"
+	"io"
+
 	"github.com/ohsu-comp-bio/funnel/client"
 	"github.com/ohsu-comp-bio/funnel/proto/tes"
 	"golang.org/x/net/context"
-	"io"
 )
 
 // List runs the "task list" CLI command, which connects to the server,

diff --git a/cmd/task/task.go b/cmd/task/task.go
@@ -2,12 +2,13 @@ package task
 
 import (
 	"fmt"
-	"github.com/ohsu-comp-bio/funnel/cmd/util"
-	"github.com/ohsu-comp-bio/funnel/proto/tes"
-	"github.com/spf13/cobra"
 	"io"
 	"os"
 	"strings"
+
+	"github.com/ohsu-comp-bio/funnel/cmd/util"
+	"github.com/ohsu-comp-bio/funnel/proto/tes"
+	"github.com/spf13/cobra"
 )
 
 // NewCommand returns the "task" subcommands.

diff --git a/cmd/termdash/cursor.go b/cmd/termdash/cursor.go
@@ -5,8 +5,9 @@ package termdash
 
 import (
 	"fmt"
-	ui "github.com/gizak/termui"
 	"math"
+
+	ui "github.com/gizak/termui"
 )
 
 type GridCursor struct {

diff --git a/cmd/termdash/expanded/taskinfo.go b/cmd/termdash/expanded/taskinfo.go
@@ -2,9 +2,10 @@ package expanded
 
 import (
 	"fmt"
+	"strings"
+
 	ui "github.com/gizak/termui"
 	"github.com/ohsu-comp-bio/funnel/proto/tes"
-	"strings"
 )
 
 var displayInfo = []string{"id", "state", "name", "description", "tags"}

diff --git a/cmd/termdash/expanded/taskjson.go b/cmd/termdash/expanded/taskjson.go
@@ -1,9 +1,10 @@
 package expanded
 
 import (
+	"strings"
+
 	ui "github.com/gizak/termui"
 	"github.com/ohsu-comp-bio/funnel/proto/tes"
-	"strings"
 )
 
 type JSON struct {