wip: cors support

nitrictech · Oct 20, 2023 · 8f83aee · 8f83aee
1 parent 5d8ae02
commit 8f83aee
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/pkg/codeconfig/api.go b/pkg/codeconfig/api.go
@@ -29,6 +29,7 @@ type Api struct {
 	parent              *FunctionDependencies
 	securityDefinitions map[string]*v1.ApiSecurityDefinition
 	security            map[string][]string
+	cors                *v1.ApiCorsDefinition
 	workers             []*v1.ApiWorker
 	lock                sync.RWMutex
 }
@@ -108,3 +109,10 @@ func (a *Api) AddSecurity(name string, scopes []string) {
 		a.security[name] = []string{}
 	}
 }
+
+func (a *Api) AddCors(cors *v1.ApiCorsDefinition) {
+	a.lock.Lock()
+	defer a.lock.Unlock()
+
+	a.cors = cors
+}
diff --git a/pkg/codeconfig/function.go b/pkg/codeconfig/function.go
@@ -77,14 +77,16 @@ func (a *FunctionDependencies) AddApiSecurityDefinitions(name string, sds map[st
 	}
 }
 
-func (a *FunctionDependencies) AddApiSecurity(name string, security map[string]*v1.ApiScopes) {
+func (a *FunctionDependencies) AddApiSecurity(name string, security map[string]*v1.ApiScopes, cors *v1.ApiCorsDefinition) {
 	a.lock.Lock()
 	defer a.lock.Unlock()
 
 	if a.apis[name] == nil {
 		a.apis[name] = newApi(a)
 	}
 
+	a.apis[name].AddCors(cors)
+
 	for n, scopes := range security {
 		a.apis[name].AddSecurity(n, scopes.Scopes)
 	}

diff --git a/pkg/codeconfig/server.go b/pkg/codeconfig/server.go
@@ -87,7 +87,7 @@ func (s *Server) Declare(ctx context.Context, req *v1.ResourceDeclareRequest) (*
 		s.function.AddSecret(req.Resource.Name, req.GetSecret())
 	case v1.ResourceType_Api:
 		s.function.AddApiSecurityDefinitions(req.Resource.Name, req.GetApi().SecurityDefinitions)
-		s.function.AddApiSecurity(req.Resource.Name, req.GetApi().Security)
+		s.function.AddApiSecurity(req.Resource.Name, req.GetApi().Security, req.GetApi().GetCors())
 	case v1.ResourceType_Websocket:
 		// TODO: Add websocket configuration here when available
 		break

diff --git a/pkg/codeconfig/uprequest.go b/pkg/codeconfig/uprequest.go
@@ -195,7 +195,7 @@ func (c *codeConfig) ToUpRequest() (*deploy.DeployUpRequest, error) {
 			builder.set(res)
 		}
 
-		for k := range f.apis {
+		for k, api := range f.apis {
 			spec, err := c.apiSpec(k, nil)
 			if err != nil {
 				errs.Push(fmt.Errorf("could not build spec for api: %s; %w", k, err))
@@ -216,6 +216,7 @@ func (c *codeConfig) ToUpRequest() (*deploy.DeployUpRequest, error) {
 						Document: &deploy.Api_Openapi{
 							Openapi: string(apiBody),
 						},
+						Cors: api.cors,
 					},
 				},
 			})