diff --git a/src/backend/go.mod b/src/backend/go.mod index 4bd2342..35c0297 100644 --- a/src/backend/go.mod +++ b/src/backend/go.mod @@ -3,12 +3,12 @@ module gitlab.computing.dcu.ie/murphg62/2023-ca400-murphg62-byrnm257/src/backend go 1.19 require ( - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/gorilla/mux v1.8.0 // indirect golang.org/x/net v0.8.0 // indirect golang.org/x/sys v0.6.0 // indirect golang.org/x/text v0.8.0 // indirect google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect google.golang.org/grpc v1.53.0 // indirect - google.golang.org/protobuf v1.28.1 // indirect + google.golang.org/protobuf v1.30.0 // indirect ) diff --git a/src/backend/go.sum b/src/backend/go.sum index e6f567c..2843dd0 100644 --- a/src/backend/go.sum +++ b/src/backend/go.sum @@ -1,6 +1,8 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= @@ -29,3 +31,5 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/src/backend/moduleAPI.go b/src/backend/moduleAPI.go index ea7d6b3..2a73dcc 100644 --- a/src/backend/moduleAPI.go +++ b/src/backend/moduleAPI.go @@ -13,10 +13,10 @@ import ( func getSchema(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) - container := vars["container"] + port := vars["port"] //make get request to specified container - url := fmt.Sprintf("http://%s", container) + url := fmt.Sprintf("http://localhost:%s", port) resp, err := http.Get(url) if err != nil { log.Fatal("Error: ", err) @@ -44,7 +44,7 @@ func getStats(w http.ResponseWriter, r *http.Request) { //make get request to specified container - url := fmt.Sprintf("http://localhost:%d", port) + url := fmt.Sprintf("http://localhost:%s", port) resp, err := http.Get(url) if err != nil { log.Fatal("Error: ", err) @@ -74,6 +74,7 @@ func handleRequests() { myRouter := mux.NewRouter().StrictSlash(true) myRouter.HandleFunc("/schema/{container}", getSchema) + myRouter.HandleFunc("/stats/{port}", getStats) log.Fatal(http.ListenAndServe(":3000", myRouter)) } diff --git a/src/common/proto/components.proto b/src/common/proto/components.proto index 3065a4d..a2c4d43 100644 --- a/src/common/proto/components.proto +++ b/src/common/proto/components.proto @@ -3,11 +3,25 @@ package panoptes; option go_package = "panoptes.com/src/panoptes/main"; + +service SchemaService { + rpc getSchema (Container) returns (Schema) {} +} + +service StatsService { + rpc getStats (Container) returns (ChartComponent) {} +} + enum ComponentType { Text = 0; Chart = 1; } +message Container { + string name = 1; + string port = 2; +} + message Component { string id = 1; string name = 2;