Handle 404s of GetRole and 4XX on DeleteRole.

src/role.go

@@ -205,6 +205,14 @@ func (r *RoleInterfaceProvider) Read(ctx context.Context, req resource.ReadReque
 		return
 	}
 
+	if authressSdkRole == nil {
+		resp.Diagnostics.AddError(
+			"Authress Role exists in the Terraform plan but does not exist in Authress:",
+			GetErrorWrapper("Either recreate the role in the Authress Management Portal or remove it from your state file. Role ID:" + currentAuthressRoleResource.RoleID.ValueString()),
+		)
+		return
+	}
+
 	// Set refreshed currentAuthressRoleResource
 	currentAuthressRoleResource = MapSdkRoleToTerraform(authressSdkRole)
 	diags = resp.State.Set(ctx, &currentAuthressRoleResource)

src/sdk/client.go

@@ -30,24 +30,24 @@ func NewClient(customDomain string, accessKey string, version string) (*Client,
 	return &c, nil
 }
 
-func (c *Client) doRequest(req *http.Request) ([]byte, error) {
+func (c *Client) doRequest(req *http.Request) ([]byte, int, error) {
 	req.Header.Set("Authorization", "Bearer " + c.AccessKey)
 	req.Header.Set("User-Agent", "Terraform SDK " + c.Version)
 
 	res, err := c.HTTPClient.Do(req)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 	defer res.Body.Close()
 
 	body, err := ioutil.ReadAll(res.Body)
 	if err != nil {
-		return nil, err
+		return nil, res.StatusCode, err
 	}
 
 	if res.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("status: %d, body: %s", res.StatusCode, body)
+		return nil, res.StatusCode, fmt.Errorf("status: %d, body: %s", res.StatusCode, body)
 	}
 
-	return body, err
+	return body, res.StatusCode, err
 }

src/sdk/rolesApi.go

@@ -13,7 +13,7 @@ func (c *Client) GetRoles() ([]Role, error) {
 		return nil, err
 	}
 
-	body, err := c.doRequest(req)
+	body, _, err := c.doRequest(req)
 	if err != nil {
 		return nil, err
 	}
@@ -33,7 +33,10 @@ func (c *Client) GetRole(roleID string) (*Role, error) {
 		return nil, err
 	}
 
-	body, err := c.doRequest(req)
+	body, status, err := c.doRequest(req)
+	if status == http.StatusNotFound {
+		return nil, nil
+	}
 	if err != nil {
 		return nil, err
 	}
@@ -58,7 +61,7 @@ func (c *Client) CreateRole(role Role) (*Role, error) {
 		return nil, err
 	}
 
-	body, err := c.doRequest(req)
+	body, _, err := c.doRequest(req)
 	if err != nil {
 		return nil, err
 	}
@@ -83,7 +86,7 @@ func (c *Client) UpdateRole(roleID string, role Role) (*Role, error) {
 		return nil, err
 	}
 
-	body, err := c.doRequest(req)
+	body, _, err := c.doRequest(req)
 	if err != nil {
 		return nil, err
 	}
@@ -104,7 +107,11 @@ func (c *Client) DeleteRole(roleID string) error {
 		return err
 	}
 
-	_, err = c.doRequest(req)
+	_, status, err := c.doRequest(req)
+
+	if status < http.StatusInternalServerError {
+		return nil
+	}
 
 	if err != nil {
 		return err