From 16f09b81c9070473e7740a221f3aa1aef75274d9 Mon Sep 17 00:00:00 2001 From: blackmamoth Date: Sun, 21 Jul 2024 21:35:51 +0530 Subject: [PATCH] Database and initial migration setup --- Makefile | 9 ++++ cmd/migrate/main.go | 44 +++++++++++++++++++ .../20240721125945_add_task_table.down.sql | 3 ++ .../20240721125945_add_task_table.up.sql | 13 ++++++ .../20240721153908_add_node_table.down.sql | 3 ++ .../20240721153908_add_node_table.up.sql | 12 +++++ go.mod | 6 +++ go.sum | 21 +++++++++ 8 files changed, 111 insertions(+) create mode 100644 cmd/migrate/main.go create mode 100644 cmd/migrate/migrations/20240721125945_add_task_table.down.sql create mode 100644 cmd/migrate/migrations/20240721125945_add_task_table.up.sql create mode 100644 cmd/migrate/migrations/20240721153908_add_node_table.down.sql create mode 100644 cmd/migrate/migrations/20240721153908_add_node_table.up.sql diff --git a/Makefile b/Makefile index 6a744ad..6a6a579 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,15 @@ build: run: clean build @./build/tasknet +migration: + @migrate create -ext sql -dir cmd/migrate/migrations $(filter-out $@,$(MAKECMDGOALS)) + +migrate-up: + @go run cmd/migrate/main.go up + +migrate-down: + @go run cmd/migrate/main.go down + compose-build: @docker compose build diff --git a/cmd/migrate/main.go b/cmd/migrate/main.go new file mode 100644 index 0000000..c21bea2 --- /dev/null +++ b/cmd/migrate/main.go @@ -0,0 +1,44 @@ +package main + +import ( + "fmt" + "os" + + "github.com/blackmamoth/tasknet/pkg/config" + "github.com/golang-migrate/migrate/v4" + _ "github.com/golang-migrate/migrate/v4/database/cockroachdb" + _ "github.com/golang-migrate/migrate/v4/source/file" +) + +func main() { + dsn := fmt.Sprintf("cockroachdb://%s:%s@%s:%s/%s?sslmode=verify-full", + config.GlobalConfig.CockroachDBConfig.COCKROACH_DB_USER, + config.GlobalConfig.CockroachDBConfig.COCKROACH_DB_PASS, + config.GlobalConfig.CockroachDBConfig.COCKROACH_DB_HOST, + config.GlobalConfig.CockroachDBConfig.COCKROACH_DB_PORT, + config.GlobalConfig.CockroachDBConfig.COCKROACH_DB_DBNAME, + ) + m, err := migrate.New( + "file://cmd/migrate/migrations", + dsn, + ) + + if err != nil { + config.Logger.CRITICAL(err.Error()) + } + + v, d, _ := m.Version() + config.Logger.INFO("Version: %d, dirty: %v", v, d) + + cmd := os.Args[len(os.Args)-1] + if cmd == "up" { + if err := m.Up(); err != nil && err != migrate.ErrNoChange { + config.Logger.CRITICAL(err.Error()) + } + } + if cmd == "down" { + if err := m.Down(); err != nil && err != migrate.ErrNoChange { + config.Logger.CRITICAL(err.Error()) + } + } +} diff --git a/cmd/migrate/migrations/20240721125945_add_task_table.down.sql b/cmd/migrate/migrations/20240721125945_add_task_table.down.sql new file mode 100644 index 0000000..10a3e4c --- /dev/null +++ b/cmd/migrate/migrations/20240721125945_add_task_table.down.sql @@ -0,0 +1,3 @@ +DROP TABLE IF EXISTS tasks; + +DROP TYPE IF EXISTS task_status; \ No newline at end of file diff --git a/cmd/migrate/migrations/20240721125945_add_task_table.up.sql b/cmd/migrate/migrations/20240721125945_add_task_table.up.sql new file mode 100644 index 0000000..2430a57 --- /dev/null +++ b/cmd/migrate/migrations/20240721125945_add_task_table.up.sql @@ -0,0 +1,13 @@ +CREATE TYPE IF NOT EXISTS task_status AS ENUM ('pending', 'scheduled', 'processing', 'failed', 'processed'); + + +CREATE TABLE IF NOT EXISTS tasks ( + id UUID NOT NULL DEFAULT gen_random_uuid(), + name STRING NOT NULL, + status task_status DEFAULT 'pending', + task_code STRING NOT NULL, + created_at TIMESTAMPTZ DEFAULT now(), + updated_at TIMESTAMPTZ DEFAULT now() ON UPDATE now(), + + CONSTRAINT "primary" PRIMARY KEY (id ASC) +); \ No newline at end of file diff --git a/cmd/migrate/migrations/20240721153908_add_node_table.down.sql b/cmd/migrate/migrations/20240721153908_add_node_table.down.sql new file mode 100644 index 0000000..3eb8b65 --- /dev/null +++ b/cmd/migrate/migrations/20240721153908_add_node_table.down.sql @@ -0,0 +1,3 @@ +DROP TABLE IF EXISTS nodes; + +DROP TYPE IF EXISTS health_status \ No newline at end of file diff --git a/cmd/migrate/migrations/20240721153908_add_node_table.up.sql b/cmd/migrate/migrations/20240721153908_add_node_table.up.sql new file mode 100644 index 0000000..55a6dc5 --- /dev/null +++ b/cmd/migrate/migrations/20240721153908_add_node_table.up.sql @@ -0,0 +1,12 @@ +CREATE TYPE IF NOT EXISTS health_status AS ENUM ('healthy', 'unhealthy', 'offline'); + +CREATE TABLE IF NOT EXISTS nodes ( + id UUID NOT NULL DEFAULT gen_random_uuid(), + name STRING NOT NULL, + status health_status DEFAULT 'healthy', + previous_heartbeat_at TIMESTAMPTZ, + created_at TIMESTAMPTZ DEFAULT now(), + updated_at TIMESTAMPTZ DEFAULT now() ON UPDATE now(), + + CONSTRAINT "primary" PRIMARY KEY (id ASC) +); \ No newline at end of file diff --git a/go.mod b/go.mod index c82e134..fb9fa83 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.22.5 require ( github.com/blackmamoth/GoLog v0.10.0 // indirect + github.com/cockroachdb/cockroach-go/v2 v2.3.8 // indirect github.com/enescakir/emoji v1.0.0 // indirect github.com/fatih/color v1.17.0 // indirect github.com/gabriel-vasile/mimetype v1.4.4 // indirect @@ -12,14 +13,19 @@ require ( github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.22.0 // indirect + github.com/golang-migrate/migrate/v4 v4.17.1 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/pgx/v5 v5.6.0 // indirect github.com/joho/godotenv v1.5.1 // indirect github.com/kelseyhightower/envconfig v1.4.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect + github.com/lib/pq v1.10.9 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect + go.uber.org/atomic v1.11.0 // indirect golang.org/x/crypto v0.25.0 // indirect golang.org/x/net v0.27.0 // indirect golang.org/x/sys v0.22.0 // indirect diff --git a/go.sum b/go.sum index ffc5dd6..c8e830e 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,9 @@ github.com/blackmamoth/GoLog v0.10.0 h1:BrapzvHYJRRqlcSquJjWsCIPYwg6FBsA05B4HFtIbzg= github.com/blackmamoth/GoLog v0.10.0/go.mod h1:focSnGGfvGITFk4sQN4y64yN7i560h8q//x/Qx4P+5w= +github.com/cockroachdb/cockroach-go/v2 v2.3.8 h1:53yoUo4+EtrC1NrAEgnnad4AS3ntNvGup1PAXZ7UmpE= +github.com/cockroachdb/cockroach-go/v2 v2.3.8/go.mod h1:9uH5jK4yQ3ZQUT9IXe4I2fHzMIF5+JC/oOdzTRgJYJk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/enescakir/emoji v1.0.0 h1:W+HsNql8swfCQFtioDGDHCHri8nudlK1n5p2rHCJoog= github.com/enescakir/emoji v1.0.0/go.mod h1:Bt1EKuLnKDTYpLALApstIkAjdDrS/8IAgTkKp+WKFD0= github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= @@ -17,27 +20,45 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao= github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/golang-migrate/migrate/v4 v4.17.1 h1:4zQ6iqL6t6AiItphxJctQb3cFqWiSpMnX7wLTPnnYO4= +github.com/golang-migrate/migrate/v4 v4.17.1/go.mod h1:m8hinFyWBn0SA4QKHuKh175Pm9wjmxj3S2Mia7dbXzM= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgx/v5 v5.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY= github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=