From c0b9c0996af791236e9883fadecfe1f312d4868c Mon Sep 17 00:00:00 2001 From: jason yang Date: Tue, 23 Jan 2024 08:13:41 +0000 Subject: [PATCH] move hostlist code into internal folder Signed-off-by: jason yang --- CHANGELOG.md | 1 + internal/app/wwctl/node/console/power.go | 2 +- internal/app/wwctl/node/sensors/power.go | 2 +- internal/app/wwctl/node/status/main.go | 2 +- internal/app/wwctl/overlay/build/main.go | 2 +- internal/app/wwctl/power/cycle/power.go | 2 +- internal/app/wwctl/power/off/power.go | 2 +- internal/app/wwctl/power/on/power.go | 2 +- internal/app/wwctl/power/reset/power.go | 2 +- internal/app/wwctl/power/soft/power.go | 2 +- internal/app/wwctl/power/status/power.go | 2 +- internal/app/wwctl/ssh/main.go | 2 +- internal/pkg/api/node/list.go | 2 +- internal/pkg/api/node/node.go | 2 +- internal/pkg/api/profile/delete.go | 2 +- {pkg => internal/pkg}/hostlist/hostlist.go | 0 {pkg => internal/pkg}/hostlist/hostlist_test.go | 0 17 files changed, 15 insertions(+), 14 deletions(-) rename {pkg => internal/pkg}/hostlist/hostlist.go (100%) rename {pkg => internal/pkg}/hostlist/hostlist_test.go (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f06f917b..a52d5283 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -140,6 +140,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - overlays from different profiles for one node are now merged, overlays can be excluded with ~ prefix and in listings are listed as !{excluded_profile} #885 - modules are now correctly included +- move hostlist into internal alongside other warewulf code #804 ## [4.4.0] 2023-01-18 diff --git a/internal/app/wwctl/node/console/power.go b/internal/app/wwctl/node/console/power.go index c92fea96..6e4f7ef4 100644 --- a/internal/app/wwctl/node/console/power.go +++ b/internal/app/wwctl/node/console/power.go @@ -4,10 +4,10 @@ import ( "fmt" "os" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/power" "github.com/hpcng/warewulf/internal/pkg/wwlog" - "github.com/hpcng/warewulf/pkg/hostlist" "github.com/spf13/cobra" ) diff --git a/internal/app/wwctl/node/sensors/power.go b/internal/app/wwctl/node/sensors/power.go index 7782d29e..5f057aab 100644 --- a/internal/app/wwctl/node/sensors/power.go +++ b/internal/app/wwctl/node/sensors/power.go @@ -5,10 +5,10 @@ import ( "os" "github.com/hpcng/warewulf/internal/pkg/batch" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/power" "github.com/hpcng/warewulf/internal/pkg/wwlog" - "github.com/hpcng/warewulf/pkg/hostlist" "github.com/spf13/cobra" ) diff --git a/internal/app/wwctl/node/status/main.go b/internal/app/wwctl/node/status/main.go index d1675cb9..9c7eb926 100644 --- a/internal/app/wwctl/node/status/main.go +++ b/internal/app/wwctl/node/status/main.go @@ -10,8 +10,8 @@ import ( apinode "github.com/hpcng/warewulf/internal/pkg/api/node" "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/wwlog" - "github.com/hpcng/warewulf/pkg/hostlist" "github.com/spf13/cobra" "golang.org/x/term" ) diff --git a/internal/app/wwctl/overlay/build/main.go b/internal/app/wwctl/overlay/build/main.go index 2403f22e..f024e559 100644 --- a/internal/app/wwctl/overlay/build/main.go +++ b/internal/app/wwctl/overlay/build/main.go @@ -6,10 +6,10 @@ import ( "strings" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/overlay" "github.com/hpcng/warewulf/internal/pkg/wwlog" - "github.com/hpcng/warewulf/pkg/hostlist" "github.com/spf13/cobra" ) diff --git a/internal/app/wwctl/power/cycle/power.go b/internal/app/wwctl/power/cycle/power.go index 49622e9c..e0f679e0 100644 --- a/internal/app/wwctl/power/cycle/power.go +++ b/internal/app/wwctl/power/cycle/power.go @@ -5,10 +5,10 @@ import ( "os" "github.com/hpcng/warewulf/internal/pkg/batch" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/power" "github.com/hpcng/warewulf/internal/pkg/wwlog" - "github.com/hpcng/warewulf/pkg/hostlist" "github.com/spf13/cobra" ) diff --git a/internal/app/wwctl/power/off/power.go b/internal/app/wwctl/power/off/power.go index bd7611b0..2fa2e2f7 100644 --- a/internal/app/wwctl/power/off/power.go +++ b/internal/app/wwctl/power/off/power.go @@ -5,10 +5,10 @@ import ( "os" "github.com/hpcng/warewulf/internal/pkg/batch" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/power" "github.com/hpcng/warewulf/internal/pkg/wwlog" - "github.com/hpcng/warewulf/pkg/hostlist" "github.com/spf13/cobra" ) diff --git a/internal/app/wwctl/power/on/power.go b/internal/app/wwctl/power/on/power.go index a4f21987..a88005d7 100644 --- a/internal/app/wwctl/power/on/power.go +++ b/internal/app/wwctl/power/on/power.go @@ -5,10 +5,10 @@ import ( "os" "github.com/hpcng/warewulf/internal/pkg/batch" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/power" "github.com/hpcng/warewulf/internal/pkg/wwlog" - "github.com/hpcng/warewulf/pkg/hostlist" "github.com/spf13/cobra" ) diff --git a/internal/app/wwctl/power/reset/power.go b/internal/app/wwctl/power/reset/power.go index eb54efd3..779d8385 100644 --- a/internal/app/wwctl/power/reset/power.go +++ b/internal/app/wwctl/power/reset/power.go @@ -5,10 +5,10 @@ import ( "os" "github.com/hpcng/warewulf/internal/pkg/batch" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/power" "github.com/hpcng/warewulf/internal/pkg/wwlog" - "github.com/hpcng/warewulf/pkg/hostlist" "github.com/spf13/cobra" ) diff --git a/internal/app/wwctl/power/soft/power.go b/internal/app/wwctl/power/soft/power.go index 6fddc46f..076c442c 100644 --- a/internal/app/wwctl/power/soft/power.go +++ b/internal/app/wwctl/power/soft/power.go @@ -5,10 +5,10 @@ import ( "os" "github.com/hpcng/warewulf/internal/pkg/batch" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/power" "github.com/hpcng/warewulf/internal/pkg/wwlog" - "github.com/hpcng/warewulf/pkg/hostlist" "github.com/spf13/cobra" ) diff --git a/internal/app/wwctl/power/status/power.go b/internal/app/wwctl/power/status/power.go index 59b3c688..e532cc9a 100644 --- a/internal/app/wwctl/power/status/power.go +++ b/internal/app/wwctl/power/status/power.go @@ -5,10 +5,10 @@ import ( "os" "github.com/hpcng/warewulf/internal/pkg/batch" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/power" "github.com/hpcng/warewulf/internal/pkg/wwlog" - "github.com/hpcng/warewulf/pkg/hostlist" "github.com/spf13/cobra" ) diff --git a/internal/app/wwctl/ssh/main.go b/internal/app/wwctl/ssh/main.go index 04a8bca8..891d8749 100644 --- a/internal/app/wwctl/ssh/main.go +++ b/internal/app/wwctl/ssh/main.go @@ -10,9 +10,9 @@ import ( "time" "github.com/hpcng/warewulf/internal/pkg/batch" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/wwlog" - "github.com/hpcng/warewulf/pkg/hostlist" "github.com/spf13/cobra" ) diff --git a/internal/pkg/api/node/list.go b/internal/pkg/api/node/list.go index 9e863852..172d7d21 100644 --- a/internal/pkg/api/node/list.go +++ b/internal/pkg/api/node/list.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/node" - "github.com/hpcng/warewulf/pkg/hostlist" ) /* diff --git a/internal/pkg/api/node/node.go b/internal/pkg/api/node/node.go index f8d76565..1e0befee 100644 --- a/internal/pkg/api/node/node.go +++ b/internal/pkg/api/node/node.go @@ -9,10 +9,10 @@ import ( "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/wwlog" - "github.com/hpcng/warewulf/pkg/hostlist" "github.com/pkg/errors" "gopkg.in/yaml.v2" diff --git a/internal/pkg/api/profile/delete.go b/internal/pkg/api/profile/delete.go index 977e61be..03af7eb2 100644 --- a/internal/pkg/api/profile/delete.go +++ b/internal/pkg/api/profile/delete.go @@ -5,10 +5,10 @@ import ( "os" "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" + "github.com/hpcng/warewulf/internal/pkg/hostlist" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/warewulfd" "github.com/hpcng/warewulf/internal/pkg/wwlog" - "github.com/hpcng/warewulf/pkg/hostlist" "github.com/pkg/errors" ) diff --git a/pkg/hostlist/hostlist.go b/internal/pkg/hostlist/hostlist.go similarity index 100% rename from pkg/hostlist/hostlist.go rename to internal/pkg/hostlist/hostlist.go diff --git a/pkg/hostlist/hostlist_test.go b/internal/pkg/hostlist/hostlist_test.go similarity index 100% rename from pkg/hostlist/hostlist_test.go rename to internal/pkg/hostlist/hostlist_test.go