gofumpt

pivotal-cf · Sep 23, 2022 · 2806180 · 2806180
1 parent 9f6721a
commit 2806180
Show file tree

Hide file tree

Showing 33 changed files with 69 additions and 36 deletions.
diff --git a/internal/acceptance/workflows/scenario/step_funcs_exec.go b/internal/acceptance/workflows/scenario/step_funcs_exec.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"gopkg.in/yaml.v2"
 	"strconv"
 	"strings"
+
+	"gopkg.in/yaml.v2"
 )
 
 func outputContainsSubstring(ctx context.Context, outputName, substring string) error {

diff --git a/internal/acceptance/workflows/scenario/step_funcs_tile.go b/internal/acceptance/workflows/scenario/step_funcs_tile.go
@@ -6,10 +6,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 	"strings"
 
+	"github.com/pivotal-cf/kiln/internal/proofing"
+
 	"github.com/cucumber/godog"
 	"gopkg.in/yaml.v2"
 

diff --git a/internal/acceptance/workflows/scenario/step_funcs_tile_source_code.go b/internal/acceptance/workflows/scenario/step_funcs_tile_source_code.go
@@ -3,13 +3,14 @@ package scenario
 import (
 	"context"
 	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+
 	"github.com/cucumber/godog"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 	"golang.org/x/exp/slices"
-	"os"
-	"os/exec"
-	"strings"
 
 	"github.com/pivotal-cf/kiln/internal/component"
 	"github.com/pivotal-cf/kiln/pkg/cargo"

diff --git a/internal/commands/help.go b/internal/commands/help.go
@@ -2,12 +2,13 @@ package commands
 
 import (
 	"fmt"
-	"golang.org/x/exp/maps"
 	"io"
 	"reflect"
 	"sort"
 	"strings"
 
+	"golang.org/x/exp/maps"
+
 	"github.com/pivotal-cf/jhanda"
 )
 

diff --git a/internal/component/bump_internal_test.go b/internal/component/bump_internal_test.go
@@ -1,9 +1,10 @@
 package component
 
 import (
+	"testing"
+
 	"github.com/google/go-github/v40/github"
 	Ω "github.com/onsi/gomega"
-	"testing"
 )
 
 func TestInternal_deduplicateReleasesWithTheSameTagName(t *testing.T) {

diff --git a/internal/manifest/generate.go b/internal/manifest/generate.go
@@ -1,9 +1,10 @@
 package manifest
 
 import (
+	"io"
+
 	opsman2 "github.com/pivotal-cf/kiln/internal/manifest/opsman"
 	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
-	"io"
 
 	"gopkg.in/yaml.v2"
 )

diff --git a/internal/manifest/generate_test.go b/internal/manifest/generate_test.go
@@ -1,11 +1,12 @@
 package manifest
 
 import (
-	opsman2 "github.com/pivotal-cf/kiln/internal/manifest/opsman"
-	"github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 	"testing"
 
+	opsman2 "github.com/pivotal-cf/kiln/internal/manifest/opsman"
+	"github.com/pivotal-cf/kiln/internal/proofing"
+
 	"gopkg.in/yaml.v2"
 
 	. "github.com/onsi/gomega"

diff --git a/internal/proofing/collection_property_blueprint_test.go b/internal/proofing/collection_property_blueprint_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/collection_property_input_test.go b/internal/proofing/collection_property_input_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/errand_template_test.go b/internal/proofing/errand_template_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/form_type_test.go b/internal/proofing/form_type_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/install_time_verifier_test.go b/internal/proofing/install_time_verifier_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/instance_definition_test.go b/internal/proofing/instance_definition_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/job_type_test.go b/internal/proofing/job_type_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/parse_test.go b/internal/proofing/parse_test.go
@@ -2,9 +2,10 @@ package proofing_test
 
 import (
 	"errors"
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/product_template_test.go b/internal/proofing/product_template_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/property_blueprints_test.go b/internal/proofing/property_blueprints_test.go
@@ -2,9 +2,10 @@ package proofing_test
 
 import (
 	"errors"
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/property_inputs_test.go b/internal/proofing/property_inputs_test.go
@@ -2,9 +2,10 @@ package proofing_test
 
 import (
 	"errors"
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/release_test.go b/internal/proofing/release_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/resource_definitions_test.go b/internal/proofing/resource_definitions_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/runtime_config_template_test.go b/internal/proofing/runtime_config_template_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/selector_property_blueprint_test.go b/internal/proofing/selector_property_blueprint_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/selector_property_input_test.go b/internal/proofing/selector_property_input_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/simple_property_blueprint_test.go b/internal/proofing/simple_property_blueprint_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/simple_property_input_test.go b/internal/proofing/simple_property_input_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/stemcell_criteria_test.go b/internal/proofing/stemcell_criteria_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/template_test.go b/internal/proofing/template_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/variable_test.go b/internal/proofing/variable_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/verifier_blueprint_test.go b/internal/proofing/verifier_blueprint_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/proofing/zero_if_binding_test.go b/internal/proofing/zero_if_binding_test.go
@@ -1,9 +1,10 @@
 package proofing_test
 
 import (
-	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
 	"os"
 
+	proofing2 "github.com/pivotal-cf/kiln/internal/proofing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/pkg/cargo/kilnfile.go b/pkg/cargo/kilnfile.go
@@ -3,9 +3,10 @@ package cargo
 import (
 	"errors"
 	"fmt"
-	"github.com/pivotal-cf/kiln/internal/manifest"
 	"strings"
 
+	"github.com/pivotal-cf/kiln/internal/manifest"
+
 	"github.com/Masterminds/semver"
 	boshdir "github.com/cloudfoundry/bosh-cli/director"
 )

diff --git a/pkg/tile/release.go b/pkg/tile/release.go
@@ -3,12 +3,13 @@ package tile
 import (
 	"archive/zip"
 	"fmt"
-	"github.com/pivotal-cf/kiln/internal/proofing"
 	"io"
 	"io/fs"
 	"os"
 	"path"
 
+	"github.com/pivotal-cf/kiln/internal/proofing"
+
 	"golang.org/x/exp/slices"
 	"gopkg.in/yaml.v2"
 )