Check type assertions and added GetStatusCode (#122)

* Check type assertions and added GetStatusCode

* Use `GetStatusCode` in stream dashboard

.go-version

@@ -1 +1 @@
-1.70.13
+1.70.14

client/client.go

@@ -28,6 +28,7 @@ type Headers map[string]string
 
 type APIResponseCarrier interface {
 	GetHTTPResponse() *http.Response
+	GetStatusCode() int
 }
 
 // APIClientError contains the HTTP Response(for inspection of the error code) as well as the error message
@@ -43,6 +44,14 @@ func (a APIClientError) GetHTTPResponse() *http.Response {
 	return a.Response
 }
 
+func (a APIClientError) GetStatusCode() int {
+	if a.Response == nil {
+		return -1 // not a known http status code
+	}
+
+	return a.Response.StatusCode
+}
+
 // Envelope represents a generic response from the API
 type Envelope struct {
 	Data json.RawMessage `json:"data"`

client/destinations.go

@@ -76,8 +76,8 @@ func (c *Client) GetDestination(ctx context.Context, projectName string, destina
 func (c *Client) DeleteDestination(ctx context.Context, project string, destinationID string) error {
 	err := c.CallAPI(ctx, "DELETE", fmt.Sprintf("projects/%v/destinations/%v", project, destinationID), nil, nil)
 	if err != nil {
-		apiClientError := err.(APIResponseCarrier)
-		if apiClientError.GetHTTPResponse().StatusCode != http.StatusNoContent {
+		apiClientError, ok := err.(APIResponseCarrier)
+		if !ok || apiClientError.GetStatusCode() != http.StatusNoContent {
 			return err
 		}
 	}

client/destinations_test.go

@@ -0,0 +1,45 @@
+package client
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_DeleteDestionation_when_connection_is_closed(t *testing.T) {
+	var server *httptest.Server
+	server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		assert.Equal(t, "/public/v0.2/blars/projects/tacoman/destinations/hi", r.URL.Path)
+
+		server.CloseClientConnections()
+	}))
+	defer server.Close()
+
+	t.Setenv("LIGHTSTEP_API_BASE_URL", server.URL)
+	c := NewClient("api", "blars", "staging")
+	err := c.DeleteDestination(context.Background(), "tacoman", "hi")
+
+	assert.NotNil(t, err)
+
+	apiErr, ok := err.(APIClientError)
+
+	assert.True(t, ok)
+	assert.Equal(t, -1, apiErr.GetStatusCode())
+}
+
+func Test_DeleteDestination_when_connection_has_wrong_content_length(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Length", "1") // set content length to 1 so reading body fails
+	}))
+	defer server.Close()
+
+	t.Setenv("LIGHTSTEP_API_BASE_URL", server.URL)
+	c := NewClient("api", "blars", "staging")
+	err := c.DeleteDestination(context.Background(), "tacoman", "hi")
+
+	assert.NotNil(t, err)
+	assert.Equal(t, "unexpected EOF", err.Error())
+}

client/metric_conditions.go

@@ -206,8 +206,8 @@ func (c *Client) DeleteMetricCondition(ctx context.Context, projectName string,
 
 	err := c.CallAPI(ctx, "DELETE", url, nil, nil)
 	if err != nil {
-		apiClientError := err.(APIResponseCarrier)
-		if apiClientError.GetHTTPResponse().StatusCode != http.StatusNoContent {
+		apiClientError, ok := err.(APIResponseCarrier)
+		if !ok || apiClientError.GetStatusCode() != http.StatusNoContent {
 			return err
 		}
 	}

client/metric_conditions_test.go

@@ -0,0 +1,45 @@
+package client
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_DeleteMetricCondition_when_connection_is_closed(t *testing.T) {
+	var server *httptest.Server
+	server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		assert.Equal(t, "/public/v0.2/blars/projects/tacoman/metric_alerts/hi", r.URL.Path)
+
+		server.CloseClientConnections()
+	}))
+	defer server.Close()
+
+	t.Setenv("LIGHTSTEP_API_BASE_URL", server.URL)
+	c := NewClient("api", "blars", "staging")
+	err := c.DeleteMetricCondition(context.Background(), "tacoman", "hi")
+
+	assert.NotNil(t, err)
+
+	apiErr, ok := err.(APIClientError)
+
+	assert.True(t, ok)
+	assert.Equal(t, -1, apiErr.GetStatusCode())
+}
+
+func Test_DeleteMetricCondition_when_connection_has_wrong_content_length(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Length", "1") // set content length to 1 so reading body fails
+	}))
+	defer server.Close()
+
+	t.Setenv("LIGHTSTEP_API_BASE_URL", server.URL)
+	c := NewClient("api", "blars", "staging")
+	err := c.DeleteMetricCondition(context.Background(), "tacoman", "hi")
+
+	assert.NotNil(t, err)
+	assert.Equal(t, "unexpected EOF", err.Error())
+}

client/metric_dashboards.go

@@ -151,8 +151,8 @@ func (c *Client) DeleteUnifiedDashboard(ctx context.Context, projectName string,
 
 	err := c.CallAPI(ctx, "DELETE", url, nil, nil)
 	if err != nil {
-		apiClientError := err.(APIResponseCarrier)
-		if apiClientError.GetHTTPResponse().StatusCode != http.StatusNoContent {
+		apiClientError, ok := err.(APIResponseCarrier)
+		if !ok || apiClientError.GetStatusCode() != http.StatusNoContent {
 			return err
 		}
 	}

client/metric_dashboards_test.go

@@ -1,8 +1,12 @@
 package client
 
 import (
+	"context"
+	"net/http"
+	"net/http/httptest"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -34,3 +38,37 @@ func Test_getUnifiedDashboardURL(t *testing.T) {
 		require.Equal(t, c.expected, result)
 	}
 }
+
+func Test_DeleteMetricDashboard_when_connection_is_closed(t *testing.T) {
+	var server *httptest.Server
+	server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		assert.Equal(t, "/public/v0.2/blars/projects/tacoman/metric_dashboards/hi", r.URL.Path)
+
+		server.CloseClientConnections()
+	}))
+	defer server.Close()
+
+	t.Setenv("LIGHTSTEP_API_BASE_URL", server.URL)
+	c := NewClient("api", "blars", "staging")
+	err := c.DeleteUnifiedDashboard(context.Background(), "tacoman", "hi")
+	assert.NotNil(t, err)
+
+	apiErr, ok := err.(APIClientError)
+
+	assert.True(t, ok)
+	assert.Equal(t, -1, apiErr.GetStatusCode())
+}
+
+func Test_DeleteMetricDashboard_when_connection_has_wrong_content_length(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Length", "1") // set content length to 1 so reading body fails
+	}))
+	defer server.Close()
+
+	t.Setenv("LIGHTSTEP_API_BASE_URL", server.URL)
+	c := NewClient("api", "blars", "staging")
+	err := c.DeleteUnifiedDashboard(context.Background(), "tacoman", "hi")
+
+	assert.NotNil(t, err)
+	assert.Equal(t, "unexpected EOF", err.Error())
+}

client/stream_alerting_rule.go

@@ -121,8 +121,8 @@ func (c *Client) GetAlertingRule(ctx context.Context, projectName string, alerti
 func (c *Client) DeleteAlertingRule(ctx context.Context, projectName string, alertingRuleID string) error {
 	err := c.CallAPI(ctx, "DELETE", fmt.Sprintf("projects/%v/alerting_rules/%v", projectName, alertingRuleID), nil, nil)
 	if err != nil {
-		apiClientError := err.(APIResponseCarrier)
-		if apiClientError.GetHTTPResponse().StatusCode != http.StatusNoContent {
+		apiClientError, ok := err.(APIResponseCarrier)
+		if !ok || apiClientError.GetStatusCode() != http.StatusNoContent {
 			return err
 		}
 	}

client/stream_conditions.go

@@ -138,8 +138,8 @@ func (c *Client) GetStreamCondition(ctx context.Context, projectName string, con
 func (c *Client) DeleteStreamCondition(ctx context.Context, projectName string, conditionID string) error {
 	err := c.CallAPI(ctx, "DELETE", fmt.Sprintf("projects/%v/conditions/%v", projectName, conditionID), nil, nil)
 	if err != nil {
-		apiClientError := err.(APIResponseCarrier)
-		if apiClientError.GetHTTPResponse().StatusCode != http.StatusNoContent {
+		apiClientError, ok := err.(APIResponseCarrier)
+		if !ok || apiClientError.GetStatusCode() != http.StatusNoContent {
 			return err
 		}
 	}

client/stream_dashboards.go

@@ -114,8 +114,8 @@ func (c *Client) GetDashboard(ctx context.Context, projectName string, dashboard
 func (c *Client) DeleteDashboard(ctx context.Context, projectName string, dashboardID string) error {
 	err := c.CallAPI(ctx, "DELETE", fmt.Sprintf("projects/%v/dashboards/%v", projectName, dashboardID), nil, nil)
 	if err != nil {
-		apiClientError := err.(APIResponseCarrier)
-		if apiClientError.GetHTTPResponse().StatusCode != http.StatusNoContent {
+		apiClientError, ok := err.(APIResponseCarrier)
+		if !ok || apiClientError.GetStatusCode() != http.StatusNoContent {
 			return err
 		}
 	}

client/streams.go

@@ -173,8 +173,8 @@ func (c *Client) UpdateStream(ctx context.Context, projectName string,
 func (c *Client) DeleteStream(ctx context.Context, projectName string, StreamID string) error {
 	err := c.CallAPI(ctx, "DELETE", fmt.Sprintf("projects/%v/streams/%v", projectName, StreamID), nil, nil)
 	if err != nil {
-		apiClientError := err.(APIResponseCarrier)
-		if apiClientError.GetHTTPResponse().StatusCode != http.StatusNoContent {
+		apiClientError, ok := err.(APIResponseCarrier)
+		if !ok || apiClientError.GetStatusCode() != http.StatusNoContent {
 			return err
 		}
 	}

lightstep/data_source_stream.go

@@ -41,8 +41,12 @@ func dataSourceLightstepStreamRead(ctx context.Context, d *schema.ResourceData,
 	c := m.(*client.Client)
 	s, err := c.GetStream(ctx, d.Get("project_name").(string), d.Get("stream_id").(string))
 	if err != nil {
-		apiErr := err.(client.APIResponseCarrier)
-		if apiErr.GetHTTPResponse().StatusCode == http.StatusNotFound {
+		apiErr, ok := err.(client.APIResponseCarrier)
+		if !ok {
+			return diag.FromErr(fmt.Errorf("failed to get stream: %v", err))
+		}
+
+		if apiErr.GetStatusCode() == http.StatusNotFound {
 			d.SetId("")
 			return diag.FromErr(fmt.Errorf("stream not found: %v", apiErr))
 		}

lightstep/resource_alerting_rule.go

@@ -77,12 +77,18 @@ func resourceAlertingRuleRead(ctx context.Context, d *schema.ResourceData, m int
 	c := m.(*client.Client)
 	rule, err := c.GetAlertingRule(ctx, d.Get("project_name").(string), d.Id())
 	if err != nil {
-		apiErr := err.(client.APIResponseCarrier)
-		if apiErr.GetHTTPResponse().StatusCode == http.StatusNotFound {
+		apiErr, ok := err.(client.APIResponseCarrier)
+
+		if !ok {
+			return diag.FromErr(fmt.Errorf("failed to get alerting rule: %v", err))
+		}
+
+		if apiErr.GetStatusCode() == http.StatusNotFound {
 			d.SetId("")
 			return diags
 		}
-		return diag.FromErr(fmt.Errorf("failed to get alerting rule: %v", apiErr))
+
+		return diag.FromErr(fmt.Errorf("failed to get alerting rule: %v", err))
 	}
 
 	if err := setResourceDataFromAlertingRule(d, *rule); err != nil {

lightstep/resource_metric_condition.go

@@ -333,11 +333,16 @@ func resourceMetricConditionRead(ctx context.Context, d *schema.ResourceData, m
 	c := m.(*client.Client)
 	cond, err := c.GetMetricCondition(ctx, d.Get("project_name").(string), d.Id())
 	if err != nil {
-		apiErr := err.(client.APIResponseCarrier)
-		if apiErr.GetHTTPResponse().StatusCode == http.StatusNotFound {
+		apiErr, ok := err.(client.APIResponseCarrier)
+		if !ok {
+			return diag.FromErr(fmt.Errorf("failed to get metric condition: %v", err))
+		}
+
+		if apiErr.GetStatusCode() == http.StatusNotFound {
 			d.SetId("")
 			return diags
 		}
+
 		return diag.FromErr(fmt.Errorf("failed to get metric condition: %v", apiErr))
 	}
 

lightstep/resource_metric_dashboard.go

@@ -161,11 +161,16 @@ func (p *resourceUnifiedDashboardImp) resourceUnifiedDashboardRead(ctx context.C
 
 	dashboard, err := c.GetUnifiedDashboard(ctx, d.Get("project_name").(string), d.Id(), convertToQueryString)
 	if err != nil {
-		apiErr := err.(client.APIResponseCarrier)
-		if apiErr.GetHTTPResponse() != nil && apiErr.GetHTTPResponse().StatusCode == http.StatusNotFound {
+		apiErr, ok := err.(client.APIResponseCarrier)
+		if !ok {
+			return diag.FromErr(fmt.Errorf("failed to get dashboard: %v", err))
+		}
+
+		if apiErr.GetStatusCode() == http.StatusNotFound {
 			d.SetId("")
 			return diags
 		}
+
 		return diag.FromErr(fmt.Errorf("failed to get dashboard: %v", apiErr))
 	}
 

lightstep/resource_slack_destination.go

@@ -42,11 +42,16 @@ func resourceSlackDestinationRead(ctx context.Context, d *schema.ResourceData, m
 	c := m.(*client.Client)
 	dest, err := c.GetDestination(ctx, d.Get("project_name").(string), d.Id())
 	if err != nil {
-		apiErr := err.(client.APIResponseCarrier)
-		if apiErr.GetHTTPResponse().StatusCode == http.StatusNotFound {
+		apiErr, ok := err.(client.APIResponseCarrier)
+		if !ok {
+			return diag.FromErr(fmt.Errorf("failed to get slack destination: %v", err))
+		}
+
+		if apiErr.GetStatusCode() == http.StatusNotFound {
 			d.SetId("")
 			return diags
 		}
+
 		return diag.FromErr(fmt.Errorf("failed to get slack destination: %v", apiErr))
 	}
 

lightstep/resource_stream_condition.go

@@ -77,11 +77,16 @@ func resourceStreamConditionRead(ctx context.Context, d *schema.ResourceData, m
 	c := m.(*client.Client)
 	condition, err := c.GetStreamCondition(ctx, d.Get("project_name").(string), d.Id())
 	if err != nil {
-		apiErr := err.(client.APIResponseCarrier)
+		apiErr, ok := err.(client.APIResponseCarrier)
+		if !ok {
+			return diag.FromErr(fmt.Errorf("failed to get stream condition: %v", err))
+		}
+
 		if apiErr.GetHTTPResponse().StatusCode == http.StatusNotFound {
 			d.SetId("")
 			return diags
 		}
+
 		return diag.FromErr(fmt.Errorf("failed to get stream condition: %v", apiErr))
 	}
 

lightstep/resource_stream_dashboard.go

@@ -68,11 +68,16 @@ func resourceStreamDashboardRead(ctx context.Context, d *schema.ResourceData, m
 
 	dashboard, err := c.GetDashboard(ctx, projectName, resourceId)
 	if err != nil {
-		apiErr := err.(client.APIResponseCarrier)
-		if apiErr.GetHTTPResponse().StatusCode == http.StatusNotFound {
+		apiErr, ok := err.(client.APIResponseCarrier)
+		if !ok {
+			return diag.FromErr(fmt.Errorf("failed to get stream dashboard for [project: %v; resource_id: %v]: %v", projectName, resourceId, err))
+		}
+
+		if apiErr.GetStatusCode() == http.StatusNotFound {
 			d.SetId("")
 			return diags
 		}
+
 		return diag.FromErr(fmt.Errorf("failed to get stream dashboard for [project: %v; resource_id: %v]: %v", projectName, resourceId, apiErr))
 	}