resource/gitlab_service_jira: cleanup api_url for #597.

Author: timofurrer

docs/resources/service_jira.md

@@ -39,6 +39,7 @@ resource "gitlab_service_jira" "jira" {
 
 ### Optional
 
+- **api_url** (String) The base URL to the Jira instance API. Web URL value is used if not set. For example, https://jira-api.example.com.
 - **comment_on_event_enabled** (Boolean) Enable comments inside Jira issues on each GitLab event (commit / merge request)
 - **commit_events** (Boolean) Enable notifications for commit events
 - **id** (String) The ID of this resource.

internal/provider/resource_gitlab_service_jira.go

@@ -56,10 +56,11 @@ var _ = registerResource("gitlab_service_jira", func() *schema.Resource {
 				ValidateFunc: validateURLFunc,
 			},
 			"api_url": {
+				Description:  "The base URL to the Jira instance API. Web URL value is used if not set. For example, https://jira-api.example.com.",
 				Type:         schema.TypeString,
 				Optional:     true,
+				Computed:     true,
 				ValidateFunc: validateURLFunc,
-				Default:      "",
 			},
 			"project_key": {
 				Description: "The short identifier for your JIRA project, all uppercase, e.g., PROJ.",
@@ -188,6 +189,8 @@ func resourceGitlabServiceJiraRead(ctx context.Context, d *schema.ResourceData,
 		return diag.FromErr(err)
 	}
 
+	log.Printf("[TIMOOOO:] %+v", jiraService)
+
 	if v := jiraService.Properties.URL; v != "" {
 		d.Set("url", v)
 	}
@@ -253,10 +256,10 @@ func expandJiraOptions(d *schema.ResourceData) (*gitlab.SetJiraServiceOptions, e
 	setJiraServiceOptions.CommentOnEventEnabled = gitlab.Bool(d.Get("comment_on_event_enabled").(bool))
 
 	// Set optional properties
-	if val := d.Get("api_url"); val != nil {
+	if val, ok := d.GetOk("api_url"); ok {
 		setJiraServiceOptions.APIURL = gitlab.String(val.(string))
 	}
-	if val := d.Get("jira_issue_transition_id"); val != nil {
+	if val, ok := d.GetOk("jira_issue_transition_id"); ok {
 		setJiraServiceOptions.JiraIssueTransitionID = gitlab.String(val.(string))
 	}
 

internal/provider/resource_gitlab_service_jira_test.go

@@ -26,7 +26,6 @@ func TestAccGitlabServiceJira_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGitlabServiceJiraExists(jiraResourceName, &jiraService),
 					resource.TestCheckResourceAttr(jiraResourceName, "url", "https://test.com"),
-					resource.TestCheckResourceAttr(jiraResourceName, "api_url", "https://test.com/api"),
 					resource.TestCheckResourceAttr(jiraResourceName, "username", "user1"),
 					resource.TestCheckResourceAttr(jiraResourceName, "password", "mypass"),
 					resource.TestCheckResourceAttr(jiraResourceName, "commit_events", "true"),
@@ -55,7 +54,7 @@ func TestAccGitlabServiceJira_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGitlabServiceJiraExists(jiraResourceName, &jiraService),
 					resource.TestCheckResourceAttr(jiraResourceName, "url", "https://test.com"),
-					resource.TestCheckResourceAttr(jiraResourceName, "api_url", "https://test.com/api"),
+					resource.TestCheckResourceAttr(jiraResourceName, "api_url", "https://testurl.com/rest"),
 					resource.TestCheckResourceAttr(jiraResourceName, "username", "user1"),
 					resource.TestCheckResourceAttr(jiraResourceName, "password", "mypass"),
 					resource.TestCheckResourceAttr(jiraResourceName, "commit_events", "true"),
@@ -165,7 +164,6 @@ resource "gitlab_project" "foo" {
 resource "gitlab_service_jira" "jira" {
   project  = "${gitlab_project.foo.id}"
   url      = "https://test.com"
-  api_url  = "https://test.com/api"
   username = "user1"
   password = "mypass"
   commit_events = true