From 6a1a22151cc0096d55060c3c300272a0fd318a51 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 16 Nov 2020 14:23:35 -0800 Subject: [PATCH] move the various flag packages from helper to command, since command is the only package that uses them. --- command/cli.go | 6 +++--- {helper => command}/enumflag/flag.go | 0 {helper => command}/flag-kv/flag.go | 0 {helper => command}/flag-kv/flag_json.go | 0 {helper => command}/flag-kv/flag_json_test.go | 0 {helper => command}/flag-kv/flag_strings.go | 0 {helper => command}/flag-kv/flag_strings_test.go | 0 {helper => command}/flag-kv/flag_test.go | 0 {helper => command}/flag-kv/test-fixtures/basic.json | 0 {helper => command}/flag-slice/flag.go | 0 {helper => command}/flag-slice/flag_test.go | 0 command/meta.go | 2 +- 12 files changed, 4 insertions(+), 4 deletions(-) rename {helper => command}/enumflag/flag.go (100%) rename {helper => command}/flag-kv/flag.go (100%) rename {helper => command}/flag-kv/flag_json.go (100%) rename {helper => command}/flag-kv/flag_json_test.go (100%) rename {helper => command}/flag-kv/flag_strings.go (100%) rename {helper => command}/flag-kv/flag_strings_test.go (100%) rename {helper => command}/flag-kv/flag_test.go (100%) rename {helper => command}/flag-kv/test-fixtures/basic.json (100%) rename {helper => command}/flag-slice/flag.go (100%) rename {helper => command}/flag-slice/flag_test.go (100%) diff --git a/command/cli.go b/command/cli.go index f273692ce..56d598d7f 100644 --- a/command/cli.go +++ b/command/cli.go @@ -4,9 +4,9 @@ import ( "flag" "strings" - "github.com/hashicorp/packer/helper/enumflag" - kvflag "github.com/hashicorp/packer/helper/flag-kv" - sliceflag "github.com/hashicorp/packer/helper/flag-slice" + "github.com/hashicorp/packer/command/enumflag" + kvflag "github.com/hashicorp/packer/command/flag-kv" + sliceflag "github.com/hashicorp/packer/command/flag-slice" ) //go:generate enumer -type configType -trimprefix ConfigType -transform snake diff --git a/helper/enumflag/flag.go b/command/enumflag/flag.go similarity index 100% rename from helper/enumflag/flag.go rename to command/enumflag/flag.go diff --git a/helper/flag-kv/flag.go b/command/flag-kv/flag.go similarity index 100% rename from helper/flag-kv/flag.go rename to command/flag-kv/flag.go diff --git a/helper/flag-kv/flag_json.go b/command/flag-kv/flag_json.go similarity index 100% rename from helper/flag-kv/flag_json.go rename to command/flag-kv/flag_json.go diff --git a/helper/flag-kv/flag_json_test.go b/command/flag-kv/flag_json_test.go similarity index 100% rename from helper/flag-kv/flag_json_test.go rename to command/flag-kv/flag_json_test.go diff --git a/helper/flag-kv/flag_strings.go b/command/flag-kv/flag_strings.go similarity index 100% rename from helper/flag-kv/flag_strings.go rename to command/flag-kv/flag_strings.go diff --git a/helper/flag-kv/flag_strings_test.go b/command/flag-kv/flag_strings_test.go similarity index 100% rename from helper/flag-kv/flag_strings_test.go rename to command/flag-kv/flag_strings_test.go diff --git a/helper/flag-kv/flag_test.go b/command/flag-kv/flag_test.go similarity index 100% rename from helper/flag-kv/flag_test.go rename to command/flag-kv/flag_test.go diff --git a/helper/flag-kv/test-fixtures/basic.json b/command/flag-kv/test-fixtures/basic.json similarity index 100% rename from helper/flag-kv/test-fixtures/basic.json rename to command/flag-kv/test-fixtures/basic.json diff --git a/helper/flag-slice/flag.go b/command/flag-slice/flag.go similarity index 100% rename from helper/flag-slice/flag.go rename to command/flag-slice/flag.go diff --git a/helper/flag-slice/flag_test.go b/command/flag-slice/flag_test.go similarity index 100% rename from helper/flag-slice/flag_test.go rename to command/flag-slice/flag_test.go diff --git a/command/meta.go b/command/meta.go index 2d35fc9ab..a57f7244b 100644 --- a/command/meta.go +++ b/command/meta.go @@ -6,7 +6,7 @@ import ( "io" "os" - kvflag "github.com/hashicorp/packer/helper/flag-kv" + kvflag "github.com/hashicorp/packer/command/flag-kv" "github.com/hashicorp/packer/helper/wrappedstreams" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template"