fix: consistent oapi time formatting for env created_at

adityachoudhari26 · adityachoudhari26 · commit 168591bde0d6 · 2025-12-18T11:51:51.000-05:00
diff --git a/apps/workspace-engine/oapi/openapi.json b/apps/workspace-engine/oapi/openapi.json
@@ -569,6 +569,7 @@
          "Environment": {
             "properties": {
                "createdAt": {
+                  "format": "date-time",
                   "type": "string"
                },
                "description": {
diff --git a/apps/workspace-engine/oapi/spec/schemas/entities.jsonnet b/apps/workspace-engine/oapi/spec/schemas/entities.jsonnet
@@ -71,7 +71,7 @@ local openapi = import '../lib/openapi.libsonnet';
       description: { type: 'string' },
       systemId: { type: 'string' },
       resourceSelector: openapi.schemaRef('Selector'),
-      createdAt: { type: 'string' },
+      createdAt: { type: 'string', format: 'date-time' },
     },
   },
 
diff --git a/apps/workspace-engine/pkg/db/environments.go b/apps/workspace-engine/pkg/db/environments.go
@@ -52,7 +52,7 @@ func getEnvironments(ctx context.Context, workspaceID string) ([]*oapi.Environme
 		if err != nil {
 			return nil, err
 		}
-		environment.CreatedAt = createdAt.Format(time.RFC3339)
+		environment.CreatedAt = createdAt
 
 		// Wrap selector from unwrapped database format to JsonSelector format
 		environment.ResourceSelector, err = wrapSelectorFromDB(rawSelector)
diff --git a/apps/workspace-engine/pkg/db/environments_test.go b/apps/workspace-engine/pkg/db/environments_test.go
@@ -41,7 +41,7 @@ func validateRetrievedEnvironments(t *testing.T, actualEnvironments []*oapi.Envi
 		if (actualEnv.ResourceSelector == nil) != (expectedEnv.ResourceSelector == nil) {
 			t.Fatalf("resource_selector nil mismatch: expected %v, got %v", expectedEnv.ResourceSelector == nil, actualEnv.ResourceSelector == nil)
 		}
-		if actualEnv.CreatedAt == "" {
+		if actualEnv.CreatedAt.IsZero() {
 			t.Fatalf("expected environment created_at to be set")
 		}
 	}
diff --git a/apps/workspace-engine/pkg/db/persistence/store_test.go b/apps/workspace-engine/pkg/db/persistence/store_test.go
@@ -1179,7 +1179,7 @@ func TestStore_SaveAndLoad_OAPIEnvironment(t *testing.T) {
 		Id:        uuid.New().String(),
 		Name:      "production",
 		SystemId:  uuid.New().String(),
-		CreatedAt: time.Now().Format(time.RFC3339),
+		CreatedAt: time.Now(),
 	}
 
 	changes := persistence.Changes{
@@ -1412,7 +1412,7 @@ func TestStore_SaveAndLoad_AllOAPIEntityTypes(t *testing.T) {
 		Id:        uuid.New().String(),
 		Name:      "Environment 1",
 		SystemId:  uuid.New().String(),
-		CreatedAt: time.Now().Format(time.RFC3339),
+		CreatedAt: time.Now(),
 	}
 
 	system := &oapi.System{
diff --git a/apps/workspace-engine/pkg/events/handler/resources/resourceproviders_bench_test.go b/apps/workspace-engine/pkg/events/handler/resources/resourceproviders_bench_test.go
@@ -36,7 +36,6 @@ func createTestResource(workspaceID, resourceID, identifier, name string) *oapi.
 
 // createTestEnvironment creates a test environment with the given ID and system
 func createTestEnvironment(systemID, environmentID, name string) *oapi.Environment {
-	now := time.Now().Format(time.RFC3339)
 	selector := &oapi.Selector{}
 	// Create a selector that matches all resources (name starts with empty string)
 	_ = selector.FromJsonSelector(oapi.JsonSelector{
@@ -54,7 +53,7 @@ func createTestEnvironment(systemID, environmentID, name string) *oapi.Environme
 		Description:      &description,
 		SystemId:         systemID,
 		ResourceSelector: selector,
-		CreatedAt:        now,
+		CreatedAt:        time.Now(),
 	}
 }
 
diff --git a/apps/workspace-engine/pkg/oapi/oapi.gen.go b/apps/workspace-engine/pkg/oapi/oapi.gen.go
diff --git a/apps/workspace-engine/pkg/selector/match_test.go b/apps/workspace-engine/pkg/selector/match_test.go
@@ -398,7 +398,7 @@ func TestMatch_JsonSelector_Environment(t *testing.T) {
 				Id:        "1",
 				Name:      "production",
 				SystemId:  "sys1",
-				CreatedAt: "2024-01-01T00:00:00Z",
+				CreatedAt: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
 			},
 			wantMatch: true,
 			wantErr:   false,
@@ -414,7 +414,7 @@ func TestMatch_JsonSelector_Environment(t *testing.T) {
 				Id:        "2",
 				Name:      "staging",
 				SystemId:  "sys1",
-				CreatedAt: "2024-01-01T00:00:00Z",
+				CreatedAt: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
 			},
 			wantMatch: false,
 			wantErr:   false,
@@ -430,7 +430,7 @@ func TestMatch_JsonSelector_Environment(t *testing.T) {
 				Id:        "3",
 				Name:      "production-us-east",
 				SystemId:  "sys1",
-				CreatedAt: "2024-01-01T00:00:00Z",
+				CreatedAt: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
 			},
 			wantMatch: true,
 			wantErr:   false,
@@ -889,7 +889,7 @@ func TestMatch_CelSelector_Environment(t *testing.T) {
 				Id:        "1",
 				Name:      "production",
 				SystemId:  "sys1",
-				CreatedAt: "2024-01-01T00:00:00Z",
+				CreatedAt: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
 			},
 			wantMatch: true,
 			wantErr:   false,
@@ -901,7 +901,7 @@ func TestMatch_CelSelector_Environment(t *testing.T) {
 				Id:        "2",
 				Name:      "staging",
 				SystemId:  "sys1",
-				CreatedAt: "2024-01-01T00:00:00Z",
+				CreatedAt: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
 			},
 			wantMatch: false,
 			wantErr:   false,
@@ -913,7 +913,7 @@ func TestMatch_CelSelector_Environment(t *testing.T) {
 				Id:        "3",
 				Name:      "production-us-east",
 				SystemId:  "sys1",
-				CreatedAt: "2024-01-01T00:00:00Z",
+				CreatedAt: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
 			},
 			wantMatch: true,
 			wantErr:   false,
diff --git a/apps/workspace-engine/pkg/workspace/releasemanager/deployment/planner_bench_test.go b/apps/workspace-engine/pkg/workspace/releasemanager/deployment/planner_bench_test.go
@@ -27,7 +27,6 @@ func createTestSystem(workspaceID, id, name string) *oapi.System {
 }
 
 func createTestEnvironment(systemID, id, name string) *oapi.Environment {
-	now := time.Now().Format(time.RFC3339)
 	selector := &oapi.Selector{}
 	_ = selector.FromCelSelector(oapi.CelSelector{Cel: "true"})
 
@@ -38,7 +37,7 @@ func createTestEnvironment(systemID, id, name string) *oapi.Environment {
 		Description:      &description,
 		SystemId:         systemID,
 		ResourceSelector: selector,
-		CreatedAt:        now,
+		CreatedAt:        time.Now(),
 	}
 }
 
diff --git a/apps/workspace-engine/pkg/workspace/releasemanager/deployment/planner_test.go b/apps/workspace-engine/pkg/workspace/releasemanager/deployment/planner_test.go
@@ -41,7 +41,6 @@ func createTestSystemForPlanner(workspaceID, id, name string) *oapi.System {
 }
 
 func createTestEnvironmentForPlanner(systemID, id, name string) *oapi.Environment {
-	now := time.Now().Format(time.RFC3339)
 	selector := &oapi.Selector{}
 	_ = selector.FromCelSelector(oapi.CelSelector{Cel: "true"})
 
@@ -52,7 +51,7 @@ func createTestEnvironmentForPlanner(systemID, id, name string) *oapi.Environmen
 		Description:      &description,
 		SystemId:         systemID,
 		ResourceSelector: selector,
-		CreatedAt:        now,
+		CreatedAt:        time.Now(),
 	}
 }
 
diff --git a/apps/workspace-engine/pkg/workspace/releasemanager/verification/metrics/provider/http/http_test.go b/apps/workspace-engine/pkg/workspace/releasemanager/verification/metrics/provider/http/http_test.go
@@ -387,7 +387,7 @@ func TestResolve(t *testing.T) {
 				Environment: &oapi.Environment{
 					Id:        "env-456",
 					Name:      "staging",
-					CreatedAt: "2024-01-01T00:00:00Z",
+					CreatedAt: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
 					SystemId:  "sys-123",
 				},
 			},
@@ -408,7 +408,7 @@ func TestResolve(t *testing.T) {
 				Environment: &oapi.Environment{
 					Id:        "env-456",
 					Name:      "prod",
-					CreatedAt: "2024-01-01T00:00:00Z",
+					CreatedAt: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
 					SystemId:  "sys-123",
 				},
 				Deployment: &oapi.Deployment{
diff --git a/apps/workspace-engine/pkg/workspace/store/diffcheck/environment_test.go b/apps/workspace-engine/pkg/workspace/store/diffcheck/environment_test.go
@@ -2,6 +2,7 @@ package diffcheck
 
 import (
 	"testing"
+	"time"
 
 	"workspace-engine/pkg/oapi"
 
@@ -14,15 +15,15 @@ func TestHasEnvironmentChanges_NoChanges(t *testing.T) {
 		Name:        "production",
 		SystemId:    "sys-123",
 		Description: &desc,
-		CreatedAt:   "2023-01-01T00:00:00Z",
+		CreatedAt:   time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC),
 		Id:          "env-123",
 	}
 
 	new := &oapi.Environment{
 		Name:        "production",
 		SystemId:    "sys-123",
 		Description: &desc,
-		CreatedAt:   "2023-01-01T00:00:00Z",
+		CreatedAt:   time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC),
 		Id:          "env-123",
 	}
 
@@ -277,15 +278,15 @@ func TestHasEnvironmentChanges_MultipleChanges(t *testing.T) {
 		SystemId:    "sys-123",
 		Description: &oldDesc,
 		Id:          "env-123",
-		CreatedAt:   "2023-01-01T00:00:00Z",
+		CreatedAt:   time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC),
 	}
 
 	new := &oapi.Environment{
 		Name:        "production",
 		SystemId:    "sys-456",
 		Description: &newDesc,
-		Id:          "env-123",              // Same ID (should be ignored)
-		CreatedAt:   "2024-01-01T00:00:00Z", // Different CreatedAt (should be ignored)
+		Id:          "env-123",                                   // Same ID (should be ignored)
+		CreatedAt:   time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC), // Different CreatedAt (should be ignored)
 	}
 
 	changes := HasEnvironmentChanges(old, new)
@@ -320,14 +321,14 @@ func TestHasEnvironmentChanges_CreatedAtIgnored(t *testing.T) {
 		Name:      "production",
 		SystemId:  "sys-123",
 		Id:        "env-123",
-		CreatedAt: "2023-01-01T00:00:00Z",
+		CreatedAt: time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC),
 	}
 
 	new := &oapi.Environment{
 		Name:      "production",
 		SystemId:  "sys-123",
 		Id:        "env-123",
-		CreatedAt: "2024-01-01T00:00:00Z",
+		CreatedAt: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
 	}
 
 	changes := HasEnvironmentChanges(old, new)
@@ -340,14 +341,14 @@ func TestHasEnvironmentChanges_SystemFieldsIgnoredWithOtherChanges(t *testing.T)
 		Name:      "staging",
 		SystemId:  "sys-123",
 		Id:        "env-old",
-		CreatedAt: "2023-01-01T00:00:00Z",
+		CreatedAt: time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC),
 	}
 
 	new := &oapi.Environment{
 		Name:      "production",
 		SystemId:  "sys-123",
 		Id:        "env-new",
-		CreatedAt: "2024-01-01T00:00:00Z",
+		CreatedAt: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
 	}
 
 	changes := HasEnvironmentChanges(old, new)
diff --git a/apps/workspace-engine/test/integration/creators/environment.go b/apps/workspace-engine/test/integration/creators/environment.go
@@ -40,7 +40,7 @@ func NewEnvironment(systemID string) *oapi.Environment {
 		Description:      &description,
 		SystemId:         systemID,
 		ResourceSelector: selector,
-		CreatedAt:        time.Now().Format(time.RFC3339),
+		CreatedAt:        time.Now(),
 	}
 
 	return e

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func getEnvironments(ctx context.Context, workspaceID string) ([]*oapi.Environme`
`52`	`52`	`if err != nil {`
`53`	`53`	`return nil, err`
`54`	`54`	`}`
`55`		`- environment.CreatedAt = createdAt.Format(time.RFC3339)`
	`55`	`+ environment.CreatedAt = createdAt`
`56`	`56`
`57`	`57`	`// Wrap selector from unwrapped database format to JsonSelector format`
`58`	`58`	`environment.ResourceSelector, err = wrapSelectorFromDB(rawSelector)`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func validateRetrievedEnvironments(t testing.T, actualEnvironments []oapi.Envi`
`41`	`41`	`if (actualEnv.ResourceSelector == nil) != (expectedEnv.ResourceSelector == nil) {`
`42`	`42`	`t.Fatalf("resource_selector nil mismatch: expected %v, got %v", expectedEnv.ResourceSelector == nil, actualEnv.ResourceSelector == nil)`
`43`	`43`	`}`
`44`		`- if actualEnv.CreatedAt == "" {`
	`44`	`+ if actualEnv.CreatedAt.IsZero() {`
`45`	`45`	`t.Fatalf("expected environment created_at to be set")`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ func createTestResource(workspaceID, resourceID, identifier, name string) *oapi.`
`36`	`36`
`37`	`37`	`// createTestEnvironment creates a test environment with the given ID and system`
`38`	`38`	`func createTestEnvironment(systemID, environmentID, name string) *oapi.Environment {`
`39`		`- now := time.Now().Format(time.RFC3339)`
`40`	`39`	`selector := &oapi.Selector{}`
`41`	`40`	`// Create a selector that matches all resources (name starts with empty string)`
`42`	`41`	`_ = selector.FromJsonSelector(oapi.JsonSelector{`
`@@ -54,7 +53,7 @@ func createTestEnvironment(systemID, environmentID, name string) *oapi.Environme`
`54`	`53`	`Description: &description,`
`55`	`54`	`SystemId: systemID,`
`56`	`55`	`ResourceSelector: selector,`
`57`		`- CreatedAt: now,`
	`56`	`+ CreatedAt: time.Now(),`
`58`	`57`	`}`
`59`	`58`	`}`
`60`	`59`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ func createTestSystem(workspaceID, id, name string) *oapi.System {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`func createTestEnvironment(systemID, id, name string) *oapi.Environment {`
`30`		`- now := time.Now().Format(time.RFC3339)`
`31`	`30`	`selector := &oapi.Selector{}`
`32`	`31`	`_ = selector.FromCelSelector(oapi.CelSelector{Cel: "true"})`
`33`	`32`
`@@ -38,7 +37,7 @@ func createTestEnvironment(systemID, id, name string) *oapi.Environment {`
`38`	`37`	`Description: &description,`
`39`	`38`	`SystemId: systemID,`
`40`	`39`	`ResourceSelector: selector,`
`41`		`- CreatedAt: now,`
	`40`	`+ CreatedAt: time.Now(),`
`42`	`41`	`}`
`43`	`42`	`}`
`44`	`43`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ func createTestSystemForPlanner(workspaceID, id, name string) *oapi.System {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func createTestEnvironmentForPlanner(systemID, id, name string) *oapi.Environment {`
`44`		`- now := time.Now().Format(time.RFC3339)`
`45`	`44`	`selector := &oapi.Selector{}`
`46`	`45`	`_ = selector.FromCelSelector(oapi.CelSelector{Cel: "true"})`
`47`	`46`
`@@ -52,7 +51,7 @@ func createTestEnvironmentForPlanner(systemID, id, name string) *oapi.Environmen`
`52`	`51`	`Description: &description,`
`53`	`52`	`SystemId: systemID,`
`54`	`53`	`ResourceSelector: selector,`
`55`		`- CreatedAt: now,`
	`54`	`+ CreatedAt: time.Now(),`
`56`	`55`	`}`
`57`	`56`	`}`
`58`	`57`