fix merge conflict

Author: James

.github/workflows/docker.yml

@@ -9,14 +9,16 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        component: [backend, frontend, next]
+        component: [backend, frontend, next, postgres]
         include:
           - component: backend
             name: cms-backend
           - component: frontend
             name: cms-frontend
           - component: next
             name: website-frontend
+          - component: postgres
+            name: cms-migrations
     permissions:
       contents: read
       packages: write
@@ -61,7 +63,7 @@ jobs:
           repository: csesoc/deployment
           token: ${{ secrets.GH_TOKEN }}
       - name: Install yq - portable yaml processor
-        uses: mikefarah/yq@v4.25.1
+        uses: mikefarah/yq@v4.28.1
       - name: Update deployment
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
@@ -71,6 +73,7 @@ jobs:
           git checkout -b update/cms/${{ github.sha }}
           yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/csesoc/cms-frontend:${{ github.sha }}"' apps/projects/cms/staging/deploy-cms-frontend.yml
           yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/csesoc/cms-backend:${{ github.sha }}"' apps/projects/cms/staging/deploy-cms-backend.yml
+          yq -i '.items[0].spec.template.spec.initContainers[0].image = "ghcr.io/csesoc/cms-migrations:${{ github.sha }}"' apps/projects/cms/staging/deploy-cms-backend.yml
           yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/csesoc/website-frontend:${{ github.sha }}"' apps/projects/cms/staging/deploy-website-frontend.yml
           git add . 
           git commit -m "feat(cms/staging): update images" 

CODEOWNERS

@@ -1,5 +1,10 @@
-frontend/*   @csesoc/Websites-Frontend
-next/*       @csesoc/Websites-Frontend
-scripts/*    @csesoc/Websites-Backend
-backend/*    @csesoc/Websites-Backend
-postgres/*   @csesoc/Websites-Backend
+backend/ @Varun-Sethu
+postgres/ @Varun-Sethu
+utilities/ @Varun-Sethu
+
+frontend/ @fafnirZ
+next/ @fafnirZ
+
+.github/ @csesoc/technical
+renovate.json @csesoc/technical
+Dockerfile @csesoc/technical

backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine as app-builder
+FROM golang:1.19-alpine as app-builder
 WORKDIR /go/src/app
 COPY . .
 RUN apk add git

backend/Dockerfile.development

@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine as build-env
+FROM golang:1.19-alpine as build-env
 
 # make current working directory /app
 WORKDIR /go/src/cms.csesoc.unsw.edu.au

backend/OTClient/operation.ts

@@ -44,7 +44,6 @@ func (ctx *TestingContext) Query(query string, sqlArgs []interface{}, resultOutp
 func (ctx *TestingContext) QueryRow(query string, sqlArgs []interface{}) (pgx.Rows, error) {
 	ctx.verifyEnvironment()
 	return ctx.activeTransaction.Query(context.Background(), query, sqlArgs...)
-
 }
 
 func (ctx *TestingContext) Exec(query string, sqlArgs []interface{}) error {
@@ -62,7 +61,6 @@ func (context *TestingContext) Close() {
 // RunTest sets up a new testing environment on the testing context (creates a transaction),
 // it then performs the given test method and finally rolls back any updates it had made
 func (ctx *TestingContext) RunTest(methodToTest func()) {
-
 	if testingTransaction, err := ctx.conn.Begin(context.Background()); err == nil {
 
 		ctx.startTestMode(testingTransaction)

backend/OTClient/operationModel.ts

@@ -28,7 +28,7 @@ type dockerPublishedFileSystemRepository struct {
 }
 
 // create new instances of the corresponding repository types
-func NewDockerPublishedFileSystemRepository() (*dockerPublishedFileSystemRepository, error) {
+func newDockerPublishedFileSystemRepository() (*dockerPublishedFileSystemRepository, error) {
 	inner, err := newDockerFilesystemRepositoryCore(publishedVolumePath)
 	if err != nil {
 		return nil, err
@@ -40,7 +40,7 @@ func NewDockerPublishedFileSystemRepository() (*dockerPublishedFileSystemReposit
 }
 
 // create new instances of the corresponding repository types
-func NewDockerUnpublishedFileSystemRepository() (*dockerUnpublishedFileSystemRepository, error) {
+func newDockerUnpublishedFileSystemRepository() (*dockerUnpublishedFileSystemRepository, error) {
 	inner, err := newDockerFilesystemRepositoryCore(unpublishedVolumePath)
 	if err != nil {
 		return nil, err
@@ -68,25 +68,25 @@ func (c *dockerFileSystemRepositoryCore) AddToVolume(filename string) error {
 	// Check if source file is valid
 	src, err := os.Open(filename)
 	if err != nil {
-		return errors.New("Couldn't open source file")
+		return errors.New("couldn't open source file")
 	}
 	defer src.Close()
 	// Create/update destination file and check it is valid
 	filepath := filepath.Join(c.volumePath, filename)
 	moved, err := os.OpenFile(filepath, os.O_RDWR|os.O_CREATE, 0o755)
 	if err != nil {
-		return errors.New("Couldn't read/create the destination file")
+		return errors.New("couldn't read/create the destination file")
 	}
 	defer moved.Close()
 	// Copy source to destination
 	_, err = io.Copy(moved, src)
 	if err != nil {
-		return errors.New("File couldn't be copied to destination")
+		return errors.New("file couldn't be copied to destination")
 	}
 	// Delete source file
 	err = os.Remove(filename)
 	if err != nil {
-		return errors.New("Couldn't remove the source file")
+		return errors.New("couldn't remove the source file")
 	}
 	return nil
 }
@@ -98,13 +98,13 @@ func (c *dockerFileSystemRepositoryCore) CopyToVolume(src *os.File, filename str
 	filepath := filepath.Join(c.volumePath, filename)
 	copied, err := os.OpenFile(filepath, os.O_RDWR|os.O_CREATE, 0o755)
 	if err != nil {
-		return errors.New("Couldn't read/create the destination file")
+		return errors.New("couldn't read/create the destination file")
 	}
 	defer copied.Close()
 	// Copy source to destination
 	_, err = io.Copy(copied, src)
 	if err != nil {
-		return errors.New("File couldn't be copied to destination")
+		return errors.New("file couldn't be copied to destination")
 	}
 	return nil
 }
@@ -126,12 +126,12 @@ func (c *dockerFileSystemRepositoryCore) DeleteFromVolume(filename string) error
 	filepath := filepath.Join(c.volumePath, filename)
 	file, err := os.Open(filepath)
 	if err != nil {
-		return errors.New("File doesn't exist")
+		return errors.New("file doesn't exist")
 	}
 	file.Close()
 	os.Remove(filepath)
 	if err = os.Remove(filepath); err != nil {
-		return errors.New("Couldn't remove the source file")
+		return errors.New("couldn't remove the source file")
 	}
 	return nil
 }