Merge pull request #597 from grv87/feature/jira_missing_options

feat: add api_url option for Jira service

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

@@ -55,6 +55,13 @@ var _ = registerResource("gitlab_service_jira", func() *schema.Resource {
 				Required:     true,
 				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,
+			},
 			"project_key": {
 				Description: "The short identifier for your JIRA project, all uppercase, e.g., PROJ.",
 				Type:        schema.TypeString,
@@ -182,9 +189,14 @@ 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)
 	}
+	if v := jiraService.Properties.APIURL; v != "" {
+		d.Set("api_url", v)
+	}
 	if v := jiraService.Properties.Username; v != "" {
 		d.Set("username", v)
 	}
@@ -244,7 +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("jira_issue_transition_id"); val != nil {
+	if val, ok := d.GetOk("api_url"); ok {
+		setJiraServiceOptions.APIURL = gitlab.String(val.(string))
+	}
+	if val, ok := d.GetOk("jira_issue_transition_id"); ok {
 		setJiraServiceOptions.JiraIssueTransitionID = gitlab.String(val.(string))
 	}
 

internal/provider/resource_gitlab_service_jira_test.go

@@ -39,6 +39,7 @@ func TestAccGitlabServiceJira_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGitlabServiceJiraExists(jiraResourceName, &jiraService),
 					resource.TestCheckResourceAttr(jiraResourceName, "url", "https://testurl.com"),
+					resource.TestCheckResourceAttr(jiraResourceName, "api_url", "https://testurl.com/rest"),
 					resource.TestCheckResourceAttr(jiraResourceName, "username", "user2"),
 					resource.TestCheckResourceAttr(jiraResourceName, "password", "mypass_update"),
 					resource.TestCheckResourceAttr(jiraResourceName, "jira_issue_transition_id", "3"),
@@ -53,6 +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://testurl.com/rest"),
 					resource.TestCheckResourceAttr(jiraResourceName, "username", "user1"),
 					resource.TestCheckResourceAttr(jiraResourceName, "password", "mypass"),
 					resource.TestCheckResourceAttr(jiraResourceName, "commit_events", "true"),
@@ -184,6 +186,7 @@ resource "gitlab_project" "foo" {
 resource "gitlab_service_jira" "jira" {
   project  = "${gitlab_project.foo.id}"
   url      = "https://testurl.com"
+  api_url  = "https://testurl.com/rest"
   username = "user2"
   password = "mypass_update"
   jira_issue_transition_id = "3"