Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Format sources and order imports with the help of goimports #1504

Merged
merged 2 commits into from
Aug 5, 2019
+24 −22
Merged

Format sources and order imports with the help of goimports #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f314f4f
Format sources and order imports with the help of goimports
muesli Jul 26, 2019
eebccc1
Merge branch 'master' into format-fixes
jessesuen Aug 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions cmd/argoexec/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ import (
"encoding/json"
"os"

"github.com/argoproj/argo/util"

"github.com/argoproj/pkg/cli"
kubecli "github.com/argoproj/pkg/kube/cli"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"

"github.com/argoproj/argo"
"github.com/argoproj/argo/util"
"github.com/argoproj/argo/util/cmd"
"github.com/argoproj/argo/workflow/common"
"github.com/argoproj/argo/workflow/executor"
"github.com/argoproj/argo/workflow/executor/docker"
"github.com/argoproj/argo/workflow/executor/k8sapi"
"github.com/argoproj/argo/workflow/executor/kubelet"
"github.com/argoproj/argo/workflow/executor/pns"
"github.com/argoproj/pkg/cli"
kubecli "github.com/argoproj/pkg/kube/cli"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package e2e
import (
"flag"

"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
Expand Down
6 changes: 4 additions & 2 deletions util/file/fileutil_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ package file_test
import (
"archive/tar"
"bytes"
"github.com/argoproj/argo/util/file"
"github.com/stretchr/testify/assert"
"os"
"testing"

"github.com/stretchr/testify/assert"

"github.com/argoproj/argo/util/file"
)

// TestResubmitWorkflowWithOnExit ensures we do not carry over the onExit node even if successful
Expand Down
3 changes: 2 additions & 1 deletion workflow/artifacts/raw/raw_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import (
"testing"
"time"

"github.com/stretchr/testify/assert"

wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/workflow/artifacts/raw"
"github.com/stretchr/testify/assert"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions workflow/controller/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ import (
"io/ioutil"
"testing"

"github.com/argoproj/argo/workflow/config"

wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
fakewfclientset "github.com/argoproj/argo/pkg/client/clientset/versioned/fake"
"github.com/ghodss/yaml"
"github.com/stretchr/testify/assert"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/fake"

wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
fakewfclientset "github.com/argoproj/argo/pkg/client/clientset/versioned/fake"
"github.com/argoproj/argo/workflow/config"
)

var helloWorldWf = `
Expand Down
3 changes: 2 additions & 1 deletion workflow/controller/dag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import (
"fmt"
"strings"

"github.com/valyala/fasttemplate"

"github.com/argoproj/argo/errors"
wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/workflow/common"
"github.com/argoproj/argo/workflow/templateresolution"
"github.com/valyala/fasttemplate"
)

// dagContext holds context information about this context's DAG
Expand Down
12 changes: 6 additions & 6 deletions workflow/controller/operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ import (
"strings"
"testing"

"github.com/argoproj/argo/workflow/config"

wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/test"
"github.com/argoproj/argo/workflow/common"
"github.com/argoproj/argo/workflow/util"
"github.com/ghodss/yaml"
"github.com/stretchr/testify/assert"
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/test"
"github.com/argoproj/argo/workflow/common"
"github.com/argoproj/argo/workflow/config"
"github.com/argoproj/argo/workflow/util"
)

// TestOperateWorkflowPanicRecover ensures we can recover from unexpected panics
Expand Down
5 changes: 2 additions & 3 deletions workflow/executor/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ import (
"syscall"
"time"

"github.com/argoproj/argo/util"

argofile "github.com/argoproj/pkg/file"
log "github.com/sirupsen/logrus"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -32,6 +29,7 @@ import (

"github.com/argoproj/argo/errors"
wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/util"
"github.com/argoproj/argo/util/archive"
"github.com/argoproj/argo/util/retry"
artifact "github.com/argoproj/argo/workflow/artifacts"
Expand All @@ -42,6 +40,7 @@ import (
"github.com/argoproj/argo/workflow/artifacts/raw"
"github.com/argoproj/argo/workflow/artifacts/s3"
"github.com/argoproj/argo/workflow/common"
argofile "github.com/argoproj/pkg/file"
)

const (
Expand Down