Review 2

Author: SharaevN

docs/data-sources/project_milestone.md

@@ -35,7 +35,7 @@ data "gitlab_project_milestone" "example" {
 ### Required
 
 - `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.
+- `project_id` (Number) The project ID of milestone.
 
 ### Read-Only
 
@@ -45,6 +45,7 @@ data "gitlab_project_milestone" "example" {
 - `expired` (Boolean) Bool, true if milestore expired.
 - `id` (String) The ID of this resource.
 - `iid` (Number) The ID of the project's milestone.
+- `project` (String) The ID or URL-encoded path of the project owned by the authenticated user.
 - `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/data-sources/project_milestones.md

@@ -32,7 +32,7 @@ data "gitlab_project_milestones" "example" {
 
 ### Required
 
-- `project_id` (String) The ID or URL-encoded path of the project owned by the authenticated user.
+- `project` (String) The ID or URL-encoded path of the project owned by the authenticated user.
 
 ### Optional
 
@@ -58,7 +58,8 @@ Read-Only:
 - `expired` (Boolean)
 - `iid` (Number)
 - `milestone_id` (Number)
-- `project_id` (String)
+- `project` (String)
+- `project_id` (Number)
 - `start_date` (String)
 - `state` (String)
 - `title` (String)

docs/resources/project_milestone.md

@@ -34,7 +34,7 @@ resource "gitlab_project_milestone" "example" {
 
 ### Required
 
-- `project_id` (String) The ID or URL-encoded path of the project owned by the authenticated user.
+- `project` (String) The ID or URL-encoded path of the project owned by the authenticated user.
 - `title` (String) The title of a milestone.
 
 ### Optional
@@ -52,6 +52,7 @@ resource "gitlab_project_milestone" "example" {
 - `id` (String) The ID of this resource.
 - `iid` (Number) The ID of the project's milestone.
 - `milestone_id` (Number) The instance-wide ID of the project’s milestone.
+- `project_id` (Number) The project ID of milestone.
 - `web_url` (String) The web URL of the milestone.
 
 ## Import

internal/provider/data_source_gitlab_project_milestone.go

@@ -21,15 +21,15 @@ var _ = registerDataSource("gitlab_project_milestone", func() *schema.Resource {
 
 func dataSourceGitlabProjectMilestoneRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*gitlab.Client)
-	project := d.Get("project_id").(string)
+	project := d.Get("project").(string)
 	milestoneID := d.Get("milestone_id").(int)
 
 	milestone, _, err := client.Milestones.GetMilestone(project, milestoneID, gitlab.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	d.SetId(resourceGitLabProjectMilestoneBuildId(project, milestoneID))
-	stateMap := gitlabProjectMilestoneToStateMap(milestone)
+	d.SetId(resourceGitLabProjectMilestoneBuildId(project, milestone.ID))
+	stateMap := gitlabProjectMilestoneToStateMap(project, milestone)
 
 	if err := setStateMapInResourceData(stateMap, d); err != nil {
 		return diag.FromErr(err)

internal/provider/data_source_gitlab_project_milestone_test.go

@@ -1,3 +1,6 @@
+//go:build acceptance
+// +build acceptance
+
 package provider
 
 import (
@@ -8,19 +11,17 @@ import (
 )
 
 func TestAccDataSourceGitlabProjectMilestone_basic(t *testing.T) {
-	testAccCheck(t)
 
 	testProject := testAccCreateProject(t)
 	testMilestone := testAccAddProjectMilestones(t, testProject, 1)[0]
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
                 data "gitlab_project_milestone" "this" {
-                  project_id   = "%d"
+                  project      = "%d"
                   milestone_id = "%d"
                 }`, testProject.ID, testMilestone.ID),
 				Check: resource.ComposeTestCheckFunc(

internal/provider/data_source_gitlab_project_milestones.go

@@ -22,7 +22,7 @@ var _ = registerDataSource("gitlab_project_milestones", func() *schema.Resource
 
 		ReadContext: dataSourceGitlabProjectMilestonesRead,
 		Schema: map[string]*schema.Schema{
-			"project_id": {
+			"project": {
 				Description: "The ID or URL-encoded path of the project owned by the authenticated user.",
 				Type:        schema.TypeString,
 				Required:    true,
@@ -69,7 +69,7 @@ var _ = registerDataSource("gitlab_project_milestones", func() *schema.Resource
 func dataSourceGitlabProjectMilestonesRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*gitlab.Client)
 
-	project := d.Get("project_id").(string)
+	project := d.Get("project").(string)
 	options := gitlab.ListMilestonesOptions{
 		ListOptions: gitlab.ListOptions{
 			PerPage: 20,
@@ -115,16 +115,16 @@ func dataSourceGitlabProjectMilestonesRead(ctx context.Context, d *schema.Resour
 
 	log.Printf("[DEBUG] get gitlab milestones from project: %s", project)
 	d.SetId(fmt.Sprintf("%s:%d", project, optionsHash))
-	if err = d.Set("milestones", flattenGitlabProjectMilestones(milestones)); err != nil {
+	if err = d.Set("milestones", flattenGitlabProjectMilestones(project, milestones)); err != nil {
 		return diag.Errorf("Failed to set milestones to state: %v", err)
 	}
 
 	return nil
 }
 
-func flattenGitlabProjectMilestones(milestones []*gitlab.Milestone) (values []map[string]interface{}) {
+func flattenGitlabProjectMilestones(project string, milestones []*gitlab.Milestone) (values []map[string]interface{}) {
 	for _, milestone := range milestones {
-		values = append(values, gitlabProjectMilestoneToStateMap(milestone))
+		values = append(values, gitlabProjectMilestoneToStateMap(project, milestone))
 	}
 	return values
 }

internal/provider/data_source_gitlab_project_milestones_test.go

@@ -1,3 +1,6 @@
+//go:build acceptance
+// +build acceptance
+
 package provider
 
 import (
@@ -8,13 +11,11 @@ import (
 )
 
 func TestAccDataGitlabProjectMilestones_basic(t *testing.T) {
-	testAccCheck(t)
 
 	testProject := testAccCreateProject(t)
 	testMilestones := testAccAddProjectMilestones(t, testProject, 2)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{

internal/provider/resource_gitlab_project_milestone.go

@@ -35,7 +35,7 @@ var _ = registerResource("gitlab_project_milestone", func() *schema.Resource {
 
 func resourceGitlabProjectMilestoneCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*gitlab.Client)
-	project := d.Get("project_id").(string)
+	project := d.Get("project").(string)
 	title := d.Get("title").(string)
 
 	options := &gitlab.CreateMilestoneOptions{
@@ -100,7 +100,7 @@ func resourceGitlabProjectMilestoneRead(ctx context.Context, d *schema.ResourceD
 		return diag.FromErr(err)
 	}
 
-	stateMap := gitlabProjectMilestoneToStateMap(milestone)
+	stateMap := gitlabProjectMilestoneToStateMap(project, milestone)
 	if err = setStateMapInResourceData(stateMap, d); err != nil {
 		return diag.FromErr(err)
 	}
@@ -158,10 +158,10 @@ func resourceGitlabProjectMilestoneDelete(ctx context.Context, d *schema.Resourc
 		return diag.FromErr(err)
 	}
 
-	log.Printf("[debug] delete gitlab milestone in project %s with ID %d", project, milestoneID)
+	log.Printf("[DEBUG] delete gitlab milestone in project %s with ID %d", project, milestoneID)
 	resp, err := client.Milestones.DeleteMilestone(project, milestoneID, gitlab.WithContext(ctx))
 	if err != nil {
-		log.Printf("[debug] failed to delete gitlab milestone in project %s with ID %d. Response %v", project, milestoneID, resp)
+		log.Printf("[DEBUG] failed to delete gitlab milestone in project %s with ID %d. Response %v", project, milestoneID, resp)
 		return diag.FromErr(err)
 	}
 	return nil

internal/provider/resource_gitlab_project_milestone_test.go

@@ -1,3 +1,6 @@
+//go:build acceptance
+// +build acceptance
+
 package provider
 
 import (
@@ -11,23 +14,21 @@ import (
 )
 
 func TestAccGitlabProjectMilestone_basic(t *testing.T) {
-	testAccCheck(t)
 
 	rInt1, rInt2 := acctest.RandInt(), acctest.RandInt()
 	project := testAccCreateProject(t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
 		ProviderFactories: providerFactories,
 		CheckDestroy:      testAccCheckGitlabProjectMilestoneDestroy,
 		Steps: []resource.TestStep{
 			{
 				// create Milestone with required values only
 				Config: fmt.Sprintf(`
                 resource "gitlab_project_milestone" "this" {
-                  project_id = "%d"
-                  title      = "test-%d"
-                }`, project.ID, rInt1),
+                  project = "%v"
+                  title   = "test-%d"
+                }`, project.PathWithNamespace, rInt1),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("gitlab_project_milestone.this", "iid"),
 					resource.TestCheckResourceAttrSet("gitlab_project_milestone.this", "milestone_id"),
@@ -47,8 +48,8 @@ func TestAccGitlabProjectMilestone_basic(t *testing.T) {
 				// update some Milestone attributes
 				Config: fmt.Sprintf(`
                 resource "gitlab_project_milestone" "this" {
-                  project_id = "%[1]d"
-                  title      = "test-%[2]d"
+                  project     = "%[1]d"
+                  title       = "test-%[2]d"
                   description = "test-%[2]d"
                   start_date  = "2022-04-10"
                   due_date    = "2022-04-15"
@@ -78,12 +79,12 @@ func testAccCheckGitlabProjectMilestoneDestroy(s *terraform.State) error {
 		if rs.Type != "gitlab_project_milestone" {
 			continue
 		}
-		project, milestoneID, err := resourceGitLabProjectMilestoneParseId(rs.Primary.ID)
+		projectID, milestoneID, err := resourceGitLabProjectMilestoneParseId(rs.Primary.ID)
 		if err != nil {
 			return err
 		}
 
-		milestone, _, err := testGitlabClient.Milestones.GetMilestone(project, milestoneID)
+		milestone, _, err := testGitlabClient.Milestones.GetMilestone(projectID, milestoneID)
 		if err == nil && milestone != nil {
 			return errors.New("Milestone still exists")
 		}

internal/provider/schema_gitlab_project_milestone.go

@@ -13,17 +13,7 @@ func gitlabProjectMilestoneGetSchema() map[string]*schema.Schema {
 	validMilestoneStates := []string{"active", "closed"}
 
 	return map[string]*schema.Schema{
-		"iid": {
-			Description: "The ID of the project's milestone.",
-			Type:        schema.TypeInt,
-			Computed:    true,
-		},
-		"milestone_id": {
-			Description: "The instance-wide ID of the project’s milestone.",
-			Type:        schema.TypeInt,
-			Computed:    true,
-		},
-		"project_id": {
+		"project": {
 			Description: "The ID or URL-encoded path of the project owned by the authenticated user.",
 			Type:        schema.TypeString,
 			ForceNew:    true,
@@ -51,50 +41,66 @@ func gitlabProjectMilestoneGetSchema() map[string]*schema.Schema {
 			Optional:         true,
 			ValidateDiagFunc: isISO6801Date,
 		},
-		"updated_at": {
-			Description: "The last update time of the milestone. Date time string, ISO 8601 formatted, for example 2016-03-11T03:45:40Z.",
+		// NOTE: not part of `CREATE`, but part of `UPDATE` with the `state_event` field.
+		"state": {
+			Description:      fmt.Sprintf("The state of the milestone. Valid values are: %s.", renderValueListForDocs(validMilestoneStates)),
+			Type:             schema.TypeString,
+			Optional:         true,
+			Default:          "active",
+			ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice(validMilestoneStates, false)),
+		},
+		"created_at": {
+			Description: "The time of creation of the milestone. Date time string, ISO 8601 formatted, for example 2016-03-11T03:45:40Z.",
 			Type:        schema.TypeString,
-			Computed:    true,
 			Optional:    true,
+			Computed:    true,
 			// NOTE: since RFC3339 is pretty much a subset of ISO8601 and actually expected by GitLab,
 			//       we use it here to avoid having to parse the string ourselves.
 			ValidateDiagFunc: validation.ToDiagFunc(validation.IsRFC3339Time),
 		},
-		"created_at": {
-			Description: "The time of creation of the milestone. Date time string, ISO 8601 formatted, for example 2016-03-11T03:45:40Z.",
+		"updated_at": {
+			Description: "The last update time of the milestone. Date time string, ISO 8601 formatted, for example 2016-03-11T03:45:40Z.",
 			Type:        schema.TypeString,
-			Computed:    true,
 			Optional:    true,
+			Computed:    true,
 			// NOTE: since RFC3339 is pretty much a subset of ISO8601 and actually expected by GitLab,
 			//       we use it here to avoid having to parse the string ourselves.
 			ValidateDiagFunc: validation.ToDiagFunc(validation.IsRFC3339Time),
 		},
-		// NOTE: not part of `CREATE`, but part of `UPDATE` with the `state_event` field.
-		"state": {
-			Description:      fmt.Sprintf("The state of the milestone. Valid values are: %s.", renderValueListForDocs(validMilestoneStates)),
-			Type:             schema.TypeString,
-			Optional:         true,
-			Default:          "active",
-			ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice(validMilestoneStates, false)),
+		"expired": {
+			Description: "Bool, true if milestore expired.",
+			Type:        schema.TypeBool,
+			Computed:    true,
+		},
+		"iid": {
+			Description: "The ID of the project's milestone.",
+			Type:        schema.TypeInt,
+			Computed:    true,
+		},
+		"milestone_id": {
+			Description: "The instance-wide ID of the project’s milestone.",
+			Type:        schema.TypeInt,
+			Computed:    true,
+		},
+		"project_id": {
+			Description: "The project ID of milestone.",
+			Type:        schema.TypeInt,
+			Computed:    true,
 		},
 		"web_url": {
 			Description: "The web URL of the milestone.",
 			Type:        schema.TypeString,
 			Computed:    true,
 		},
-		"expired": {
-			Description: "Bool, true if milestore expired.",
-			Type:        schema.TypeBool,
-			Computed:    true,
-		},
 	}
 }
 
-func gitlabProjectMilestoneToStateMap(milestone *gitlab.Milestone) map[string]interface{} {
+func gitlabProjectMilestoneToStateMap(project string, milestone *gitlab.Milestone) map[string]interface{} {
 	stateMap := make(map[string]interface{})
 	stateMap["iid"] = milestone.IID
 	stateMap["milestone_id"] = milestone.ID
-	stateMap["project_id"] = fmt.Sprintf("%d", milestone.ProjectID)
+	stateMap["project"] = project
+	stateMap["project_id"] = milestone.ProjectID
 	stateMap["title"] = milestone.Title
 	stateMap["description"] = milestone.Description
 	if milestone.DueDate != nil {