From 77bac0c8a8beea56f78730605be7c9b6d64c98b9 Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Thu, 12 Nov 2020 11:06:41 -0800 Subject: [PATCH] Renamed warewulfd-response package to just response --- .../{warewulfd-reponses => response}/ipxe.go | 2 +- .../{warewulfd-reponses => response}/kernel.go | 2 +- .../{warewulfd-reponses => response}/kmods.go | 2 +- .../{warewulfd-reponses => response}/runtime.go | 2 +- .../{warewulfd-reponses => response}/system.go | 2 +- .../{warewulfd-reponses => response}/util.go | 2 +- .../{warewulfd-reponses => response}/vnfs.go | 2 +- internal/app/warewulfd/warewulfd.go | 17 +++++++---------- 8 files changed, 14 insertions(+), 17 deletions(-) rename internal/app/warewulfd/{warewulfd-reponses => response}/ipxe.go (98%) rename internal/app/warewulfd/{warewulfd-reponses => response}/kernel.go (95%) rename internal/app/warewulfd/{warewulfd-reponses => response}/kmods.go (95%) rename internal/app/warewulfd/{warewulfd-reponses => response}/runtime.go (98%) rename internal/app/warewulfd/{warewulfd-reponses => response}/system.go (95%) rename internal/app/warewulfd/{warewulfd-reponses => response}/util.go (97%) rename internal/app/warewulfd/{warewulfd-reponses => response}/vnfs.go (96%) diff --git a/internal/app/warewulfd/warewulfd-reponses/ipxe.go b/internal/app/warewulfd/response/ipxe.go similarity index 98% rename from internal/app/warewulfd/warewulfd-reponses/ipxe.go rename to internal/app/warewulfd/response/ipxe.go index 6a4b44a5..76336e6b 100644 --- a/internal/app/warewulfd/warewulfd-reponses/ipxe.go +++ b/internal/app/warewulfd/response/ipxe.go @@ -1,4 +1,4 @@ -package warewulfd_responses +package response import ( "fmt" diff --git a/internal/app/warewulfd/warewulfd-reponses/kernel.go b/internal/app/warewulfd/response/kernel.go similarity index 95% rename from internal/app/warewulfd/warewulfd-reponses/kernel.go rename to internal/app/warewulfd/response/kernel.go index 018a9d8f..8613e9b1 100644 --- a/internal/app/warewulfd/warewulfd-reponses/kernel.go +++ b/internal/app/warewulfd/response/kernel.go @@ -1,4 +1,4 @@ -package warewulfd_responses +package response import ( "github.com/hpcng/warewulf/internal/pkg/config" diff --git a/internal/app/warewulfd/warewulfd-reponses/kmods.go b/internal/app/warewulfd/response/kmods.go similarity index 95% rename from internal/app/warewulfd/warewulfd-reponses/kmods.go rename to internal/app/warewulfd/response/kmods.go index dff142f1..90043190 100644 --- a/internal/app/warewulfd/warewulfd-reponses/kmods.go +++ b/internal/app/warewulfd/response/kmods.go @@ -1,4 +1,4 @@ -package warewulfd_responses +package response import ( "github.com/hpcng/warewulf/internal/pkg/config" diff --git a/internal/app/warewulfd/warewulfd-reponses/runtime.go b/internal/app/warewulfd/response/runtime.go similarity index 98% rename from internal/app/warewulfd/warewulfd-reponses/runtime.go rename to internal/app/warewulfd/response/runtime.go index b173ddc7..0b0a4ea7 100644 --- a/internal/app/warewulfd/warewulfd-reponses/runtime.go +++ b/internal/app/warewulfd/response/runtime.go @@ -1,4 +1,4 @@ -package warewulfd_responses +package response import ( "fmt" diff --git a/internal/app/warewulfd/warewulfd-reponses/system.go b/internal/app/warewulfd/response/system.go similarity index 95% rename from internal/app/warewulfd/warewulfd-reponses/system.go rename to internal/app/warewulfd/response/system.go index ffae0cf9..ae87fc25 100644 --- a/internal/app/warewulfd/warewulfd-reponses/system.go +++ b/internal/app/warewulfd/response/system.go @@ -1,4 +1,4 @@ -package warewulfd_responses +package response import ( "github.com/hpcng/warewulf/internal/pkg/config" diff --git a/internal/app/warewulfd/warewulfd-reponses/util.go b/internal/app/warewulfd/response/util.go similarity index 97% rename from internal/app/warewulfd/warewulfd-reponses/util.go rename to internal/app/warewulfd/response/util.go index 293a6f58..2eaad20a 100644 --- a/internal/app/warewulfd/warewulfd-reponses/util.go +++ b/internal/app/warewulfd/response/util.go @@ -1,4 +1,4 @@ -package warewulfd_responses +package response import ( "github.com/hpcng/warewulf/internal/pkg/assets" diff --git a/internal/app/warewulfd/warewulfd-reponses/vnfs.go b/internal/app/warewulfd/response/vnfs.go similarity index 96% rename from internal/app/warewulfd/warewulfd-reponses/vnfs.go rename to internal/app/warewulfd/response/vnfs.go index 1967b7ab..c6e03fdf 100644 --- a/internal/app/warewulfd/warewulfd-reponses/vnfs.go +++ b/internal/app/warewulfd/response/vnfs.go @@ -1,4 +1,4 @@ -package warewulfd_responses +package response import ( "github.com/hpcng/warewulf/internal/pkg/config" diff --git a/internal/app/warewulfd/warewulfd.go b/internal/app/warewulfd/warewulfd.go index 57ec3281..dbdacebe 100644 --- a/internal/app/warewulfd/warewulfd.go +++ b/internal/app/warewulfd/warewulfd.go @@ -1,7 +1,7 @@ package warewulfd import ( - warewulfd_responses "github.com/hpcng/warewulf/internal/app/warewulfd/warewulfd-reponses" + "github.com/hpcng/warewulf/internal/app/warewulfd/response" "github.com/spf13/cobra" "net/http" ) @@ -9,17 +9,14 @@ import ( // TODO: https://github.com/danderson/netboot/blob/master/pixiecore/dhcp.go // TODO: https://github.com/pin/tftp -//const LocalStateDir = "/var/warewulf" - - func CobraRunE(cmd *cobra.Command, args []string) error { - http.HandleFunc("/ipxe/", warewulfd_responses.IpxeSend) - http.HandleFunc("/kernel/", warewulfd_responses.KernelSend) - http.HandleFunc("/kmods/", warewulfd_responses.KmodsSend) - http.HandleFunc("/vnfs/", warewulfd_responses.VnfsSend) - http.HandleFunc("/overlay-system/", warewulfd_responses.SystemOverlaySend) - http.HandleFunc("/overlay-runtime", warewulfd_responses.RuntimeOverlaySend) + http.HandleFunc("/ipxe/", response.IpxeSend) + http.HandleFunc("/kernel/", response.KernelSend) + http.HandleFunc("/kmods/", response.KmodsSend) + http.HandleFunc("/vnfs/", response.VnfsSend) + http.HandleFunc("/overlay-system/", response.SystemOverlaySend) + http.HandleFunc("/overlay-runtime", response.RuntimeOverlaySend) http.ListenAndServe(":9873", nil)