From 24e805639d51385eb463b336b443788347930712 Mon Sep 17 00:00:00 2001 From: "Joseph D. Marhee" Date: Sun, 24 Jan 2021 02:54:48 -0600 Subject: [PATCH] Updates name from to in module and tests, goreleaser-- tested and successfully provisioned a machine Signed-off-by: Joseph D. Marhee --- .goreleaser.yml | 4 +- Makefile | 2 +- main.go | 4 +- .../equinix-metal.go} | 114 +++++++++--------- .../equinix-metal_test.go} | 6 +- 5 files changed, 65 insertions(+), 65 deletions(-) rename pkg/drivers/{packet/packet.go => equinix-metal/equinix-metal.go} (78%) rename pkg/drivers/{packet/packet_test.go => equinix-metal/equinix-metal_test.go} (83%) diff --git a/.goreleaser.yml b/.goreleaser.yml index aefa837..5ce2a04 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -7,9 +7,9 @@ builds: - env: - CGO_ENABLED=0 - GO111MODULE=on - binary: docker-machine-driver-packet + binary: docker-machine-driver-equinix-metal ldflags: - - -X github.com/packethost/docker-machine-driver-packet/pkg/drivers/packet/packet.version={{.Version}} + - -X github.com/packethost/docker-machine-driver-equinix-metal/pkg/drivers/equinix-metal/equinix-metal.version={{.Version}} goos: - windows - darwin diff --git a/Makefile b/Makefile index 9b1c157..29c6abb 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ containerbuild: make build clean: - rm -r docker-machine-driver-packet bin/docker-machine-driver-packet + rm -r docker-machine-driver-equinix-metal bin/docker-machine-driver-equinix-metal compile: GO111MODULE=on GOGC=off CGOENABLED=0 go build -ldflags "-s" diff --git a/main.go b/main.go index b8ecc9e..a82a270 100644 --- a/main.go +++ b/main.go @@ -4,9 +4,9 @@ package main import ( "github.com/docker/machine/libmachine/drivers/plugin" - packet "github.com/packethost/docker-machine-driver-packet/pkg/drivers/packet" + metal "github.com/packethost/docker-machine-driver-packet/pkg/drivers/equinix-metal" ) func main() { - plugin.RegisterDriver(new(packet.Driver)) + plugin.RegisterDriver(new(metal.Driver)) } diff --git a/pkg/drivers/packet/packet.go b/pkg/drivers/equinix-metal/equinix-metal.go similarity index 78% rename from pkg/drivers/packet/packet.go rename to pkg/drivers/equinix-metal/equinix-metal.go index aaf4965..78a3853 100644 --- a/pkg/drivers/packet/packet.go +++ b/pkg/drivers/equinix-metal/equinix-metal.go @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause -package packet +package metal import ( "fmt" @@ -53,7 +53,7 @@ type Driver struct { } // NewDriver is a backward compatible Driver factory method. Using -// new(packet.Driver) is preferred. +// new(metal.Driver) is preferred. func NewDriver(hostName, storePath string) *Driver { return &Driver{ BaseDriver: &drivers.BaseDriver{ @@ -66,99 +66,99 @@ func NewDriver(hostName, storePath string) *Driver { func (d *Driver) GetCreateFlags() []mcnflag.Flag { return []mcnflag.Flag{ mcnflag.StringFlag{ - Name: "packet-api-key", - Usage: "Packet api key", - EnvVar: "PACKET_API_KEY", + Name: "metal-api-key", + Usage: "Equinix Metal api key", + EnvVar: "METAL_API_KEY", }, mcnflag.StringFlag{ - Name: "packet-project-id", - Usage: "Packet Project Id", - EnvVar: "PACKET_PROJECT_ID", + Name: "metal-project-id", + Usage: "Equinix Metal Project Id", + EnvVar: "METAL_PROJECT_ID", }, mcnflag.StringFlag{ - Name: "packet-os", - Usage: "Packet OS", + Name: "metal-os", + Usage: "Equinix Metal OS", Value: "ubuntu_16_04", - EnvVar: "PACKET_OS", + EnvVar: "METAL_OS", }, mcnflag.StringFlag{ - Name: "packet-facility-code", - Usage: "Packet facility code", + Name: "metal-facility-code", + Usage: "Equinix Metal facility code", Value: "ewr1", - EnvVar: "PACKET_FACILITY_CODE", + EnvVar: "METAL_FACILITY_CODE", }, mcnflag.StringFlag{ - Name: "packet-plan", - Usage: "Packet Server Plan", + Name: "metal-plan", + Usage: "Equinix Metal Server Plan", Value: "baremetal_0", - EnvVar: "PACKET_PLAN", + EnvVar: "METAL_PLAN", }, mcnflag.StringFlag{ - Name: "packet-hw-reservation-id", - Usage: "Packet Reserved hardware ID", - EnvVar: "PACKET_HW_ID", + Name: "metal-hw-reservation-id", + Usage: "Equinix Metal Reserved hardware ID", + EnvVar: "METAL_HW_ID", }, mcnflag.StringFlag{ - Name: "packet-billing-cycle", - Usage: "Packet billing cycle, hourly or monthly", + Name: "metal-billing-cycle", + Usage: "Equinix Metal billing cycle, hourly or monthly", Value: "hourly", - EnvVar: "PACKET_BILLING_CYCLE", + EnvVar: "METAL_BILLING_CYCLE", }, mcnflag.StringFlag{ - Name: "packet-userdata", + Name: "metal-userdata", Usage: "Path to file with cloud-init user-data", - EnvVar: "PACKET_USERDATA", + EnvVar: "METAL_USERDATA", }, mcnflag.BoolFlag{ - Name: "packet-spot-instance", - Usage: "Request a Packet Spot Instance", - EnvVar: "PACKET_SPOT_INSTANCE", + Name: "metal-spot-instance", + Usage: "Request a Equinix Metal Spot Instance", + EnvVar: "METAL_SPOT_INSTANCE", }, mcnflag.StringFlag{ - Name: "packet-spot-price-max", - Usage: "The maximum Packet Spot Price", - EnvVar: "PACKET_SPOT_PRICE_MAX", + Name: "metal-spot-price-max", + Usage: "The maximum Equinix Metal Spot Price", + EnvVar: "METAL_SPOT_PRICE_MAX", }, mcnflag.StringFlag{ - Name: "packet-termination-time", - Usage: "The Packet Instance Termination Time", - EnvVar: "PACKET_TERMINATION_TIME", + Name: "metal-termination-time", + Usage: "The Equinix Metal Instance Termination Time", + EnvVar: "METAL_TERMINATION_TIME", }, mcnflag.StringFlag{ - EnvVar: "PACKET_UA_PREFIX", - Name: "packet-ua-prefix", - Usage: "Prefix the User-Agent in Packet API calls with some 'product/version'", + EnvVar: "METAL_UA_PREFIX", + Name: "metal-ua-prefix", + Usage: "Prefix the User-Agent in Equinix Metal API calls with some 'product/version'", }, } } func (d *Driver) DriverName() string { - return "packet" + return "metal" } func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error { - if strings.Contains(flags.String("packet-os"), "coreos") { + if strings.Contains(flags.String("metal-os"), "coreos") { d.SSHUser = "core" } - if strings.Contains(flags.String("packet-os"), "rancher") { + if strings.Contains(flags.String("metal-os"), "rancher") { d.SSHUser = "rancher" } - d.ApiKey = flags.String("packet-api-key") - d.ProjectID = flags.String("packet-project-id") - d.OperatingSystem = flags.String("packet-os") - d.Facility = flags.String("packet-facility-code") - d.BillingCycle = flags.String("packet-billing-cycle") - d.UserAgentPrefix = flags.String("packet-ua-prefix") - d.UserDataFile = flags.String("packet-userdata") + d.ApiKey = flags.String("metal-api-key") + d.ProjectID = flags.String("metal-project-id") + d.OperatingSystem = flags.String("metal-os") + d.Facility = flags.String("metal-facility-code") + d.BillingCycle = flags.String("metal-billing-cycle") + d.UserAgentPrefix = flags.String("metal-ua-prefix") + d.UserDataFile = flags.String("metal-userdata") - d.Plan = flags.String("packet-plan") - d.HardwareReserverationID = flags.String("packet-hw-reservation-id") + d.Plan = flags.String("metal-plan") + d.HardwareReserverationID = flags.String("metal-hw-reservation-id") - d.SpotInstance = flags.Bool("packet-spot-instance") + d.SpotInstance = flags.Bool("metal-spot-instance") if d.SpotInstance { - SpotPriceMax := flags.String("packet-spot-price-max") + SpotPriceMax := flags.String("metal-spot-price-max") if SpotPriceMax == "" { d.SpotPriceMax = -1 } else { @@ -169,7 +169,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error { d.SpotPriceMax = SpotPriceMax } - TerminationTime := flags.String("packet-termination-time") + TerminationTime := flags.String("metal-termination-time") if TerminationTime == "" { d.TerminationTime = nil } else { @@ -183,10 +183,10 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error { } if d.ApiKey == "" { - return fmt.Errorf("packet driver requires the --packet-api-key option") + return fmt.Errorf("metal driver requires the --metal-api-key option") } if d.ProjectID == "" { - return fmt.Errorf("packet driver requires the --packet-project-id option") + return fmt.Errorf("metal driver requires the --metal-project-id option") } return nil @@ -208,7 +208,7 @@ func (d *Driver) PreCreateCheck() error { return err } if !stringInSlice(d.OperatingSystem, flavors) { - return fmt.Errorf("specified --packet-os not one of %v", strings.Join(flavors, ", ")) + return fmt.Errorf("specified --metal-os not one of %v", strings.Join(flavors, ", ")) } if d.Facility == "any" { @@ -226,7 +226,7 @@ func (d *Driver) PreCreateCheck() error { } } - return fmt.Errorf("packet requires a valid facility") + return fmt.Errorf("metal requires a valid facility") } func (d *Driver) Create() error { @@ -269,7 +269,7 @@ func (d *Driver) Create() error { SpotPriceMax: d.SpotPriceMax, } - log.Info("Provisioning Packet server...") + log.Info("Provisioning Equinix Metal server...") newDevice, _, err := client.Devices.Create(createRequest) if err != nil { //cleanup ssh keys if device faild diff --git a/pkg/drivers/packet/packet_test.go b/pkg/drivers/equinix-metal/equinix-metal_test.go similarity index 83% rename from pkg/drivers/packet/packet_test.go rename to pkg/drivers/equinix-metal/equinix-metal_test.go index cda2ee0..0debdff 100644 --- a/pkg/drivers/packet/packet_test.go +++ b/pkg/drivers/equinix-metal/equinix-metal_test.go @@ -1,4 +1,4 @@ -package packet +package metal import ( "testing" @@ -12,8 +12,8 @@ func TestSetConfigFromFlags(t *testing.T) { checkFlags := &drivers.CheckDriverOptions{ FlagsValues: map[string]interface{}{ - "packet-api-key": "APIKEY", - "packet-project-id": "PROJECT", + "metal-api-key": "APIKEY", + "metal-project-id": "PROJECT", }, CreateFlags: driver.GetCreateFlags(), }