From 9224675139b5fc1ebcb123bbd43032ec554c7d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0trauch?= Date: Sun, 15 Oct 2023 01:20:17 +0200 Subject: [PATCH] Fix sql data type --- apps/types.go | 6 +++--- go.mod | 4 ++-- go.sum | 10 ++++++---- {common => jsonmap}/jsonmap.go | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) rename {common => jsonmap}/jsonmap.go (99%) diff --git a/apps/types.go b/apps/types.go index 85881ac..a1445d8 100644 --- a/apps/types.go +++ b/apps/types.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/rosti-cz/node-api/common" "github.com/rosti-cz/node-api/detector" + "github.com/rosti-cz/node-api/jsonmap" ) // ValidationError is error that holds multiple validation error messages @@ -103,7 +103,7 @@ type App struct { // This is not store in the database but used in create request when the app suppose to be created from an existing snapshot Snapshot string `json:"snapshot" gorm:"-"` - EnvRaw common.JSONMap `json:"env"` + EnvRaw jsonmap.JSONMap `json:"env" sql:"type:json"` // Fields to setup during creating of the app, this is not stored in the database Setup struct { @@ -125,7 +125,7 @@ func (a *App) GetEnv() map[string]string { // SetEnv sets env from map[string]string func (a *App) SetEnv(env map[string]string) { - a.EnvRaw = make(common.JSONMap) + a.EnvRaw = make(jsonmap.JSONMap) for key, value := range env { a.EnvRaw[key] = value } diff --git a/go.mod b/go.mod index 394cc5d..9353306 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,6 @@ require ( github.com/kr/pretty v0.3.0 // indirect github.com/labstack/echo v3.3.10+incompatible github.com/labstack/gommon v0.3.0 // indirect - github.com/mattn/go-sqlite3 v1.14.15 // indirect github.com/minio/minio-go/v7 v7.0.14 github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect github.com/morikuni/aec v1.0.0 // indirect @@ -34,6 +33,7 @@ require ( google.golang.org/grpc v1.44.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gorm.io/driver/mysql v1.4.7 - gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11 + gorm.io/driver/sqlite v1.5.4 + gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55 gotest.tools/v3 v3.1.0 // indirect ) diff --git a/go.sum b/go.sum index 9900d56..b6ff1fb 100644 --- a/go.sum +++ b/go.sum @@ -487,8 +487,8 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= -github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= -github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= +github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= @@ -1090,9 +1090,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.4.7 h1:rY46lkCspzGHn7+IYsNpSfEv9tA+SU4SkkB+GFX125Y= gorm.io/driver/mysql v1.4.7/go.mod h1:SxzItlnT1cb6e1e4ZRpgJN2VYtcqJgqnHxWr4wsP8oc= +gorm.io/driver/sqlite v1.5.4 h1:IqXwXi8M/ZlPzH/947tn5uik3aYQslP9BVveoax0nV0= +gorm.io/driver/sqlite v1.5.4/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4= gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= -gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11 h1:9qNbmu21nNThCNnF5i2R3kw2aL27U8ZwbzccNjOmW0g= -gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55 h1:sC1Xj4TYrLqg1n3AN10w871An7wJM0gzgcm8jkIkECQ= +gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= diff --git a/common/jsonmap.go b/jsonmap/jsonmap.go similarity index 99% rename from common/jsonmap.go rename to jsonmap/jsonmap.go index 2de2ef3..18b34cc 100644 --- a/common/jsonmap.go +++ b/jsonmap/jsonmap.go @@ -1,4 +1,4 @@ -package common +package jsonmap import ( "bytes"