From bd524dcea27cc30559b5e9062c72dec40f387a26 Mon Sep 17 00:00:00 2001 From: Akshay Katyal Date: Mon, 2 Oct 2017 16:42:55 +0530 Subject: [PATCH 1/4] restructure into apps --- gitpm-app/Gopkg.lock | 16 ++++------ gitpm-app/Gopkg.toml | 4 +++ gitpm-app/conf/app.conf | 9 ++++-- .../{asana.go => asana/controller.go} | 2 +- gitpm-app/controllers/asana/model.go | 30 +++++++++++++++++++ gitpm-app/main.go | 17 ++++++++--- gitpm-app/routers/router.go | 4 ++- 7 files changed, 63 insertions(+), 19 deletions(-) rename gitpm-app/controllers/{asana.go => asana/controller.go} (95%) create mode 100644 gitpm-app/controllers/asana/model.go diff --git a/gitpm-app/Gopkg.lock b/gitpm-app/Gopkg.lock index 1b13c19..c7ee3ab 100644 --- a/gitpm-app/Gopkg.lock +++ b/gitpm-app/Gopkg.lock @@ -32,10 +32,10 @@ version = "v4.2.1" [[projects]] - name = "github.com/mattn/go-sqlite3" - packages = ["."] - revision = "ca5e3819723d8eeaf170ad510e7da1d6d2e94a08" - version = "v1.2.0" + branch = "master" + name = "github.com/lib/pq" + packages = [".","oid"] + revision = "b77235e3890a962fe8a6f8c4c7198679ca7814e7" [[projects]] name = "github.com/smartystreets/assertions" @@ -49,15 +49,9 @@ revision = "9e8dc3f972df6c8fcc0375ef492c24d0bb204857" version = "1.6.3" -[[projects]] - branch = "master" - name = "golang.org/x/net" - packages = ["context"] - revision = "0a9397675ba34b2845f758fe3cd68828369c6517" - [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "e9279697282c8f7d8e05ace4c72d0db572acb5d12a70f37a6d2fe481038b4544" + inputs-digest = "2fbc81631653dd625705f68a292ebf0f2f6a84bbb5251563a39474ba7e6efaad" solver-name = "gps-cdcl" solver-version = 1 diff --git a/gitpm-app/Gopkg.toml b/gitpm-app/Gopkg.toml index f0d2758..cbd2198 100644 --- a/gitpm-app/Gopkg.toml +++ b/gitpm-app/Gopkg.toml @@ -36,3 +36,7 @@ [[constraint]] branch = "master" name = "github.com/google/go-github" + +[[constraint]] + branch = "master" + name = "github.com/lib/pq" diff --git a/gitpm-app/conf/app.conf b/gitpm-app/conf/app.conf index 6efc60d..13c8626 100644 --- a/gitpm-app/conf/app.conf +++ b/gitpm-app/conf/app.conf @@ -3,6 +3,11 @@ httpport = 8080 runmode = dev copyrequestbody = true +dbuser=gitpm +dbpassword=gitpm123 +dbname=gitpm +dbhost=postgres + # asana connect env -ASANA_CLIENT_ID=442215663457100 -ASANA_CLIENT_SECRET=c33100c2d067d6dd5621daca89699042 +asanaclientid=442215663457100 +asanaclientsecret=c33100c2d067d6dd5621daca89699042 diff --git a/gitpm-app/controllers/asana.go b/gitpm-app/controllers/asana/controller.go similarity index 95% rename from gitpm-app/controllers/asana.go rename to gitpm-app/controllers/asana/controller.go index edf68f2..7a266da 100644 --- a/gitpm-app/controllers/asana.go +++ b/gitpm-app/controllers/asana/controller.go @@ -1,4 +1,4 @@ -package controllers +package asana import ( "github.com/astaxie/beego" diff --git a/gitpm-app/controllers/asana/model.go b/gitpm-app/controllers/asana/model.go new file mode 100644 index 0000000..dfa23be --- /dev/null +++ b/gitpm-app/controllers/asana/model.go @@ -0,0 +1,30 @@ +package asana + +import ( + "github.com/astaxie/beego/orm" +) + +type Task struct { + Id int +} + +func init() { + orm.RegisterModel(new(Task)) +} + +func (u *Task) Save() (id int64, err error) { + o := orm.NewOrm() + insertedId, err := o.Insert(u) + + if err != nil { + return 0, err + } + + return insertedId, nil +} + +func (u *Task) Get() *Task { + o := orm.NewOrm() + o.Read(u) + return u +} diff --git a/gitpm-app/main.go b/gitpm-app/main.go index 7d6d43c..0ce4fc9 100644 --- a/gitpm-app/main.go +++ b/gitpm-app/main.go @@ -6,16 +6,25 @@ import ( "github.com/astaxie/beego" "github.com/astaxie/beego/orm" _ "github.com/gitpmio/gitpm/gitpm-app/routers" - _ "github.com/mattn/go-sqlite3" // import your required driver + _ "github.com/lib/pq" // import your required driver ) func init() { - orm.RegisterDriver("sqlite3", orm.DRSqlite) - orm.RegisterDataBase("default", "sqlite3", "file:data.db") + orm.RegisterDriver("postgres", orm.DRPostgres) + + postgresConnectionString := fmt.Sprintf( + "postgresql://%s:%s@%s/%s", + beego.AppConfig.String("dbuser"), + beego.AppConfig.String("dbpassword"), + beego.AppConfig.String("dbhost"), + beego.AppConfig.String("dbname"), + ) + + orm.RegisterDataBase("default", "postgres", postgresConnectionString) } func main() { - err := orm.RunSyncdb("default", true, true) + err := orm.RunSyncdb("default", false, true) if err != nil { fmt.Println(err) } diff --git a/gitpm-app/routers/router.go b/gitpm-app/routers/router.go index 0542975..0a11df0 100644 --- a/gitpm-app/routers/router.go +++ b/gitpm-app/routers/router.go @@ -3,6 +3,8 @@ package routers import ( "github.com/astaxie/beego" "github.com/gitpmio/gitpm/gitpm-app/controllers" + + "github.com/gitpmio/gitpm/gitpm-app/controllers/asana" ) func init() { @@ -10,7 +12,7 @@ func init() { beego.Router("/users", &controllers.UserController{}) // Asana Routes - beego.Router("/asana/webhook", &controllers.AsanaController{}, "post:RecieveWebook") + beego.Router("/asana/webhook", &asana.AsanaController{}, "post:RecieveWebook") // example github Routes beego.Router("/github/:username", &controllers.GithubController{}) From 7cd89c03c56d1a1b8f9a3978055cc17957e5eaeb Mon Sep 17 00:00:00 2001 From: Rachit Gupta Date: Mon, 2 Oct 2017 17:01:22 +0530 Subject: [PATCH 2/4] Fix postgres connection string --- docker-compose.yml | 2 ++ gitpm-app/Gopkg.lock | 2 +- gitpm-app/conf/app.conf | 3 ++- gitpm-app/main.go | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7362607..31e7ec7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,5 +20,7 @@ services: - "./gitpm-app:/go/src/github.com/gitpmio/gitpm/gitpm-app" ports: - "8080:8080" + depends_on: + - postgres volumes: gitpm-postgres: diff --git a/gitpm-app/Gopkg.lock b/gitpm-app/Gopkg.lock index c7ee3ab..fe4a650 100644 --- a/gitpm-app/Gopkg.lock +++ b/gitpm-app/Gopkg.lock @@ -52,6 +52,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "2fbc81631653dd625705f68a292ebf0f2f6a84bbb5251563a39474ba7e6efaad" + inputs-digest = "a31d404d229f421b1cd3ab42e5b0aef0f87fcd851e8334f625e2f4a3a4881944" solver-name = "gps-cdcl" solver-version = 1 diff --git a/gitpm-app/conf/app.conf b/gitpm-app/conf/app.conf index 13c8626..5132ea7 100644 --- a/gitpm-app/conf/app.conf +++ b/gitpm-app/conf/app.conf @@ -6,7 +6,8 @@ copyrequestbody = true dbuser=gitpm dbpassword=gitpm123 dbname=gitpm -dbhost=postgres +dbhost=localhost +dbport=5432 # asana connect env asanaclientid=442215663457100 diff --git a/gitpm-app/main.go b/gitpm-app/main.go index 0ce4fc9..4058c63 100644 --- a/gitpm-app/main.go +++ b/gitpm-app/main.go @@ -13,10 +13,11 @@ func init() { orm.RegisterDriver("postgres", orm.DRPostgres) postgresConnectionString := fmt.Sprintf( - "postgresql://%s:%s@%s/%s", + "postgresql://%s:%s@%s:%s/%s?sslmode=disable", beego.AppConfig.String("dbuser"), beego.AppConfig.String("dbpassword"), beego.AppConfig.String("dbhost"), + beego.AppConfig.String("dbport"), beego.AppConfig.String("dbname"), ) From 4fc4f26024c5ffb9fd838ec5df2a008a4c36a9b3 Mon Sep 17 00:00:00 2001 From: Subho Halder Date: Mon, 2 Oct 2017 18:33:59 +0530 Subject: [PATCH 3/4] use non-standard ports always in docker --- docker-compose.yml | 2 +- gitpm-app/conf/app.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 31e7ec7..ac9474c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: volumes: - gitpm-postgres:/bitnami ports: - - "5432:5432" + - "5432:5431" environment: - POSTGRESQL_PASSWORD=${DB_PASSWORD} - POSTGRESQL_USERNAME=${DB_USER} diff --git a/gitpm-app/conf/app.conf b/gitpm-app/conf/app.conf index 5132ea7..916c587 100644 --- a/gitpm-app/conf/app.conf +++ b/gitpm-app/conf/app.conf @@ -7,7 +7,7 @@ dbuser=gitpm dbpassword=gitpm123 dbname=gitpm dbhost=localhost -dbport=5432 +dbport=5431 # asana connect env asanaclientid=442215663457100 From f8e9ddf5d253013d6dca40d54a97466ee9a6728b Mon Sep 17 00:00:00 2001 From: Subho Halder Date: Mon, 2 Oct 2017 18:46:29 +0530 Subject: [PATCH 4/4] make postgresql work --- docker-compose.yml | 2 -- gitpm-app/conf/app.conf | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ac9474c..292bf54 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,8 +5,6 @@ services: container_name: gitpm-internal-postgres volumes: - gitpm-postgres:/bitnami - ports: - - "5432:5431" environment: - POSTGRESQL_PASSWORD=${DB_PASSWORD} - POSTGRESQL_USERNAME=${DB_USER} diff --git a/gitpm-app/conf/app.conf b/gitpm-app/conf/app.conf index 916c587..dec78ff 100644 --- a/gitpm-app/conf/app.conf +++ b/gitpm-app/conf/app.conf @@ -6,8 +6,8 @@ copyrequestbody = true dbuser=gitpm dbpassword=gitpm123 dbname=gitpm -dbhost=localhost -dbport=5431 +dbhost=gitpm-internal-postgres +dbport=5432 # asana connect env asanaclientid=442215663457100