Added error parsing to cause project recreation on 404 (#69)

* Added error handling to cause project recreation on 404
The `request(...)` function now returns a custom error type `ResourceNotFoundError`

Co-authored-by: atlantisbot <lkysow+atlantis@gmail.com>
Co-authored-by: Matthias Bartelmeß <mba@fourplusone.de>

jira/resource_project.go

@@ -45,7 +45,7 @@ type ProjectRequest struct {
 	IssueSecurityScheme int    `json:"issueSecurityScheme,omitempty" structs:"issueSecurityScheme,omitempty"`
 	PermissionScheme    int    `json:"permissionScheme,omitempty" structs:"permissionScheme,omitempty"`
 	NotificationScheme  int    `json:"notificationScheme,omitempty" structs:"notificationScheme,omitempty"`
-	CategoryID          string    `json:"categoryId,omitempty" structs:"categoryId,omitempty"`
+	CategoryID          string `json:"categoryId,omitempty" structs:"categoryId,omitempty"`
 }
 
 type SharedConfigurationProjectResponse struct {
@@ -231,7 +231,12 @@ func resourceProjectRead(d *schema.ResourceData, m interface{}) error {
 
 	urlStr := fmt.Sprintf("%s/%s", projectAPIEndpoint, d.Id())
 	err := request(config.jiraClient, "GET", urlStr, nil, project)
+
 	if err != nil {
+		if errors.Is(err, ResourceNotFoundError) {
+			d.SetId("")
+			return nil
+		}
 		return errors.Wrap(err, "Request failed")
 	}
 

jira/resource_project_test.go

@@ -39,6 +39,31 @@ func TestAccJiraProject_basic(t *testing.T) {
 	})
 }
 
+func TestAccJiraProject_deleted(t *testing.T) {
+	rInt := acctest.RandInt()
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckJiraProjectDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccJiraProjectConfig(rInt),
+			},
+			{
+				PreConfig: func() {
+					urlStr := fmt.Sprintf("%s/PX%d", projectAPIEndpoint, rInt%100000)
+					jiraClient := testAccProvider.Meta().(*Config).jiraClient
+					err := request(jiraClient, "DELETE", urlStr, nil, nil)
+					if err != nil {
+						t.Fatal(err)
+					}
+				},
+				Config: testAccJiraProjectConfig(rInt),
+			},
+		},
+	})
+}
+
 func TestAccJiraProject_shared(t *testing.T) {
 	rInt := acctest.RandInt()
 
@@ -109,7 +134,7 @@ resource "jira_user" "foo" {
 }
 
 resource "jira_project_category" "category" {
-	name = "Managed"
+	name = "Managed %d"
   	description = "Managed Projects"
 }
 
@@ -120,7 +145,7 @@ resource "jira_project" "foo" {
   project_type_key = "business"
   project_template_key = "com.atlassian.jira-core-project-templates:jira-core-project-management"
   category_id = "${jira_project_category.category.id}"
-}`, rInt, rInt, rInt%100000)
+}`, rInt, rInt, rInt, rInt%100000)
 }
 
 func testAccJiraProjectConfigUpdate(rInt int) string {
@@ -132,7 +157,7 @@ resource "jira_user" "foo" {
 }
 
 resource "jira_project_category" "category" {
-	name = "Managed"
+	name = "Managed %d"
   	description = "Managed Projects"
 }
 
@@ -143,7 +168,7 @@ resource "jira_project" "foo" {
   project_type_key = "software"
   project_template_key = "com.atlassian.jira-core-project-templates:jira-core-project-management"
   category_id = "${jira_project_category.category.id}"
-}`, rInt, rInt, rInt%100000)
+}`, rInt, rInt, rInt, rInt%100000)
 }
 
 func testAccJiraSharedProjectConfig(rInt int) string {

jira/shared.go

@@ -39,6 +39,26 @@ func filterPermissionEndpoint(filterID string) string {
 
 }
 
+type resourceNotFoundError struct {
+	wrapped error
+}
+
+func (r *resourceNotFoundError) Error() string {
+	return "Resource not found"
+}
+
+func (r *resourceNotFoundError) Unwrap() error {
+	return r.wrapped
+}
+
+func (r *resourceNotFoundError) Is(e error) bool {
+	return e == ResourceNotFoundError
+}
+
+var (
+	ResourceNotFoundError = &resourceNotFoundError{} // Constant to use with errors.Is and errors.As
+)
+
 func request(client *jira.Client, method string, endpoint string, in interface{}, out interface{}) error {
 
 	req, err := client.NewRequest(method, endpoint, in)
@@ -49,16 +69,19 @@ func request(client *jira.Client, method string, endpoint string, in interface{}
 
 	res, err := client.Do(req, out)
 	if err != nil {
-
 		if in != nil && res != nil {
 			typeName := reflect.TypeOf(in).Name()
 			body, readErr := ioutil.ReadAll(res.Response.Body)
 			if readErr != nil {
 				return errors.Wrapf(readErr, "Creating %s Request failed", typeName)
 			}
 			return errors.Wrapf(err, "Creating %s Request failed: %s", typeName, body)
+		}
 
+		if res.StatusCode == 404 {
+			return &resourceNotFoundError{err}
 		}
+
 		return errors.Wrapf(err, "Creating Request failed")
 	}