ginkgo blur

Signed-off-by: Jamie Klassen <cklassen@pivotal.io>

atc/api/config_test.go

@@ -13,9 +13,9 @@ import (
 	"github.com/concourse/concourse/atc/creds/noop"
 	"github.com/concourse/concourse/atc/db"
 	"github.com/concourse/concourse/atc/db/dbfakes"
-	"sigs.k8s.io/yaml"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/tedsuo/rata"
+	"sigs.k8s.io/yaml"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

atc/api/configserver/save.go

@@ -1,11 +1,11 @@
 package configserver
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"context"
 
 	"code.cloudfoundry.org/lager"
 	"github.com/concourse/concourse/atc"
@@ -13,9 +13,9 @@ import (
 	"github.com/concourse/concourse/atc/db"
 	"github.com/concourse/concourse/atc/exec"
 	"github.com/concourse/concourse/vars"
-	"sigs.k8s.io/yaml"
 	"github.com/hashicorp/go-multierror"
 	"github.com/tedsuo/rata"
+	"sigs.k8s.io/yaml"
 )
 
 func (s *Server) SaveConfig(w http.ResponseWriter, r *http.Request) {

atc/exec/step.go

@@ -5,10 +5,10 @@ import (
 	"io"
 
 	"code.cloudfoundry.org/lager"
-	"github.com/concourse/concourse/vars"
 	"github.com/concourse/concourse/atc"
 	"github.com/concourse/concourse/atc/db"
 	"github.com/concourse/concourse/atc/exec/artifact"
+	"github.com/concourse/concourse/vars"
 )
 
 //go:generate counterfeiter . Step

atc/exec/task_config_source.go

@@ -80,7 +80,7 @@ func (configSource FileConfigSource) FetchConfig(ctx context.Context, logger lag
 		return atc.TaskConfig{}, UnknownArtifactSourceError{sourceName, configSource.ConfigPath}
 	}
 
-	// This context is not passed down yet because it would pollute the 
+	// This context is not passed down yet because it would pollute the
 	// TaskConfigSource Interface as all the FetchConfigs will be need to have this passed in.
 	stream, err := source.StreamFile(ctx, logger, filePath)
 	if err != nil {

atc/exec/task_config_source_test.go

@@ -1,8 +1,8 @@
 package exec_test
 
 import (
-	"errors"
 	"context"
+	"errors"
 
 	"code.cloudfoundry.org/lager/lagertest"
 	"github.com/concourse/baggageclaim"
@@ -12,10 +12,10 @@ import (
 	"github.com/concourse/concourse/atc/exec/execfakes"
 	"github.com/concourse/concourse/atc/worker/workerfakes"
 	"github.com/concourse/concourse/vars"
-	"sigs.k8s.io/yaml"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
+	"sigs.k8s.io/yaml"
 )
 
 var _ = Describe("TaskConfigSource", func() {

fly/commands/internal/setpipelinehelpers/diff.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/aryann/difflib"
 	"github.com/concourse/concourse/atc"
-	"sigs.k8s.io/yaml"
 	"github.com/mgutz/ansi"
 	"github.com/onsi/gomega/gexec"
+	"sigs.k8s.io/yaml"
 )
 
 type Index interface {

fly/integration/get_pipeline_test.go

@@ -8,11 +8,11 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"sigs.k8s.io/yaml"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 	"github.com/onsi/gomega/ghttp"
 	"github.com/tedsuo/rata"
+	"sigs.k8s.io/yaml"
 
 	"github.com/concourse/concourse/atc"
 )

fly/integration/get_team_test.go

@@ -5,13 +5,13 @@ import (
 	"os/exec"
 
 	"github.com/concourse/concourse/atc"
-	"sigs.k8s.io/yaml"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 	"github.com/onsi/gomega/ghttp"
 	"github.com/tedsuo/rata"
+	"sigs.k8s.io/yaml"
 )
 
 var _ = Describe("GetPipeline", func() {

fly/integration/login_test.go

@@ -509,7 +509,7 @@ var _ = Describe("login Command", func() {
 					Expect(corsHeader).To(Equal(loginATCServer.URL()))
 				})
 
-				FIt("redirects back to noop fly success page", func() {
+				It("redirects back to noop fly success page", func() {
 					Expect(resp.StatusCode).To(Equal(http.StatusFound))
 					locationHeader := resp.Header.Get("Location")
 					Expect(locationHeader).To(Equal(fmt.Sprintf("%s/fly_success?noop=true", loginATCServer.URL())))

fly/integration/set_pipeline_test.go

@@ -13,12 +13,12 @@ import (
 	. "github.com/onsi/gomega"
 
 	"code.cloudfoundry.org/urljoiner"
-	"sigs.k8s.io/yaml"
 	"github.com/mgutz/ansi"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 	"github.com/onsi/gomega/ghttp"
 	"github.com/tedsuo/rata"
+	"sigs.k8s.io/yaml"
 
 	"github.com/concourse/concourse/atc"
 )

fly/rc/target_test.go

@@ -10,8 +10,8 @@ import (
 	"runtime"
 
 	"github.com/concourse/concourse/fly/rc"
-	"sigs.k8s.io/yaml"
 	"golang.org/x/oauth2"
+	"sigs.k8s.io/yaml"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

skymarshal/skycmd/flags.go

@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/concourse/flag"
-	"sigs.k8s.io/yaml"
 	flags "github.com/jessevdk/go-flags"
 	"github.com/mitchellh/mapstructure"
+	"sigs.k8s.io/yaml"
 )
 
 var ErrAuthNotConfiguredFromFlags = errors.New("ErrAuthNotConfiguredFromFlags")

topgun/both/both_suite_test.go

@@ -15,7 +15,6 @@ import (
 	. "github.com/concourse/concourse/topgun/common"
 )
 
-
 var (
 	deploymentNamePrefix string
 
@@ -53,4 +52,3 @@ func TestTOPGUN(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "TOPGUN Suite")
 }
-

topgun/both/build_container_gc_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/concourse/concourse/topgun/common"
 	sq "github.com/Masterminds/squirrel"
+	. "github.com/concourse/concourse/topgun/common"
 	_ "github.com/lib/pq"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

topgun/both/pipeline_destroyed_test.go

@@ -3,8 +3,8 @@ package topgun_test
 import (
 	"time"
 
-	. "github.com/concourse/concourse/topgun/common"
 	"code.cloudfoundry.org/garden"
+	. "github.com/concourse/concourse/topgun/common"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

topgun/both/resource_check_test.go

@@ -1,11 +1,10 @@
 package topgun_test
 
 import (
+	. "github.com/concourse/concourse/topgun/common"
 	_ "github.com/lib/pq"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	. "github.com/concourse/concourse/topgun/common"
-
 )
 
 var _ = Describe("Resource checking", func() {

topgun/both/resource_containers_gc_test.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"time"
 
-
 	. "github.com/concourse/concourse/topgun/common"
 	_ "github.com/lib/pq"
 	. "github.com/onsi/ginkgo"

topgun/both/resource_types_test.go

@@ -1,10 +1,10 @@
 package topgun_test
 
 import (
+	. "github.com/concourse/concourse/topgun/common"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
-	. "github.com/concourse/concourse/topgun/common"
 )
 
 var _ = Describe("A pipeline-provided resource type", func() {

topgun/both/volume_gc_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/concourse/concourse/topgun/common"
 	sq "github.com/Masterminds/squirrel"
+	. "github.com/concourse/concourse/topgun/common"
 	_ "github.com/lib/pq"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

topgun/common/common.go

@@ -16,9 +16,9 @@ import (
 
 	gclient "code.cloudfoundry.org/garden/client"
 	gconn "code.cloudfoundry.org/garden/client/connection"
- 	sq "github.com/Masterminds/squirrel"
 	"code.cloudfoundry.org/lager"
 	"code.cloudfoundry.org/lager/lagertest"
+	sq "github.com/Masterminds/squirrel"
 	bclient "github.com/concourse/baggageclaim/client"
 	"golang.org/x/oauth2"
 
@@ -29,7 +29,6 @@ import (
 	"github.com/onsi/gomega/gexec"
 )
 
-
 var (
 	deploymentNamePrefix string
 
@@ -168,7 +167,6 @@ type BoshInstance struct {
 	DNS   string
 }
 
-
 func StartDeploy(manifest string, args ...string) *gexec.Session {
 	WaitForDeploymentLock()
 
@@ -259,7 +257,6 @@ func JobInstances(job string) []BoshInstance {
 	return jobInstances[job]
 }
 
-
 func LoadJobInstances() (map[string][]BoshInstance, map[string][]BoshInstance) {
 	session := SpawnBosh("instances", "-p", "--dns")
 	<-session.Exited
@@ -555,7 +552,6 @@ func PgDump() *gexec.Session {
 	return session
 }
 
-
 var psql = sq.StatementBuilder.PlaceholderFormat(sq.Dollar)
 
 var _ = SynchronizedBeforeSuite(func() []byte {
@@ -571,4 +567,3 @@ var _ = SynchronizedAfterSuite(func() {
 
 var InstanceRow = regexp.MustCompile(`^([^/]+)/([^\s]+)\s+-\s+(\w+)\s+z1\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\s+([^\s]+)\s*$`)
 var JobRow = regexp.MustCompile(`^([^\s]+)\s+(\w+)\s+(\w+)\s+-\s+-\s+-\s*$`)
-

topgun/core/containers_scoped_to_team_test.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"strconv"
 
+	. "github.com/concourse/concourse/topgun/common"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	. "github.com/concourse/concourse/topgun/common"
 	"github.com/onsi/gomega/gbytes"
 )
 

topgun/core/vault_test.go

@@ -13,8 +13,8 @@ import (
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/concourse/concourse/topgun/common"
 	. "github.com/concourse/concourse/topgun"
+	. "github.com/concourse/concourse/topgun/common"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

topgun/pcf/pcf_suite_test.go

@@ -15,7 +15,6 @@ import (
 	. "github.com/concourse/concourse/topgun/common"
 )
 
-
 var (
 	deploymentNamePrefix string
 
@@ -53,4 +52,3 @@ func TestTOPGUN(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "TOPGUN Suite")
 }
-

topgun/runtime/default_limits_test.go

@@ -1,9 +1,9 @@
 package topgun_test
 
 import (
+	. "github.com/concourse/concourse/topgun/common"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	. "github.com/concourse/concourse/topgun/common"
 	"github.com/onsi/gomega/gbytes"
 )
 

topgun/runtime/ephemeral_worker_test.go

@@ -1,10 +1,10 @@
 package topgun_test
 
 import (
+	. "github.com/concourse/concourse/topgun/common"
 	_ "github.com/lib/pq"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	. "github.com/concourse/concourse/topgun/common"
 )
 
 var _ = Describe("Ephemeral Workers", func() {

topgun/runtime/http_proxy_test.go

@@ -1,10 +1,10 @@
 package topgun_test
 
 import (
+	. "github.com/concourse/concourse/topgun/common"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
-	. "github.com/concourse/concourse/topgun/common"
 )
 
 var _ = Describe("A worker with a proxy configured", func() {

topgun/runtime/placement_strategy_test.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 	"time"
 
+	. "github.com/concourse/concourse/topgun/common"
 	_ "github.com/lib/pq"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	. "github.com/concourse/concourse/topgun/common"
 )
 
 var _ = XDescribe("Fewest Build Containers Found Placement Strategy", func() {

topgun/runtime/resource_certs_test.go

@@ -1,11 +1,11 @@
 package topgun_test
 
 import (
+	. "github.com/concourse/concourse/topgun/common"
 	_ "github.com/lib/pq"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
-	. "github.com/concourse/concourse/topgun/common"
 )
 
 var _ = Describe("Resource Certs", func() {

topgun/runtime/runtime_suite_test.go

@@ -52,5 +52,3 @@ func TestTOPGUN(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "TOPGUN Suite")
 }
-
-

topgun/runtime/worker_failing_test.go

@@ -1,10 +1,10 @@
 package topgun_test
 
 import (
+	. "github.com/concourse/concourse/topgun/common"
 	_ "github.com/lib/pq"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	. "github.com/concourse/concourse/topgun/common"
 )
 
 var _ = Describe("Worker failing", func() {

vars/template_resolver_test.go

@@ -2,9 +2,9 @@ package vars_test
 
 import (
 	"github.com/concourse/concourse/vars"
-	"sigs.k8s.io/yaml"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"sigs.k8s.io/yaml"
 )
 
 var _ = Describe("Template", func() {

vars/vars_tracker.go

@@ -83,7 +83,7 @@ func (t credVarsTracker) IterateInterpolatedCreds(iter CredVarsTrackerIterator)
 // DummyCredVarsTracker do nothing,
 
 type dummyCredVarsTracker struct {
-	credVars          Variables
+	credVars Variables
 }
 
 func (t dummyCredVarsTracker) Get(varDef VariableDefinition) (interface{}, bool, error) {
@@ -105,7 +105,7 @@ type MapCredVarsTrackerIterator struct {
 	Data map[string]interface{}
 }
 
-func NewMapCredVarsTrackerIterator() (*MapCredVarsTrackerIterator) {
+func NewMapCredVarsTrackerIterator() *MapCredVarsTrackerIterator {
 	return &MapCredVarsTrackerIterator{
 		Data: map[string]interface{}{},
 	}