Skip to content

Commit

Permalink
chore: improve
Browse files Browse the repository at this point in the history
  • Loading branch information
StarpTech committed Jan 20, 2024
1 parent 9da7e48 commit 6da3a9a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
1 change: 0 additions & 1 deletion .github/workflows/aws-lambda-router-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ concurrency:

env:
CI: true
ROUTER_REGISTRATION: false

jobs:
build_test:
Expand Down
16 changes: 8 additions & 8 deletions router/core/factoryresolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package core

import (
"fmt"
config2 "github.com/wundergraph/cosmo/router/pkg/config"
"github.com/wundergraph/cosmo/router/pkg/config"
"net/http"
"net/url"
"time"
Expand Down Expand Up @@ -118,9 +118,9 @@ func (l *Loader) LoadInternedString(engineConfig *nodev1.EngineConfiguration, st
}

type RouterEngineConfiguration struct {
Execution config2.EngineExecutionConfiguration
Headers config2.HeaderRules
Events config2.EventsConfiguration
Execution config.EngineExecutionConfiguration
Headers config.HeaderRules
Events config.EventsConfiguration
}

func (l *Loader) Load(routerConfig *nodev1.RouterConfig, routerEngineConfig *RouterEngineConfiguration) (*plan.Configuration, error) {
Expand Down Expand Up @@ -174,19 +174,19 @@ func (l *Loader) Load(routerConfig *nodev1.RouterConfig, routerEngineConfig *Rou
switch in.Kind {
case nodev1.DataSourceKind_STATIC:
out.Custom = staticdatasource.ConfigJSON(staticdatasource.Configuration{
Data: config2.LoadStringVariable(in.CustomStatic.Data),
Data: config.LoadStringVariable(in.CustomStatic.Data),
})
case nodev1.DataSourceKind_GRAPHQL:
header := http.Header{}
for s, httpHeader := range in.CustomGraphql.Fetch.Header {
for _, value := range httpHeader.Values {
header.Add(s, config2.LoadStringVariable(value))
header.Add(s, config.LoadStringVariable(value))
}
}

fetchUrl := config2.LoadStringVariable(in.CustomGraphql.Fetch.GetUrl())
fetchUrl := config.LoadStringVariable(in.CustomGraphql.Fetch.GetUrl())

subscriptionUrl := config2.LoadStringVariable(in.CustomGraphql.Subscription.Url)
subscriptionUrl := config.LoadStringVariable(in.CustomGraphql.Subscription.Url)
if subscriptionUrl == "" {
subscriptionUrl = fetchUrl
}
Expand Down

0 comments on commit 6da3a9a

Please sign in to comment.