First review

Author: SharaevN

docs/data-sources/project_milestone.md

@@ -34,7 +34,7 @@ data "gitlab_project_milestone" "example" {
 
 ### Required
 
-- `milestone_id` (Number) The global ID of the project’s milestone.
+- `milestone_id` (Number) The instance-wide ID of the project’s milestone.
 - `project_id` (String) The ID or URL-encoded path of the project owned by the authenticated user.
 
 ### Optional
@@ -47,7 +47,7 @@ data "gitlab_project_milestone" "example" {
 - `description` (String) The description of the milestone.
 - `due_date` (String) The due date of the milestone. Date time string in the format YYYY-MM-DD, for example 2016-03-11.
 - `expired` (Boolean) Bool, true if milestore expired.
-- `iid` (Number) The ID of the milestone only in one project.
+- `iid` (Number) The ID of the project's milestone.
 - `start_date` (String) The start date of the milestone. Date time string in the format YYYY-MM-DD, for example 2016-03-11.
 - `state` (String) The state of the milestone. Valid values are: `active`, `closed`.
 - `title` (String) The title of a milestone.

docs/resources/project_milestone.md

@@ -3,13 +3,13 @@
 page_title: "gitlab_project_milestone Resource - terraform-provider-gitlab"
 subcategory: ""
 description: |-
-  The gitlab_project_milestone resource allows to manage the lifecycle of a milestone (project).
+  The gitlab_project_milestone resource allows to manage the lifecycle of a project milestone.
   Upstream API: GitLab REST API docs https://docs.gitlab.com/ee/api/milestones.html
 ---
 
 # gitlab_project_milestone (Resource)
 
-The `gitlab_project_milestone` resource allows to manage the lifecycle of a milestone (project).
+The `gitlab_project_milestone` resource allows to manage the lifecycle of a project milestone.
 
 **Upstream API**: [GitLab REST API docs](https://docs.gitlab.com/ee/api/milestones.html)
 
@@ -50,8 +50,8 @@ resource "gitlab_project_milestone" "example" {
 ### Read-Only
 
 - `expired` (Boolean) Bool, true if milestore expired.
-- `iid` (Number) The ID of the milestone only in one project.
-- `milestone_id` (Number) The global ID of the project’s milestone.
+- `iid` (Number) The ID of the project's milestone.
+- `milestone_id` (Number) The instance-wide ID of the project’s milestone.
 - `web_url` (String) The web URL of the milestone.
 
 ## Import

internal/provider/data_source_gitlab_project_milestone.go

@@ -28,7 +28,7 @@ func dataSourceGitlabProjectMilestoneRead(ctx context.Context, d *schema.Resourc
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	d.SetId(buildTwoPartIDInterface(project, milestoneID))
+	d.SetId(resourceGitLabProjectMilestoneBuildId(project, milestoneID))
 	stateMap := gitlabProjectMilestoneToStateMap(milestone)
 
 	if err := setStateMapInResourceData(stateMap, d); err != nil {

internal/provider/data_source_gitlab_project_milestone_test.go

@@ -18,7 +18,11 @@ func TestAccDataSourceGitlabProjectMilestone_basic(t *testing.T) {
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataGitlabProjectMilestoneConfig(testProject.ID, testMilestone.ID),
+				Config: fmt.Sprintf(`
+                data "gitlab_project_milestone" "this" {
+                  project_id   = "%d"
+                  milestone_id = "%d"
+                }`, testProject.ID, testMilestone.ID),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.gitlab_project_milestone.this", "milestone_id", fmt.Sprintf("%v", testMilestone.ID)),
 					resource.TestCheckResourceAttr("data.gitlab_project_milestone.this", "title", testMilestone.Title),
@@ -28,12 +32,3 @@ func TestAccDataSourceGitlabProjectMilestone_basic(t *testing.T) {
 		},
 	})
 }
-
-func testAccDataGitlabProjectMilestoneConfig(projectID int, milestoneID int) string {
-	return fmt.Sprintf(`
-data "gitlab_project_milestone" "this" {
-  project_id   = "%d"
-  milestone_id = "%d"
-}
-`, projectID, milestoneID)
-}

internal/provider/data_source_gitlab_project_milestones.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"context"
+	"fmt"
 	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -113,7 +114,7 @@ func dataSourceGitlabProjectMilestonesRead(ctx context.Context, d *schema.Resour
 	}
 
 	log.Printf("[DEBUG] get gitlab milestones from project: %s", project)
-	d.SetId(buildTwoPartIDInterface(project, optionsHash))
+	d.SetId(fmt.Sprintf("%s:%d", project, optionsHash))
 	if err = d.Set("milestones", flattenGitlabProjectMilestones(milestones)); err != nil {
 		return diag.Errorf("Failed to set milestones to state: %v", err)
 	}

internal/provider/data_source_gitlab_project_milestones_test.go

@@ -18,7 +18,10 @@ func TestAccDataGitlabProjectMilestones_basic(t *testing.T) {
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataGitlabProjectMilestonesConfig(testProject.ID),
+				Config: fmt.Sprintf(`
+                data "gitlab_project_milestones" "this" {
+                  project_id = "%d"
+                }`, testProject.ID),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.gitlab_project_milestones.this", "milestones.#", fmt.Sprintf("%d", len(testMilestones))),
 					resource.TestCheckResourceAttr("data.gitlab_project_milestones.this", "milestones.0.title", testMilestones[1].Title),
@@ -30,11 +33,3 @@ func TestAccDataGitlabProjectMilestones_basic(t *testing.T) {
 		},
 	})
 }
-
-func testAccDataGitlabProjectMilestonesConfig(projectID int) string {
-	return fmt.Sprintf(`
-data "gitlab_project_milestones" "this" {
-  project_id   = "%d"
-}
-`, projectID)
-}

internal/provider/resource_gitlab_project_milestone.go

@@ -2,7 +2,9 @@ package provider
 
 import (
 	"context"
+	"fmt"
 	"log"
+	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -16,7 +18,7 @@ var milestoneStateToStateEvent = map[string]string{
 
 var _ = registerResource("gitlab_project_milestone", func() *schema.Resource {
 	return &schema.Resource{
-		Description: `The ` + "`gitlab_project_milestone`" + ` resource allows to manage the lifecycle of a milestone (project).
+		Description: `The ` + "`gitlab_project_milestone`" + ` resource allows to manage the lifecycle of a project milestone.
 
 **Upstream API**: [GitLab REST API docs](https://docs.gitlab.com/ee/api/milestones.html)`,
 
@@ -27,9 +29,7 @@ var _ = registerResource("gitlab_project_milestone", func() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
-		Schema: constructSchema(
-			gitlabProjectMilestoneGetSchema(),
-		),
+		Schema: gitlabProjectMilestoneGetSchema(),
 	}
 })
 
@@ -65,7 +65,7 @@ func resourceGitlabProjectMilestoneCreate(ctx context.Context, d *schema.Resourc
 		log.Printf("[WARN] failed to create gitlab milestone in project %s with title %s (response %v)", project, title, resp)
 		return diag.FromErr(err)
 	}
-	d.SetId(buildTwoPartIDInterface(project, milestone.ID))
+	d.SetId(resourceGitLabProjectMilestoneBuildId(project, milestone.ID))
 
 	updateOptions := gitlab.UpdateMilestoneOptions{}
 	if stateEvent, ok := d.GetOk("state"); ok {
@@ -83,7 +83,7 @@ func resourceGitlabProjectMilestoneCreate(ctx context.Context, d *schema.Resourc
 
 func resourceGitlabProjectMilestoneRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*gitlab.Client)
-	project, milestoneID, err := parseTwoPartIDInt(d.Id())
+	project, milestoneID, err := resourceGitLabProjectMilestoneParseId(d.Id())
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -109,7 +109,7 @@ func resourceGitlabProjectMilestoneRead(ctx context.Context, d *schema.ResourceD
 
 func resourceGitlabProjectMilestoneUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*gitlab.Client)
-	project, milestoneID, err := parseTwoPartIDInt(d.Id())
+	project, milestoneID, err := resourceGitLabProjectMilestoneParseId(d.Id())
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -153,7 +153,7 @@ func resourceGitlabProjectMilestoneUpdate(ctx context.Context, d *schema.Resourc
 
 func resourceGitlabProjectMilestoneDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*gitlab.Client)
-	project, milestoneID, err := parseTwoPartIDInt(d.Id())
+	project, milestoneID, err := resourceGitLabProjectMilestoneParseId(d.Id())
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -166,3 +166,22 @@ func resourceGitlabProjectMilestoneDelete(ctx context.Context, d *schema.Resourc
 	}
 	return nil
 }
+
+func resourceGitLabProjectMilestoneParseId(id string) (string, int, error) {
+	project, milestone, err := parseTwoPartID(id)
+	if err != nil {
+		return "", 0, err
+	}
+
+	milestoneID, err := strconv.Atoi(milestone)
+	if err != nil {
+		return "", 0, err
+	}
+
+	return project, milestoneID, nil
+}
+
+func resourceGitLabProjectMilestoneBuildId(project string, milestoneID int) string {
+	stringMilestoneID := fmt.Sprintf("%d", milestoneID)
+	return buildTwoPartID(&project, &stringMilestoneID)
+}