Review 3

Author: SharaevN

docs/resources/project_milestone.md

@@ -39,20 +39,20 @@ resource "gitlab_project_milestone" "example" {
 
 ### Optional
 
-- `created_at` (String) The time of creation of the milestone. Date time string, ISO 8601 formatted, for example 2016-03-11T03:45:40Z.
 - `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.
 - `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`.
-- `updated_at` (String) The last update time of the milestone. Date time string, ISO 8601 formatted, for example 2016-03-11T03:45:40Z.
 
 ### Read-Only
 
+- `created_at` (String) The time of creation of the milestone. Date time string, ISO 8601 formatted, for example 2016-03-11T03:45:40Z.
 - `expired` (Boolean) Bool, true if milestore expired.
 - `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.
+- `updated_at` (String) The last update time of the milestone. Date time string, ISO 8601 formatted, for example 2016-03-11T03:45:40Z.
 - `web_url` (String) The web URL of the milestone.
 
 ## Import

internal/provider/data_source_gitlab_project_milestone_test.go

@@ -20,10 +20,10 @@ func TestAccDataSourceGitlabProjectMilestone_basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
-                data "gitlab_project_milestone" "this" {
-                  project      = "%d"
-                  milestone_id = "%d"
-                }`, testProject.ID, testMilestone.ID),
+				data "gitlab_project_milestone" "this" {
+					project      = "%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),

internal/provider/data_source_gitlab_project_milestones_test.go

@@ -20,9 +20,9 @@ func TestAccDataGitlabProjectMilestones_basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
-                data "gitlab_project_milestones" "this" {
-                  project = "%d"
-                }`, testProject.ID),
+				data "gitlab_project_milestones" "this" {
+					project = "%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),

internal/provider/resource_gitlab_project_milestone.go

@@ -94,7 +94,7 @@ func resourceGitlabProjectMilestoneRead(ctx context.Context, d *schema.ResourceD
 		if is404(err) {
 			log.Printf("[WARN] recieved 404 for gitlab milestone ID %d in project %s, removing from state", milestoneID, project)
 			d.SetId("")
-			return diag.FromErr(err)
+			return nil
 		}
 		log.Printf("[WARN] failed to read gitlab milestone ID %d in project %s. Response %v", milestoneID, project, resp)
 		return diag.FromErr(err)

internal/provider/resource_gitlab_project_milestone_test.go

@@ -25,10 +25,10 @@ func TestAccGitlabProjectMilestone_basic(t *testing.T) {
 			{
 				// create Milestone with required values only
 				Config: fmt.Sprintf(`
-                resource "gitlab_project_milestone" "this" {
-                  project = "%v"
-                  title   = "test-%d"
-                }`, project.PathWithNamespace, rInt1),
+				resource "gitlab_project_milestone" "this" {
+					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,14 +47,14 @@ func TestAccGitlabProjectMilestone_basic(t *testing.T) {
 			{
 				// update some Milestone attributes
 				Config: fmt.Sprintf(`
-                resource "gitlab_project_milestone" "this" {
-                  project     = "%[1]d"
-                  title       = "test-%[2]d"
-                  description = "test-%[2]d"
-                  start_date  = "2022-04-10"
-                  due_date    = "2022-04-15"
-                  state       = "closed"
-                }`, project.ID, rInt2),
+				resource "gitlab_project_milestone" "this" {
+					project     = "%[1]d"
+					title       = "test-%[2]d"
+					description = "test-%[2]d"
+					start_date  = "2022-04-10"
+					due_date    = "2022-04-15"
+					state       = "closed"
+				}`, project.ID, rInt2),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("gitlab_project_milestone.this", "iid"),
 					resource.TestCheckResourceAttrSet("gitlab_project_milestone.this", "milestone_id"),

internal/provider/schema_gitlab_project_milestone.go

@@ -52,20 +52,7 @@ func gitlabProjectMilestoneGetSchema() map[string]*schema.Schema {
 		"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,
-			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),
-		},
-		"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,
-			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),
 		},
 		"expired": {
 			Description: "Bool, true if milestore expired.",
@@ -87,6 +74,11 @@ func gitlabProjectMilestoneGetSchema() map[string]*schema.Schema {
 			Type:        schema.TypeInt,
 			Computed:    true,
 		},
+		"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,
+		},
 		"web_url": {
 			Description: "The web URL of the milestone.",
 			Type:        schema.TypeString,
@@ -113,8 +105,16 @@ func gitlabProjectMilestoneToStateMap(project string, milestone *gitlab.Mileston
 	} else {
 		stateMap["start_date"] = nil
 	}
-	stateMap["updated_at"] = milestone.UpdatedAt.Format(time.RFC3339)
-	stateMap["created_at"] = milestone.CreatedAt.Format(time.RFC3339)
+	if milestone.UpdatedAt != nil {
+		stateMap["updated_at"] = milestone.UpdatedAt.Format(time.RFC3339)
+	} else {
+		stateMap["updated_at"] = nil
+	}
+	if milestone.CreatedAt != nil {
+		stateMap["created_at"] = milestone.CreatedAt.Format(time.RFC3339)
+	} else {
+		stateMap["created_at"] = nil
+	}
 	stateMap["state"] = milestone.State
 	stateMap["web_url"] = milestone.WebURL
 	if milestone.Expired != nil {