feat: add api_url option for Jira service

Also mark project_key in docs as optional

Author: grv87

internal/provider/resource_gitlab_service_jira.go

@@ -55,6 +55,12 @@ var _ = registerResource("gitlab_service_jira", func() *schema.Resource {
 				Required:     true,
 				ValidateFunc: validateURLFunc,
 			},
+			"api_url": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validateURLFunc,
+				Default:      "",
+			},
 			"project_key": {
 				Description: "The short identifier for your JIRA project, all uppercase, e.g., PROJ.",
 				Type:        schema.TypeString,
@@ -185,6 +191,9 @@ func resourceGitlabServiceJiraRead(ctx context.Context, d *schema.ResourceData,
 	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,6 +253,9 @@ 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 {
+		setJiraServiceOptions.APIURL = gitlab.String(val.(string))
+	}
 	if val := d.Get("jira_issue_transition_id"); val != nil {
 		setJiraServiceOptions.JiraIssueTransitionID = gitlab.String(val.(string))
 	}

internal/provider/resource_gitlab_service_jira_test.go

@@ -26,6 +26,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, "username", "user1"),
 					resource.TestCheckResourceAttr(jiraResourceName, "password", "mypass"),
 					resource.TestCheckResourceAttr(jiraResourceName, "commit_events", "true"),
@@ -39,6 +40,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 +55,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, "username", "user1"),
 					resource.TestCheckResourceAttr(jiraResourceName, "password", "mypass"),
 					resource.TestCheckResourceAttr(jiraResourceName, "commit_events", "true"),
@@ -162,6 +165,7 @@ 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
@@ -184,6 +188,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"