Converted backend to echo framework

src/backend/cmd/main.go

@@ -9,11 +9,21 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/gorilla/mux"
+    "github.com/labstack/echo/v4"
-
+	"gitlab.computing.dcu.ie/murphg62/2023-ca400-murphg62-byrnm257/src/backend/pkg/database"
-	"gitlab.computing.dcu.ie/murphg62/2023-ca400-murphg62-byrnm257/src/backend/pkg/db"
+	_ "golang.org/x/mod/module"
 )
 
+const (
+	host = "localhost"
+	port = 5432
+	user = "postgres"
+	password = "Gcvy4266"
+	dbname = "Panoptes"
+)
+
+var db, err = database.ConnectDB(host, port, user, password, dbname)
+
 type Schema struct {
 	Name string `json:"Name"`
 	Type int `json:"Type"`
@@ -26,9 +36,12 @@ type Module struct {
 }
 
 
-func GetSchema(w http.ResponseWriter, r *http.Request){
+func homePage(c echo.Context) error {
-	vars := mux.Vars(r)
+	return c.String(http.StatusOK, "Welcome to the home page!")
-	key := vars["container"]
+}
+
+func getSchema(c echo.Context) error {
+	key := c.Param("container")
 
 
 	requestURL := fmt.Sprintf("http://%s/schema", key)
@@ -44,17 +57,13 @@ func GetSchema(w http.ResponseWriter, r *http.Request){
 		log.Fatalf("Failed to print Body: %v", err)
 	}
 
-	w.Header().Set("Content-Type", "application/json")
+    return c.JSONBlob(http.StatusOK, body)
-	w.WriteHeader(resp.StatusCode)
-	w.Write(body)
 }
 
-func GetStats(w http.ResponseWriter, r *http.Request){
+func getStats(c echo.Context) error {
-	vars := mux.Vars(r)
+	key := c.Param("container")
-	key := vars["container"]
 
-
+	requestURL := fmt.Sprintf("http://%s:8080", key)
-	requestURL := fmt.Sprintf("http://%s:8080/stats", key)
 	resp, err := http.Get(requestURL)
 	if err != nil {
 		log.Fatalf("Request to container failed: %v", err)
@@ -67,9 +76,7 @@ func GetStats(w http.ResponseWriter, r *http.Request){
 		log.Fatalf("Failed to print Body: %v", err)
 	}
 
-	w.Header().Set("Content-Type", "application/json")
+    return c.JSONBlob(http.StatusOK, body)
-	w.WriteHeader(resp.StatusCode)
-	w.Write(body)
 }
 
 
@@ -99,32 +106,18 @@ func GetModules(db *sql.DB) http.HandlerFunc{
 	}
 }
 
-func HandleRequests(DB *sql.DB) {
-	myRouter := mux.NewRouter().StrictSlash(true)
-	myRouter.HandleFunc("/api/{container}/schema", GetSchema)
-	myRouter.HandleFunc("/api/{container}/stats", GetStats)
-	myRouter.HandleFunc("/api/modules", GetModules(DB))
-
-	log.Fatal(http.ListenAndServe(":10000", myRouter))
-
-}
-
-
-
-// placeholder, replace with own
-const (
-	host = "localhost"
-	port = 5432
-	user = "postgres"
-	password = "Gcvy4266"
-	dbname = "Panoptes"
-)
-
 func main() {
-	DB, err := db.ConnectDB(host, port, user, password, dbname)
     if err != nil {
         panic(err)
     }
-	HandleRequests(DB)
+    db.Exec(`CREATE TABLE IF NOT EXISTS Module (
-	db.CloseDB(DB)
+                    name VARCHAR(64),
+                    container_name VARCHAR(64)
+             )`)
+    e := echo.New()
+    e.GET("/", homePage)
+    e.GET("/:container/schema", getSchema)
+    e.GET("/:container/stats", getStats)
+    e.Logger.Fatal(e.Start(":10000"))
+	defer db.Close()
 }

src/backend/go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.0
-	github.com/gorilla/mux v1.8.0
+	github.com/labstack/echo/v4 v4.10.2
 	github.com/lib/pq v1.10.8
 	github.com/stretchr/testify v1.8.2
 	golang.org/x/mod v0.8.0
@@ -14,4 +14,13 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/labstack/gommon v0.4.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasttemplate v1.2.2 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
 )

src/backend/go.sum

@@ -2,9 +2,14 @@ github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20O
 github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+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/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M=
+github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k=
+github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
+github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
 github.com/lib/pq v1.10.8 h1:3fdt97i/cwSU83+E0hZTC/Xpc9mTZxc6UWSCRcSbxiE=
 github.com/lib/pq v1.10.8/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -23,3 +28,35 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+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.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
+github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

src/backend/pkg/database/database.go

@@ -1,4 +1,4 @@
-package db
+package database
 import (
 	"database/sql"
 	"fmt"

src/backend/pkg/database/db_test/db_test.go

@@ -2,7 +2,7 @@ package db_test
 
 import (
 	"testing"
-	"gitlab.computing.dcu.ie/murphg62/2023-ca400-murphg62-byrnm257/src/backend/pkg/db"
+	"gitlab.computing.dcu.ie/murphg62/2023-ca400-murphg62-byrnm257/src/backend/pkg/database"
 	"os"
 )
 
@@ -15,7 +15,7 @@ func TestDbConnect(t *testing.T){
 	dbname := os.Getenv("POSTGRES_DB")
 
 
-	DB, err := db.ConnectDB(host, port, user, password, dbname);
+	DB, err := database.ConnectDB(host, port, user, password, dbname);
 
 	if err != nil {
 		t.Errorf("Failed to connect to database: %v", err)
@@ -35,12 +35,12 @@ func TestDbDisconnect(t *testing.T){
 	password := os.Getenv("POSTGRES_PASSWORD")
 	dbname := os.Getenv("POSTGRES_DB")
 
-	DB, err := db.ConnectDB(host, port, user, password, dbname);
+	DB, err := database.ConnectDB(host, port, user, password, dbname);
 	if err!= nil {
 		t.Errorf("Failed to connect to database: %v", err)
 	}
 
-	err = db.CloseDB(DB)
+	err = database.CloseDB(DB)
 	if err != nil {
 		t.Errorf("Failed to disconnect from the database: %v", err)
 	}

src/init.sql

@@ -8,4 +8,4 @@ CREATE TABLE module (
 INSERT INTO
   module (name, container_name)
 VALUES
-  ('Module A', 'Container A') ('Module B', 'Container B') ('Module C', 'Container C')
+  ('Module A', 'Container A'), ('Module B', 'Container B'), ('Module C', 'Container C')