From f0f40a317a1a8ccdf09842f2ea675be8fd1edd46 Mon Sep 17 00:00:00 2001
From: Timo Furrer <tuxtimo@gmail.com>
Date: Wed, 16 Mar 2022 08:25:23 +0100
Subject: [PATCH] environments: Implement missing `created_at` and `updated_at`
 fields

Required by:

* https://github.com/gitlabhq/terraform-provider-gitlab/pull/938
---
 environments.go      |  3 +++
 environments_test.go | 47 ++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/environments.go b/environments.go
index d88129395..7e0b2675a 100644
--- a/environments.go
+++ b/environments.go
@@ -19,6 +19,7 @@ package gitlab
 import (
 	"fmt"
 	"net/http"
+	"time"
 )
 
 // EnvironmentsService handles communication with the environment related methods
@@ -39,6 +40,8 @@ type Environment struct {
 	State          string      `json:"state"`
 	ExternalURL    string      `json:"external_url"`
 	Project        *Project    `json:"project"`
+	CreatedAt      *time.Time  `json:"created_at"`
+	UpdatedAt      *time.Time  `json:"updated_at"`
 	LastDeployment *Deployment `json:"last_deployment"`
 }
 
diff --git a/environments_test.go b/environments_test.go
index ebc76a9d7..77df7ac0a 100644
--- a/environments_test.go
+++ b/environments_test.go
@@ -23,6 +23,7 @@ import (
 	"net/http"
 	"reflect"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -34,7 +35,17 @@ func TestListEnvironments(t *testing.T) {
 	mux.HandleFunc("/api/v4/projects/1/environments", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodGet)
 		testURL(t, r, "/api/v4/projects/1/environments?name=review%2Ffix-foo&page=1&per_page=10")
-		fmt.Fprint(w, `[{"id": 1,"name": "review/fix-foo", "slug": "review-fix-foo-dfjre3", "external_url": "https://review-fix-foo-dfjre3.example.gitlab.com"}]`)
+		fmt.Fprint(w, `[
+			{
+				"id": 1,
+				"name": "review/fix-foo",
+				"slug": "review-fix-foo-dfjre3",
+				"external_url": "https://review-fix-foo-dfjre3.example.gitlab.com",
+				"state": "stopped",
+				"created_at": "2013-10-02T10:12:29Z",
+				"updated_at": "2013-12-02T10:12:29Z"
+			}
+		]`)
 	})
 
 	envs, _, err := client.Environments.ListEnvironments(1, &ListEnvironmentsOptions{Name: String("review/fix-foo"), ListOptions: ListOptions{Page: 1, PerPage: 10}})
@@ -42,7 +53,17 @@ func TestListEnvironments(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	want := []*Environment{{ID: 1, Name: "review/fix-foo", Slug: "review-fix-foo-dfjre3", ExternalURL: "https://review-fix-foo-dfjre3.example.gitlab.com"}}
+	createdAtWant, _ := time.Parse(timeLayout, "2013-10-02T10:12:29Z")
+	updatedAtWant, _ := time.Parse(timeLayout, "2013-12-02T10:12:29Z")
+	want := []*Environment{{
+		ID:          1,
+		Name:        "review/fix-foo",
+		Slug:        "review-fix-foo-dfjre3",
+		ExternalURL: "https://review-fix-foo-dfjre3.example.gitlab.com",
+		State:       "stopped",
+		CreatedAt:   &createdAtWant,
+		UpdatedAt:   &updatedAtWant,
+	}}
 	if !reflect.DeepEqual(want, envs) {
 		t.Errorf("Environments.ListEnvironments returned %+v, want %+v", envs, want)
 	}
@@ -54,7 +75,15 @@ func TestGetEnvironment(t *testing.T) {
 
 	mux.HandleFunc("/api/v4/projects/1/environments/5949167", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodGet)
-		fmt.Fprint(w, `{"id":1,"name":"test/test"}`)
+		fmt.Fprint(w, `{
+			"id": 1,
+			"name": "review/fix-foo",
+			"slug": "review-fix-foo-dfjre3",
+			"external_url": "https://review-fix-foo-dfjre3.example.gitlab.com",
+			"state": "stopped",
+			"created_at": "2013-10-02T10:12:29Z",
+			"updated_at": "2013-12-02T10:12:29Z"
+		}`)
 	})
 
 	env, _, err := client.Environments.GetEnvironment(1, 5949167)
@@ -62,7 +91,17 @@ func TestGetEnvironment(t *testing.T) {
 		t.Errorf("Environemtns.GetEnvironment returned error: %v", err)
 	}
 
-	want := &Environment{ID: 1, Name: "test/test"}
+	createdAtWant, _ := time.Parse(timeLayout, "2013-10-02T10:12:29Z")
+	updatedAtWant, _ := time.Parse(timeLayout, "2013-12-02T10:12:29Z")
+	want := &Environment{
+		ID:          1,
+		Name:        "review/fix-foo",
+		Slug:        "review-fix-foo-dfjre3",
+		ExternalURL: "https://review-fix-foo-dfjre3.example.gitlab.com",
+		State:       "stopped",
+		CreatedAt:   &createdAtWant,
+		UpdatedAt:   &updatedAtWant,
+	}
 	if !reflect.DeepEqual(want, env) {
 		t.Errorf("Environments.GetEnvironment returned %+v, want %+v", env, want)
 	}