From 0ae91f69fba60f73a552dab3677bd430c1c8c166 Mon Sep 17 00:00:00 2001
From: "Mazur, Michal" <mmazur@akamai.com>
Date: Fri, 5 Jul 2024 14:28:29 +0200
Subject: [PATCH] DXE-3736 Review implementation edgegrid part

---
 pkg/cloudaccess/access_key.go              |  2 +-
 pkg/cloudaccess/access_key_test.go         | 11 +++++++++++
 pkg/cloudaccess/access_key_version.go      |  2 +-
 pkg/cloudaccess/access_key_version_test.go |  4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkg/cloudaccess/access_key.go b/pkg/cloudaccess/access_key.go
index cc630aaa..73dd6145 100644
--- a/pkg/cloudaccess/access_key.go
+++ b/pkg/cloudaccess/access_key.go
@@ -131,7 +131,7 @@ func (r AccessKeyRequest) Validate() error {
 // Validate validates UpdateAccessKeyRequest
 func (r UpdateAccessKeyRequest) Validate() error {
 	return edgegriderr.ParseValidationErrors(validation.Errors{
-		"AccessKeyName": validation.Validate(r.AccessKeyName, validation.Required),
+		"AccessKeyName": validation.Validate(r.AccessKeyName, validation.Required, validation.Length(1, 50)),
 	})
 }
 
diff --git a/pkg/cloudaccess/access_key_test.go b/pkg/cloudaccess/access_key_test.go
index bdd60870..9ea15167 100644
--- a/pkg/cloudaccess/access_key_test.go
+++ b/pkg/cloudaccess/access_key_test.go
@@ -496,6 +496,17 @@ func TestUpdateAccessKey(t *testing.T) {
 				assert.Equal(t, "update an access key: struct validation: AccessKeyName: cannot be blank", err.Error())
 			},
 		},
+		"max length - validation error": {
+			params: AccessKeyRequest{
+				AccessKeyUID: 1,
+			},
+			accessKey: UpdateAccessKeyRequest{
+				AccessKeyName: "asdfghjkloasdfghjkloasdfghjkloasdfghjkloasdfghjkloasdfghjkloasdfghjkloasdfghjklo",
+			},
+			withError: func(t *testing.T, err error) {
+				assert.Equal(t, "update an access key: struct validation: AccessKeyName: the length must be between 1 and 50", err.Error())
+			},
+		},
 		"500 internal server error": {
 			accessKey: UpdateAccessKeyRequest{
 				AccessKeyName: "key2",
diff --git a/pkg/cloudaccess/access_key_version.go b/pkg/cloudaccess/access_key_version.go
index ed67b0a1..d68b0e16 100644
--- a/pkg/cloudaccess/access_key_version.go
+++ b/pkg/cloudaccess/access_key_version.go
@@ -16,7 +16,7 @@ type (
 	GetAccessKeyVersionStatusResponse struct {
 		AccessKeyVersion *KeyVersion    `json:"accessKeyVersion"`
 		ProcessingStatus ProcessingType `json:"processingStatus"`
-		RequestDate      string         `json:"requestDate"`
+		RequestDate      time.Time      `json:"requestDate"`
 		RequestedBy      string         `json:"requestedBy"`
 	}
 
diff --git a/pkg/cloudaccess/access_key_version_test.go b/pkg/cloudaccess/access_key_version_test.go
index 82f8e22c..ea73d3c4 100644
--- a/pkg/cloudaccess/access_key_version_test.go
+++ b/pkg/cloudaccess/access_key_version_test.go
@@ -41,7 +41,7 @@ func TestGetAccessKeyVersionStatus(t *testing.T) {
 			expectedPath: "/cam/v1/access-key-version-create-requests/1",
 			expectedResponse: &GetAccessKeyVersionStatusResponse{
 				ProcessingStatus: ProcessingInProgress,
-				RequestDate:      "2021-02-26T14:54:38.622074Z",
+				RequestDate:      time.Date(2021, 2, 26, 14, 54, 38, 622074000, time.UTC),
 				RequestedBy:      "user",
 				AccessKeyVersion: &KeyVersion{
 					AccessKeyUID: 123,
@@ -65,7 +65,7 @@ func TestGetAccessKeyVersionStatus(t *testing.T) {
 			expectedPath: "/cam/v1/access-key-version-create-requests/1",
 			expectedResponse: &GetAccessKeyVersionStatusResponse{
 				ProcessingStatus: ProcessingInProgress,
-				RequestDate:      "2021-02-26T14:54:38.622074Z",
+				RequestDate:      time.Date(2021, 2, 26, 14, 54, 38, 622074000, time.UTC),
 				RequestedBy:      "user",
 			},
 		},