[Lookout] Make jobs.annotations column not nullable (#3519)

* [Lookout] Make jobs.annotations column not nullable Signed-off-by: JamesMurkin <jamesmurkin@hotmail.com> * Fix tests Signed-off-by: JamesMurkin <jamesmurkin@hotmail.com> * Use explicit constraint + newer postgres image Signed-off-by: JamesMurkin <jamesmurkin@hotmail.com> * Fix constraint validation Signed-off-by: JamesMurkin <jamesmurkin@hotmail.com> * Update constraint name Signed-off-by: JamesMurkin <jamesmurkin@hotmail.com> * Fix tests Signed-off-by: JamesMurkin <jamesmurkin@hotmail.com> --------- Signed-off-by: JamesMurkin <jamesmurkin@hotmail.com>
armadaproject · Apr 16, 2024 · 380d59d · 380d59d
1 parent a16dfd1
commit 380d59d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -23,7 +23,7 @@ services:
 
  postgres:
  container_name: postgres
- image: postgres:12.13-alpine
+ image: postgres:15.6-alpine
  environment:
  - POSTGRES_PASSWORD=psw
  ports:

diff --git a/internal/armada/queryapi/query_api_test.go b/internal/armada/queryapi/query_api_test.go
@@ -1,6 +1,7 @@
 package queryapi
 
 import (
+ "encoding/json"
  "testing"
  "time"
 
@@ -283,6 +284,7 @@ func TestGetJobStatus(t *testing.T) {
 }
 
 func newJob(jobId string, state int16) database.Job {
+ annotations, _ := json.Marshal(map[string]string{})
  return database.Job{
  JobID: jobId,
  Queue: "testQueue",
@@ -310,7 +312,7 @@ func newJob(jobId string, state int16) database.Job {
  LatestRunID: nil,
  CancelReason: nil,
  Namespace: pointer.String("testNamespace"),
- Annotations: nil,
+ Annotations: annotations,
  }
 }
 

diff --git a/internal/lookoutingesterv2/lookoutdb/insertion_test.go b/internal/lookoutingesterv2/lookoutdb/insertion_test.go
@@ -324,6 +324,7 @@ func TestUpdateJobsWithTerminal(t *testing.T) {
  LastTransitionTimeSeconds: baseTime.Unix(),
  JobProto: []byte(jobProto),
  PriorityClass: pointer.String(priorityClass),
+ Annotations: map[string]string{},
  },
  {
  JobId: "job2",
@@ -341,6 +342,7 @@ func TestUpdateJobsWithTerminal(t *testing.T) {
  LastTransitionTimeSeconds: baseTime.Unix(),
  JobProto: []byte(jobProto),
  PriorityClass: pointer.String(priorityClass),
+ Annotations: map[string]string{},
  },
  {
  JobId: "job3",
@@ -358,6 +360,7 @@ func TestUpdateJobsWithTerminal(t *testing.T) {
  LastTransitionTimeSeconds: baseTime.Unix(),
  JobProto: []byte(jobProto),
  PriorityClass: pointer.String(priorityClass),
+ Annotations: map[string]string{},
  },
  }
 

diff --git a/internal/lookoutv2/schema/migrations/006_annotations_constraint.sql b/internal/lookoutv2/schema/migrations/006_annotations_constraint.sql
@@ -0,0 +1,2 @@
+ALTER TABLE job ADD CONSTRAINT job_annotations_not_null CHECK (annotations IS NOT NULL) NOT VALID;
+ALTER TABLE job VALIDATE CONSTRAINT job_annotations_not_null;