Merge pull request #1188 from timofurrer/feature/gitlab-15.2

Officially support GitLab 15.0, 15.1 and 15.2

Author: RicePatrick

.github/workflows/pr-acceptance-ce.yml

@@ -34,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gitlab-version: ["14.10.4-ce.0", "15.0.3-ce.0", "15.1.0-ce.0"]
+        gitlab-version: ["15.0.4-ce.0", "15.1.3-ce.0", "15.2.0-ce.0"]
     steps:
       - uses: actions/setup-go@v3
         with:

.github/workflows/pr-acceptance-ee.yml

@@ -68,7 +68,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gitlab-version: ["14.10.4-ee.0", "15.0.3-ee.0", "15.1.0-ee.0"]
+        gitlab-version: ["15.0.4-ee.0", "15.1.3-ee.0", "15.2.0-ee.0"]
     steps:
       - uses: actions/setup-go@v3
         with:

.github/workflows/push.yml

@@ -97,7 +97,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gitlab-version: ["14.10.4-ce.0", "15.0.3-ce.0", "15.1.0-ce.0"]
+        gitlab-version: ["15.0.4-ce.0", "15.1.3-ce.0", "15.2.0-ce.0"]
     steps:
       - uses: actions/setup-go@v3
         with:
@@ -121,7 +121,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gitlab-version: ["14.10.4-ee.0", "15.0.3-ee.0", "15.1.0-ee.0"]
+        gitlab-version: ["15.0.4-ee.0", "15.1.3-ee.0", "15.2.0-ee.0"]
     steps:
       - uses: actions/setup-go@v3
         with:

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.17.0 (Unreleased)
+
+This release was tested against GitLab 15.0, 15.1 and 15.2 for both CE and EE.
+
 ## 3.16.1 (2022-07-11)
 
 This release was tested against GitLab 14.10, 15.0 and 15.1 for both CE and EE.

docs/resources/service_jira.md

@@ -46,7 +46,7 @@ resource "gitlab_service_jira" "jira" {
 - `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
 - `issues_events` (Boolean) Enable notifications for issues events.
-- `jira_issue_transition_id` (String) The ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (Administration > Issues > Workflows) by selecting View under Operations of the desired workflow of your project. By default, this ID is set to 2. **Note**: importing this field is currently not supported.
+- `jira_issue_transition_id` (String) The ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (Administration > Issues > Workflows) by selecting View under Operations of the desired workflow of your project. By default, this ID is set to 2. *Note**: importing this field is only supported since GitLab 15.2.
 - `job_events` (Boolean) Enable notifications for job events.
 - `merge_requests_events` (Boolean) Enable notifications for merge request events
 - `note_events` (Boolean) Enable notifications for note events.

internal/provider/resource_gitlab_service_jira.go

@@ -81,7 +81,7 @@ var _ = registerResource("gitlab_service_jira", func() *schema.Resource {
 				Sensitive:   true,
 			},
 			"jira_issue_transition_id": {
-				Description: "The ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (Administration > Issues > Workflows) by selecting View under Operations of the desired workflow of your project. By default, this ID is set to 2. **Note**: importing this field is currently not supported.",
+				Description: "The ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (Administration > Issues > Workflows) by selecting View under Operations of the desired workflow of your project. By default, this ID is set to 2. *Note**: importing this field is only supported since GitLab 15.2.",
 				Type:        schema.TypeString,
 				Optional:    true,
 			},
@@ -185,10 +185,12 @@ func resourceGitlabServiceJiraRead(ctx context.Context, d *schema.ResourceData,
 	d.Set("api_url", jiraService.Properties.APIURL)
 	d.Set("username", jiraService.Properties.Username)
 	d.Set("project_key", jiraService.Properties.ProjectKey)
-	// FIXME: The API or go-gitlab doesn't return `jira_issue_transition_id` properly,
-	//        therefore we don't overwrite the value set in the config, in case it's not set in the API
-	//        response. This currently impacts the import of this attribute.
-	if jiraService.Properties.JiraIssueTransitionID != "" {
+
+	hasJiraIssueTransitionIDFixed, err := isGitLabVersionAtLeast(ctx, client, "15.2")()
+	if err != nil {
+		return diag.Errorf("failed to check if `jira_issue_transition_id` is properly supported in GitLab version: %v", err)
+	}
+	if hasJiraIssueTransitionIDFixed || jiraService.Properties.JiraIssueTransitionID != "" {
 		d.Set("jira_issue_transition_id", jiraService.Properties.JiraIssueTransitionID)
 	}
 	d.Set("title", jiraService.Title)
@@ -238,14 +240,8 @@ func expandJiraOptions(d *schema.ResourceData) (*gitlab.SetJiraServiceOptions, e
 	setJiraServiceOptions.CommitEvents = gitlab.Bool(d.Get("commit_events").(bool))
 	setJiraServiceOptions.MergeRequestsEvents = gitlab.Bool(d.Get("merge_requests_events").(bool))
 	setJiraServiceOptions.CommentOnEventEnabled = gitlab.Bool(d.Get("comment_on_event_enabled").(bool))
-
-	// Set optional properties
-	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))
-	}
+	setJiraServiceOptions.APIURL = gitlab.String(d.Get("api_url").(string))
+	setJiraServiceOptions.JiraIssueTransitionID = gitlab.String(d.Get("jira_issue_transition_id").(string))
 
 	return &setJiraServiceOptions, nil
 }

internal/provider/resource_gitlab_service_jira_test.go

@@ -40,8 +40,7 @@ func TestAccGitlabServiceJira_basic(t *testing.T) {
 				ResourceName:      jiraResourceName,
 				ImportState:       true,
 				ImportStateVerify: true,
-				// FIXME: there is a bug in the GitLab API which causes the `jira_issue_transition_id` field
-				//        to be empty in the response. Therefore, we ignore it for now in the import.
+				// TODO: as soon as we remove support for GitLab < 15.2 we can remove ignoring `jira_issue_transition_id`.
 				//        See https://gitlab.com/gitlab-org/gitlab/-/issues/362437
 				ImportStateVerifyIgnore: []string{"password", "jira_issue_transition_id"},
 			},
@@ -65,8 +64,7 @@ func TestAccGitlabServiceJira_basic(t *testing.T) {
 				ResourceName:      jiraResourceName,
 				ImportState:       true,
 				ImportStateVerify: true,
-				// FIXME: there is a bug in the GitLab API which causes the `jira_issue_transition_id` field
-				//        to be empty in the response. Therefore, we ignore it for now in the import.
+				// TODO: as soon as we remove support for GitLab < 15.2 we can remove ignoring `jira_issue_transition_id`.
 				//        See https://gitlab.com/gitlab-org/gitlab/-/issues/362437
 				ImportStateVerifyIgnore: []string{"password", "jira_issue_transition_id"},
 			},
@@ -89,8 +87,7 @@ func TestAccGitlabServiceJira_basic(t *testing.T) {
 				ResourceName:      jiraResourceName,
 				ImportState:       true,
 				ImportStateVerify: true,
-				// FIXME: there is a bug in the GitLab API which causes the `jira_issue_transition_id` field
-				//        to be empty in the response. Therefore, we ignore it for now in the import.
+				// TODO: as soon as we remove support for GitLab < 15.2 we can remove ignoring `jira_issue_transition_id`.
 				//        See https://gitlab.com/gitlab-org/gitlab/-/issues/362437
 				ImportStateVerifyIgnore: []string{"password", "jira_issue_transition_id"},
 			},