From 71a4cd2f3c8e201481ca080729a47ec45217f2df Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 7 Aug 2017 11:28:27 +0100 Subject: [PATCH] cmd: Prefix packet.net host name with username If a packet account is shared between users, this makes it clearer who created the machine. Also, switch "moby" to "linuxkit" Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/run_packet.go | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/cmd/linuxkit/run_packet.go b/src/cmd/linuxkit/run_packet.go index 00cec1991..ecd112a8b 100644 --- a/src/cmd/linuxkit/run_packet.go +++ b/src/cmd/linuxkit/run_packet.go @@ -6,6 +6,7 @@ import ( "fmt" "net/http" "os" + "os/user" "path/filepath" "github.com/bzub/packngo" // TODO(rn): Update to official once iPXE is merged @@ -13,18 +14,28 @@ import ( ) const ( - packetDefaultZone = "ams1" - packetDefaultMachine = "baremetal_0" - packetDefaultHostname = "moby" - packetBaseURL = "PACKET_BASE_URL" - packetZoneVar = "PACKET_ZONE" - packetMachineVar = "PACKET_MACHINE" - packetAPIKeyVar = "PACKET_API_KEY" - packetProjectIDVar = "PACKET_PROJECT_ID" - packetHostnameVar = "PACKET_HOSTNAME" - packetNameVar = "PACKET_NAME" + packetDefaultZone = "ams1" + packetDefaultMachine = "baremetal_0" + packetBaseURL = "PACKET_BASE_URL" + packetZoneVar = "PACKET_ZONE" + packetMachineVar = "PACKET_MACHINE" + packetAPIKeyVar = "PACKET_API_KEY" + packetProjectIDVar = "PACKET_PROJECT_ID" + packetHostnameVar = "PACKET_HOSTNAME" + packetNameVar = "PACKET_NAME" ) +var ( + packetDefaultHostname = "linuxkit" +) + +func init() { + // Prefix host name with username + if u, err := user.Current(); err == nil { + packetDefaultHostname = u.Username + "-" + packetDefaultHostname + } +} + // ValidateHTTPURL does a sanity check that a URL returns a 200 or 300 response func ValidateHTTPURL(url string) { log.Printf("Validating URL: %s", url)