From 3362e3b6f74a32123ea64e1d0033ac3087fe78f3 Mon Sep 17 00:00:00 2001 From: hunterch Date: Fri, 23 Sep 2022 16:16:43 -0700 Subject: [PATCH] gofumpt --- internal/acceptance/workflows/scenario/step_funcs_exec.go | 3 ++- internal/acceptance/workflows/scenario/step_funcs_tile.go | 2 +- .../workflows/scenario/step_funcs_tile_source_code.go | 7 ++++--- internal/commands/help.go | 3 ++- internal/component/bump_internal_test.go | 3 ++- internal/manifest/generate.go | 3 ++- internal/manifest/generate_test.go | 5 +++-- internal/proofing/collection_property_blueprint_test.go | 3 ++- internal/proofing/collection_property_input_test.go | 3 ++- internal/proofing/errand_template_test.go | 3 ++- internal/proofing/form_type_test.go | 3 ++- internal/proofing/install_time_verifier_test.go | 3 ++- internal/proofing/instance_definition_test.go | 3 ++- internal/proofing/job_type_test.go | 3 ++- internal/proofing/parse_test.go | 3 ++- internal/proofing/product_template_test.go | 3 ++- internal/proofing/property_blueprints_test.go | 3 ++- internal/proofing/property_inputs_test.go | 3 ++- internal/proofing/release_test.go | 3 ++- internal/proofing/resource_definitions_test.go | 3 ++- internal/proofing/runtime_config_template_test.go | 3 ++- internal/proofing/selector_property_blueprint_test.go | 3 ++- internal/proofing/selector_property_input_test.go | 3 ++- internal/proofing/simple_property_blueprint_test.go | 3 ++- internal/proofing/simple_property_input_test.go | 3 ++- internal/proofing/stemcell_criteria_test.go | 3 ++- internal/proofing/template_test.go | 3 ++- internal/proofing/variable_test.go | 3 ++- internal/proofing/verifier_blueprint_test.go | 3 ++- internal/proofing/zero_if_binding_test.go | 3 ++- pkg/cargo/kilnfile.go | 3 ++- pkg/tile/release.go | 3 ++- pkg/tile/releases_test.go | 3 ++- 33 files changed, 68 insertions(+), 36 deletions(-) diff --git a/internal/acceptance/workflows/scenario/step_funcs_exec.go b/internal/acceptance/workflows/scenario/step_funcs_exec.go index dbee28468..2ff98555d 100644 --- 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 index bd4425f0c..e1e2d3c2e 100644 --- a/internal/acceptance/workflows/scenario/step_funcs_tile.go +++ b/internal/acceptance/workflows/scenario/step_funcs_tile.go @@ -6,7 +6,6 @@ import ( "context" "errors" "fmt" - "github.com/pivotal-cf/kiln/internal/proofing" "os" "strings" @@ -14,6 +13,7 @@ import ( "gopkg.in/yaml.v2" "github.com/pivotal-cf/kiln/internal/component" + "github.com/pivotal-cf/kiln/internal/proofing" "github.com/pivotal-cf/kiln/pkg/tile" ) diff --git a/internal/acceptance/workflows/scenario/step_funcs_tile_source_code.go b/internal/acceptance/workflows/scenario/step_funcs_tile_source_code.go index fe75397fe..9997c6977 100644 --- 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 index 10146c6e0..aaaff2a4d 100644 --- 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 index 89d52c8ad..78dcbfbd1 100644 --- 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 index 93f60deb1..4aeb9cc70 100644 --- 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 index effbb5153..6f5f73242 100644 --- 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 index 717ddcc73..18e8fcb52 100644 --- 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 index 5bb01d2c3..5e68ab72c 100644 --- 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 index d193848b9..213f53d35 100644 --- 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 index 8b719c78d..1917b427c 100644 --- 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 index 4390163c2..3e29652dd 100644 --- 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 index 72c7b026c..2308ea52f 100644 --- 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 index 9955e2ac1..1a3d69101 100644 --- 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 index f915939dc..780e030f7 100644 --- 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 index 4a9bb0a9e..309480bf4 100644 --- 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 index f01a13f5d..801f49838 100644 --- 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 index 9dcd9dabc..16c52114b 100644 --- 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 index 1c00bad06..fb1f8307e 100644 --- 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 index 0d14aab1b..542608a2b 100644 --- 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 index 70403a09c..468245691 100644 --- 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 index 90c2e712a..8bf40389c 100644 --- 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 index 7353845f2..dcf6d8455 100644 --- 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 index 78405cfdb..4eecf0ee1 100644 --- 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 index b90986e38..a3821d6b2 100644 --- 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 index bdb0a2c46..aa5b2e4d6 100644 --- 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 index cb5fecf50..907e28657 100644 --- 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 index 7c5bcb08d..ceca87450 100644 --- 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 index 9979fba27..8b859a886 100644 --- 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 index 9f2fd8ea5..df7ba2be8 100644 --- 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 index 00504a6cc..3858fcb10 100644 --- 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 index 5e0f29e65..2d6c21de2 100644 --- 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" ) diff --git a/pkg/tile/releases_test.go b/pkg/tile/releases_test.go index dd2a4d93c..538587244 100644 --- a/pkg/tile/releases_test.go +++ b/pkg/tile/releases_test.go @@ -2,10 +2,11 @@ package tile_test import ( "bytes" - "github.com/pivotal-cf/kiln/internal/proofing" "io" "testing" + "github.com/pivotal-cf/kiln/internal/proofing" + . "github.com/onsi/gomega" "github.com/pivotal-cf/kiln/pkg/tile"