Inbox 2228/use error codes again (#271)

Author: eravin-ns1

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/hashicorp/go-retryablehttp v0.7.1
 	github.com/hashicorp/terraform-plugin-sdk v1.17.2
 	github.com/stretchr/testify v1.7.0
-	gopkg.in/ns1/ns1-go.v2 v2.7.2
+	gopkg.in/ns1/ns1-go.v2 v2.7.3
 )
 
 require (

go.sum

@@ -661,8 +661,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/ns1/ns1-go.v2 v2.7.2 h1:UxwltdwgxWR1oK44eK2bYkSaZD/eq7jUMgrSH4HTApk=
-gopkg.in/ns1/ns1-go.v2 v2.7.2/go.mod h1:GMnKY+ZuoJ+lVLL+78uSTjwTz2jMazq6AfGKQOYhsPk=
+gopkg.in/ns1/ns1-go.v2 v2.7.3 h1:YZ1YfVEk4eU9AoJsUjIi67Kv61LfZixQoRceWScDDvY=
+gopkg.in/ns1/ns1-go.v2 v2.7.3/go.mod h1:GMnKY+ZuoJ+lVLL+78uSTjwTz2jMazq6AfGKQOYhsPk=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

ns1/resource_apikey.go

@@ -131,7 +131,7 @@ func ApikeyRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*ns1.Client)
 	k, resp, err := client.APIKeys.Get(d.Id())
 	if err != nil {
-		if resp != nil && resp.StatusCode == 404 {
+		if err == ns1.ErrKeyMissing {
 			log.Printf("[DEBUG] NS1 API key (%s) not found", d.Id())
 			d.SetId("")
 			return nil

ns1/resource_monitoringjob.go

@@ -280,6 +280,7 @@ func MonitoringJobRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*ns1.Client)
 	j, resp, err := client.Jobs.Get(d.Id())
 	if err != nil {
+		// No custom error type is currently defined in the SDK for a monitoring job.
 		if resp != nil && resp.StatusCode == 404 {
 			log.Printf("[DEBUG] NS1 record (%s) not found", d.Id())
 			d.SetId("")

ns1/resource_notifylist.go

@@ -141,7 +141,7 @@ func NotifyListRead(d *schema.ResourceData, meta interface{}) error {
 
 	nl, resp, err := client.Notifications.Get(d.Id())
 	if err != nil {
-		if resp != nil && resp.StatusCode == 404 {
+		if err == ns1.ErrListMissing {
 			log.Printf("[DEBUG] NS1 notify list (%s) not found", d.Id())
 			d.SetId("")
 			return nil

ns1/resource_team.go

@@ -121,7 +121,7 @@ func TeamRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*ns1.Client)
 	t, resp, err := client.Teams.Get(d.Id())
 	if err != nil {
-		if resp != nil && resp.StatusCode == 404 {
+		if err == ns1.ErrTeamMissing {
 			log.Printf("[DEBUG] NS1 team (%s) not found", d.Id())
 			d.SetId("")
 			return nil

ns1/resource_user.go

@@ -151,7 +151,7 @@ func UserRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*ns1.Client)
 	u, resp, err := client.Users.Get(d.Id())
 	if err != nil {
-		if resp != nil && resp.StatusCode == 404 {
+		if err == ns1.ErrUserMissing {
 			log.Printf("[DEBUG] NS1 user (%s) not found", d.Id())
 			d.SetId("")
 			return nil