Fix Jira Service error handling (gitlabhq#363)

armsnyder · sfang97 · commit 4a13ccaed299 · 2020-09-08T14:44:15.000-05:00
diff --git a/gitlab/resource_gitlab_service_jira.go b/gitlab/resource_gitlab_service_jira.go
@@ -94,9 +94,8 @@ func resourceGitlabServiceJiraCreate(d *schema.ResourceData, meta interface{}) e
 
 	log.Printf("[DEBUG] Create Gitlab Jira service")
 
-	_, setServiceErr := client.Services.SetJiraService(project, jiraOptions)
-	if err != nil {
-		return fmt.Errorf("[ERROR] Couldn't create Gitlab Jira service: %s", setServiceErr)
+	if _, err := client.Services.SetJiraService(project, jiraOptions); err != nil {
+		return fmt.Errorf("couldn't create Gitlab Jira service: %w", err)
 	}
 
 	d.SetId(project)

Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,8 @@ func resourceGitlabServiceJiraCreate(d *schema.ResourceData, meta interface{}) e`
`94`	`94`
`95`	`95`	`log.Printf("[DEBUG] Create Gitlab Jira service")`
`96`	`96`
`97`		`- _, setServiceErr := client.Services.SetJiraService(project, jiraOptions)`
`98`		`- if err != nil {`
`99`		`- return fmt.Errorf("[ERROR] Couldn't create Gitlab Jira service: %s", setServiceErr)`
	`97`	`+ if _, err := client.Services.SetJiraService(project, jiraOptions); err != nil {`
	`98`	`+ return fmt.Errorf("couldn't create Gitlab Jira service: %w", err)`
`100`	`99`	`}`
`101`	`100`
`102`	`101`	`d.SetId(project)`