From 4a780574eb4a2cdc8ce4aeeb28f7671ea61a6049 Mon Sep 17 00:00:00 2001
From: Sung <8265228+sungwoncho@users.noreply.github.com>
Date: Sun, 5 Feb 2023 13:10:45 +1100
Subject: [PATCH] Upgrade dependencies (#619)

---
 .github/workflows/ci.yml            | 8 +++++---
 CONTRIBUTING.md                     | 8 +-------
 host/docker/docker-compose.yml      | 2 +-
 host/smoketest/setup.sh             | 8 ++++----
 pkg/server/.env.dev                 | 2 +-
 scripts/cli/build.sh                | 2 +-
 scripts/vagrant/bootstrap.sh        | 8 +++++---
 scripts/vagrant/install_go.sh       | 2 +-
 scripts/vagrant/install_postgres.sh | 2 +-
 9 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 50f08124..d953aedb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,9 +1,11 @@
 name: CI
 on:
   push:
-    branches: [master]
-    pull_request:
-      branches: [master]
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a027c90f..fb41959d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -39,13 +39,7 @@ The server consists of the frontend web application and a web server.
 ### Test
 
 ```bash
-# Run tests for the frontend web application
-make test-web
-
-# Run in watch mode
-WATCH=true make test-web
-
-# Run tests for API
+# Run tests for app
 make test-api
 
 # Run in watch mode
diff --git a/host/docker/docker-compose.yml b/host/docker/docker-compose.yml
index c47d71fe..c10efe37 100644
--- a/host/docker/docker-compose.yml
+++ b/host/docker/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   postgres:
-    image: postgres:11-alpine
+    image: postgres:14-alpine
     environment:
       POSTGRES_USER: dnote
       POSTGRES_PASSWORD: dnote
diff --git a/host/smoketest/setup.sh b/host/smoketest/setup.sh
index 3fb44f95..589524ee 100755
--- a/host/smoketest/setup.sh
+++ b/host/smoketest/setup.sh
@@ -6,12 +6,12 @@ wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-
 sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
 
 sudo apt-get update
-sudo apt-get install -y postgresql-11
+sudo apt-get install -y postgresql-14
 
 # set up database
 sudo -u postgres createdb dnote
 # allow connection from host and allow to connect without password
-sudo sed -i  "/port*/a listen_addresses = '*'" /etc/postgresql/11/main/postgresql.conf
-sudo sed -i 's/host.*all.*.all.*md5/# &/' /etc/postgresql/11/main/pg_hba.conf
-sudo sed -i "$ a host all all all trust" /etc/postgresql/11/main/pg_hba.conf
+sudo sed -i  "/port*/a listen_addresses = '*'" /etc/postgresql/14/main/postgresql.conf
+sudo sed -i 's/host.*all.*.all.*md5/# &/' /etc/postgresql/14/main/pg_hba.conf
+sudo sed -i "$ a host all all all trust" /etc/postgresql/14/main/pg_hba.conf
 sudo service postgresql restart
diff --git a/pkg/server/.env.dev b/pkg/server/.env.dev
index 762230be..7c2d45e1 100644
--- a/pkg/server/.env.dev
+++ b/pkg/server/.env.dev
@@ -4,7 +4,7 @@ DBHost=localhost
 DBPort=5432
 DBName=dnote
 DBUser=postgres
-DBPassword=
+DBPassword=postgres
 DBSkipSSL=true
 
 SmtpUsername=mock-SmtpUsername
diff --git a/scripts/cli/build.sh b/scripts/cli/build.sh
index bffc5474..bd417cdc 100755
--- a/scripts/cli/build.sh
+++ b/scripts/cli/build.sh
@@ -36,7 +36,7 @@ if [[ $1 == v* ]]; then
   exit 1
 fi
 
-goVersion=go-1.17.x
+goVersion=go-1.20.x
 
 get_binary_name() {
   platform=$1
diff --git a/scripts/vagrant/bootstrap.sh b/scripts/vagrant/bootstrap.sh
index a3285254..b8299676 100755
--- a/scripts/vagrant/bootstrap.sh
+++ b/scripts/vagrant/bootstrap.sh
@@ -10,8 +10,10 @@ echo "cd /go/src/github.com/dnote/dnote" >> /home/vagrant/.bash_profile
 # set up database
 sudo -u postgres createdb dnote
 sudo -u postgres createdb dnote_test
+sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
+
 # allow connection from host and allow to connect without password
-sudo sed -i  "/port*/a listen_addresses = '*'" /etc/postgresql/11/main/postgresql.conf
-sudo sed -i 's/host.*all.*.all.*md5/# &/' /etc/postgresql/11/main/pg_hba.conf
-sudo sed -i "$ a host all all all trust" /etc/postgresql/11/main/pg_hba.conf
+sudo sed -i  "/port*/a listen_addresses = '*'" /etc/postgresql/14/main/postgresql.conf
+sudo sed -i 's/host.*all.*.all.*md5/# &/' /etc/postgresql/14/main/pg_hba.conf
+sudo sed -i "$ a host all all all trust" /etc/postgresql/14/main/pg_hba.conf
 sudo service postgresql restart
diff --git a/scripts/vagrant/install_go.sh b/scripts/vagrant/install_go.sh
index 8d502d44..b6b9de23 100755
--- a/scripts/vagrant/install_go.sh
+++ b/scripts/vagrant/install_go.sh
@@ -2,7 +2,7 @@
 # shellcheck disable=SC1091
 set -eux
 
-VERSION=1.17.9
+VERSION=1.20
 OS=linux
 ARCH=amd64
 
diff --git a/scripts/vagrant/install_postgres.sh b/scripts/vagrant/install_postgres.sh
index bdacd51f..f2738021 100755
--- a/scripts/vagrant/install_postgres.sh
+++ b/scripts/vagrant/install_postgres.sh
@@ -6,4 +6,4 @@ wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-
 sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
 
 sudo apt-get update
-sudo apt-get install -y postgresql-11
+sudo apt-get install -y postgresql-14