Merge pull request #283 from packethost/packngo-0.5.0

packngo v0.5.0

CHANGELOG.md

@@ -1,12 +1,14 @@
 ## 3.1.0 (Unreleased)
 
 BREAKING CHANGES:
-- packngo updated to v0.4.1, changing the API endpoint from api.packet.net to api.equinix.com/metal/v1
+- packngo updated to v0.4.1+, changing the API endpoint from api.packet.net to api.equinix.com/metal/v1
 
 FEATURES:
 - [#249](https://github.com/packethost/terraform-provider-packet/pull/249) New datasource `packet_project_ssh_key`
 
 IMPROVEMENTS:
+- `packet_device` datasource should query by hostname much faster
+- `packet_device_network_type` conversions should be more reliable
 - Test sweeper added for SSH keys
 - Acceptance testing moved to Github Actions
 - Improved logging when resources are not found and removed from state

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/hashicorp/go-retryablehttp v0.6.6
 	github.com/hashicorp/terraform-plugin-sdk v1.0.0
 	github.com/mattn/go-colorable v0.1.1 // indirect
-	github.com/packethost/packngo v0.4.1
+	github.com/packethost/packngo v0.5.0
 	github.com/vmihailenco/msgpack v4.0.1+incompatible // indirect
 	golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect
 	gopkg.in/yaml.v2 v2.2.8 // indirect

go.sum

@@ -161,10 +161,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/packethost/packngo v0.3.0 h1:mE5UHyhr5sKN1Qa0GtExRG9ECUX/muazI0f53gSrt5E=
-github.com/packethost/packngo v0.3.0/go.mod h1:aRxUEV1TprXVcWr35v8tNYgZMjv7FHaInXx224vF2fc=
-github.com/packethost/packngo v0.4.1 h1:HWeO3y3xvGIhdaW15VLz7uswKE27YRvXtONDjcMqvqk=
-github.com/packethost/packngo v0.4.1/go.mod h1:aRxUEV1TprXVcWr35v8tNYgZMjv7FHaInXx224vF2fc=
+github.com/packethost/packngo v0.5.0 h1:WGpfeRMstPqgyXGUXl6b9xFsbUudXU3p0+JlYri290U=
+github.com/packethost/packngo v0.5.0/go.mod h1:aRxUEV1TprXVcWr35v8tNYgZMjv7FHaInXx224vF2fc=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

packet/datasource_packet_device.go

@@ -188,7 +188,7 @@ func dataSourcePacketDeviceRead(d *schema.ResourceData, meta interface{}) error
 		hostname := hostnameRaw.(string)
 		projectId := projectIdRaw.(string)
 
-		ds, _, err := client.Devices.List(projectId, nil)
+		ds, _, err := client.Devices.List(projectId, &packngo.ListOptions{Search: hostname})
 		if err != nil {
 			return err
 		}
@@ -225,18 +225,15 @@ func dataSourcePacketDeviceRead(d *schema.ResourceData, meta interface{}) error
 
 		storageString, err := structure.NormalizeJsonString(string(rawStorageBytes))
 		if err != nil {
-			return fmt.Errorf("[ERR] Errori normalizing storage JSON string for device (%s): %s", d.Id(), err)
+			return fmt.Errorf("[ERR] Error normalizing storage JSON string for device (%s): %s", d.Id(), err)
 		}
 		d.Set("storage", storageString)
 	}
 
 	if len(device.HardwareReservation.Href) > 0 {
 		d.Set("hardware_reservation_id", path.Base(device.HardwareReservation.Href))
 	}
-	networkType, err := device.GetNetworkType()
-	if err != nil {
-		return err
-	}
+	networkType := device.GetNetworkType()
 
 	d.Set("network_type", networkType)
 

packet/helpers_device.go

@@ -173,10 +173,7 @@ func waitForDeviceAttribute(d *schema.ResourceData, targets []string, pending []
 			if err == nil {
 				retAttrVal := device.State
 				if attribute == "network_type" {
-					networkType, nterr := device.GetNetworkType()
-					if nterr != nil {
-						return "error", "error", nterr
-					}
+					networkType := device.GetNetworkType()
 					retAttrVal = networkType
 				}
 				return retAttrVal, retAttrVal, nil

packet/resource_packet_device.go

@@ -465,10 +465,7 @@ func resourcePacketDeviceRead(d *schema.ResourceData, meta interface{}) error {
 	if len(device.HardwareReservation.Href) > 0 {
 		d.Set("hardware_reservation_id", path.Base(device.HardwareReservation.Href))
 	}
-	networkType, err := device.GetNetworkType()
-	if err != nil {
-		return err
-	}
+	networkType := device.GetNetworkType()
 	d.Set("network_type", networkType)
 
 	wfrd := "wait_for_reservation_deprovision"

packet/resource_packet_device_network_type.go

@@ -43,10 +43,8 @@ func getDevIDandNetworkType(d *schema.ResourceData, c *packngo.Client) (string,
 	if err != nil {
 		return "", "", err
 	}
-	devType, err := dev.GetNetworkType()
-	if err != nil {
-		return "", "", err
-	}
+	devType := dev.GetNetworkType()
+
 	return dev.ID, devType, nil
 }