Merge branch 'DEV-144' into 'main'

fix: add allowed origins variable

See merge request !4

Dockerfile

-FROM golang:1.18 as build
+FROM golang:1.21 as build
 
 ARG TARGETARCH
 ARG TARGETOS

Makefile

@@ -47,6 +47,7 @@ develop:
 	$(eval export LOG_LEVEL := -1)
 	$(eval export DEV := true)
 	$(eval export USER_MANAGEMENT_SERVICE_RPC := localhost:9000)
+	$(eval export ALLOWED_ORIGINS := http://localhost:4200/,http://localhost:4200)
 
 	@go run cmd/schema-orchestrator/main.go
 
@@ -65,4 +66,8 @@ log:
 	@kubectl get pods -o wide | grep Running | grep schema-orchestrator | cut -d " " -f1 | xargs kubectl logs -f
 
 login:
-	echo -e "machine git.science.uu.nl\nlogin gitlab-ci-token\npassword ${CI_JOB_TOKEN}" > ~/.netrc
+	echo -e "machine git.science.uu.nl\nlogin gitlab-ci-token\npassword ${CI_JOB_TOKEN}" > ~/.netrc
\ No newline at end of file
+	
+push:
+	@go get -u -v all 
+	@go mod tidy --compat=1.17
\ No newline at end of file

go.mod

 module schema-orchestrator
 
-go 1.18
+go 1.21
 
 require (
 	git.science.uu.nl/graphpolaris/broker v0.0.0-20230809123708-7d1c1acf3e91
-	git.science.uu.nl/graphpolaris/keyvaluestore v0.0.0-20230829154955-1d33a3308a57
-	git.science.uu.nl/graphpolaris/objectstore v0.0.0-20210913150113-977062fb8a3c
-	github.com/arangodb/go-driver v1.2.1
+	git.science.uu.nl/graphpolaris/keyvaluestore v0.0.0-20230912093203-1b3c86eb558a
+	github.com/arangodb/go-driver v1.6.0
 	github.com/go-chi/cors v1.2.1
-	github.com/rs/zerolog v1.29.1
-	google.golang.org/grpc v1.41.0
-	google.golang.org/protobuf v1.25.0
+	github.com/rs/zerolog v1.30.0
+	google.golang.org/grpc v1.58.0
+	google.golang.org/protobuf v1.31.0
 )
 
 require (
 	github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e // indirect
-	github.com/cespare/xxhash/v2 v2.1.1 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/go-redis/redis/v8 v8.8.2 // indirect
-	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/go-redis/redis/v8 v8.11.5 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.18 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/streadway/amqp v1.0.0 // indirect
+	github.com/streadway/amqp v1.1.0 // indirect
 	github.com/thijsheijden/alice v0.1.21-0.20220206104614-72a8777edcc7 // indirect
-	go.opentelemetry.io/otel v0.19.0 // indirect
-	go.opentelemetry.io/otel/metric v0.19.0 // indirect
-	go.opentelemetry.io/otel/trace v0.19.0 // indirect
-	golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	golang.org/x/text v0.3.6 // indirect
-	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	golang.org/x/net v0.15.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230911183012-2d3300fd4832 // indirect
 )
 
 replace git.science.uu.nl/graphpolaris/broker => ../../dependencies/broker
 
-replace git.science.uu.nl/graphpolaris/objectstore => ../../dependencies/objectstore
-
 replace git.science.uu.nl/graphpolaris/keyvaluestore => ../../dependencies/keyvaluestore

internal/drivers/webdriver/web.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"os"
 	"schema-orchestrator/internal/usecases/schema"
+	"strings"
 
 	"github.com/go-chi/cors"
 )
@@ -23,6 +24,7 @@ type Listener struct {
 
 /*
 CreateListener creates a web listener
+
 	schemaService: schema.UseCase, the schema usecase
 	Return: *Listener, returns a web listener
 */
@@ -48,15 +50,17 @@ func (l *Listener) SetupHandlers() {
 	handler := l.schemaRequestHandler()
 
 	if os.Getenv("DEV") == "true" {
+		AllowedOrigins := strings.Split(os.Getenv("ALLOWED_ORIGINS"), ",")
+
 		c := cors.New(cors.Options{
 			// AllowedOrigins:   []string{"https://foo.com"}, // Use this to allow specific origin hosts
-			AllowedOrigins:      []string{"http://localhost:4200/", "http://localhost:4200"},
-			AllowOriginFunc:     func(r *http.Request, origin string) bool { return true },
-			AllowedMethods:      []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
-			AllowedHeaders:      []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token", "Access-Control-Allow-Origin"},
-			ExposedHeaders:      []string{"Link"},
-			AllowCredentials:    true,
-			MaxAge:              300, // Maximum value not ignored by any of major browsers
+			AllowedOrigins:   AllowedOrigins,
+			AllowOriginFunc:  func(r *http.Request, origin string) bool { return true },
+			AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
+			AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token", "Access-Control-Allow-Origin"},
+			ExposedHeaders:   []string{"Link"},
+			AllowCredentials: true,
+			MaxAge:           300, // Maximum value not ignored by any of major browsers
 			// Debug: 			     true,
 		})
 		handler = c.Handler(handler)