From 6337ff64ffb7a2c7083abeff92317bb671b76d16 Mon Sep 17 00:00:00 2001
From: petruki <31597636+petruki@users.noreply.github.com>
Date: Sun, 11 Feb 2024 19:04:05 -0800
Subject: [PATCH] Added account model and router
---
.env.test | 4 +++
README.md | 4 ++-
go.mod | 15 +++++++++
go.sum | 52 +++++++++++++++++++++++++++++++
src/cmd/app/main.go | 4 ++-
src/config/env.go | 3 +-
src/controller/account.go | 40 ++++++++++++++++++++++++
src/model/account.go | 30 ++++++++++++++++++
src/server/app.go | 65 +++++++++++++++++++++++++++++++++++++--
9 files changed, 212 insertions(+), 5 deletions(-)
create mode 100644 src/controller/account.go
create mode 100644 src/model/account.go
diff --git a/.env.test b/.env.test
index 72a652d..a9f392f 100644
--- a/.env.test
+++ b/.env.test
@@ -1,2 +1,6 @@
+PORT=8000
+MONGO_URI=mongodb://localhost:27017
+MONGO_DB=switcher-gitops-test
+
SWITCHER_API_URL=https://switcherapi.com/api/gitops-graphql
SWITCHER_API_JWT_SECRET=[YOUR_JWT_SECRET]
\ No newline at end of file
diff --git a/README.md b/README.md
index 8672f57..d425ca0 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,8 @@ GitOps Domain Snapshot Orchestrator for Switcher API
## Run Project
-- Running `go run ./src/cmd/app/main.go`
+- Running
+ Windows: `$env:GO_ENV="test"; go run ./src/cmd/app/main.go`
+ Unit: `GO_ENV=test go run ./src/cmd/app/main.go`
- Testing `go test -coverpkg=./... -v`
- Building `go build -o ./bin/app ./src/cmd/app/main.go`
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 3c49bde..dcbdfcd 100644
--- a/go.mod
+++ b/go.mod
@@ -7,8 +7,23 @@ require (
github.com/stretchr/testify v1.8.4
)
+require (
+ github.com/golang/snappy v0.0.1 // indirect
+ github.com/klauspost/compress v1.13.6 // indirect
+ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
+ github.com/xdg-go/pbkdf2 v1.0.0 // indirect
+ github.com/xdg-go/scram v1.1.2 // indirect
+ github.com/xdg-go/stringprep v1.0.4 // indirect
+ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
+ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
+ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
+ golang.org/x/text v0.7.0 // indirect
+)
+
require (
github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/gorilla/mux v1.8.1
github.com/pmezard/go-difflib v1.0.0 // indirect
+ go.mongodb.org/mongo-driver v1.13.1
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/go.sum b/go.sum
index 25fe23f..391e704 100644
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,63 @@
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
+github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
+github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
+github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
+github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
+github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
+github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk=
+go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/src/cmd/app/main.go b/src/cmd/app/main.go
index 1347415..5ebc5ba 100644
--- a/src/cmd/app/main.go
+++ b/src/cmd/app/main.go
@@ -7,5 +7,7 @@ import (
func main() {
config.InitEnv()
- server.Init()
+
+ app := server.NewApp()
+ app.Start()
}
diff --git a/src/config/env.go b/src/config/env.go
index c1ee316..c65c615 100644
--- a/src/config/env.go
+++ b/src/config/env.go
@@ -8,7 +8,8 @@ import (
func InitEnv() {
goEnv := os.Getenv("GO_ENV")
- godotenv.Load("../../.env." + goEnv)
+ godotenv.Load(".env." + goEnv)
+ godotenv.Load("../../.env." + goEnv) // for tests
}
func GetEnv(key string) string {
diff --git a/src/controller/account.go b/src/controller/account.go
new file mode 100644
index 0000000..0cf7b25
--- /dev/null
+++ b/src/controller/account.go
@@ -0,0 +1,40 @@
+package controller
+
+import (
+ "context"
+ "encoding/json"
+ "net/http"
+ "time"
+
+ "github.com/switcherapi/switcher-gitops/src/model"
+ "go.mongodb.org/mongo-driver/bson/primitive"
+ "go.mongodb.org/mongo-driver/mongo"
+)
+
+type AccountController struct {
+ Db mongo.Database
+ Ctx context.Context
+}
+
+func (controller *AccountController) CreateAccountHandler(w http.ResponseWriter, r *http.Request) {
+ var account model.Account
+ err := json.NewDecoder(r.Body).Decode(&account)
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusBadRequest)
+ return
+ }
+
+ collection := controller.Db.Collection(model.CollectionName)
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ result, _ := collection.InsertOne(ctx, account)
+
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ return
+ }
+
+ w.Header().Set("Content-Type", "application/json")
+ account.ID = result.InsertedID.(primitive.ObjectID)
+ json.NewEncoder(w).Encode(account)
+}
diff --git a/src/model/account.go b/src/model/account.go
new file mode 100644
index 0000000..d09af44
--- /dev/null
+++ b/src/model/account.go
@@ -0,0 +1,30 @@
+package model
+
+import "go.mongodb.org/mongo-driver/bson/primitive"
+
+const (
+ CollectionName = "accounts"
+)
+
+type Account struct {
+ ID primitive.ObjectID `bson:"id,omitempty"`
+ Repository string `json:"repository"`
+ Branch string `json:"branch"`
+ Domain DomainDetails `json:"domain"`
+ Settings Settings `json:"settings"`
+}
+
+type DomainDetails struct {
+ ID string `json:"id"`
+ Name string `json:"name"`
+ Version string `json:"version"`
+ LastCommit string `json:"lastcommit"`
+ Status string `json:"status"`
+ Message string `json:"message"`
+}
+
+type Settings struct {
+ Active bool `json:"active"`
+ Window string `json:"window"`
+ ForcePrune bool `json:"forceprune"`
+}
diff --git a/src/server/app.go b/src/server/app.go
index 7ea873b..0583d0e 100644
--- a/src/server/app.go
+++ b/src/server/app.go
@@ -1,5 +1,66 @@
package server
-func Init() {
- println("Server init")
+import (
+ "context"
+ "log"
+ "net/http"
+ "time"
+
+ "github.com/gorilla/mux"
+ "go.mongodb.org/mongo-driver/mongo"
+ "go.mongodb.org/mongo-driver/mongo/options"
+
+ "github.com/switcherapi/switcher-gitops/src/config"
+ "github.com/switcherapi/switcher-gitops/src/controller"
+)
+
+type App struct {
+ httpServer *http.Server
+ routerHandlers *mux.Router
+}
+
+func NewApp() *App {
+ ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+ defer cancel()
+
+ db := initDb(ctx)
+ routes := initRoutes(db, ctx)
+
+ return &App{
+ routerHandlers: routes,
+ }
+}
+
+func (app *App) Start() {
+ port := config.GetEnv("PORT")
+ app.httpServer = &http.Server{
+ Addr: ":" + port,
+ Handler: app.routerHandlers,
+ }
+
+ log.Println("Server started on port " + port)
+ app.httpServer.ListenAndServe()
+}
+
+func initDb(ctx context.Context) *mongo.Database {
+ var err error
+
+ client, err := mongo.Connect(ctx, options.Client().ApplyURI(config.GetEnv("MONGO_URI")))
+ db := client.Database(config.GetEnv("MONGO_DB"))
+
+ if err != nil {
+ panic(err)
+ }
+
+ log.Println("Connected to MongoDB!")
+ return db
+}
+
+func initRoutes(db *mongo.Database, ctx context.Context) *mux.Router {
+ AccountController := controller.AccountController{Db: *db, Ctx: ctx}
+
+ r := mux.NewRouter()
+ r.HandleFunc("/accounts", AccountController.CreateAccountHandler).Methods("POST")
+
+ return r
}