DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Fix broken es.NewStoreEncoder call

Browse Source
This commit is contained in:
Denis Arh 2022-06-28 16:07:30 +02:00
parent 9ce63f1210
commit ced4a26068
13 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/apigw/main_test.go
View File

@ -3,6 +3,8 @@ package apigw
import ( import (
"context" "context"
"errors" "errors"
"github.com/cortezaproject/corteza-server/pkg/dal"
"github.com/cortezaproject/corteza-server/store/adapters/rdbms/drivers/sqlite"
"os" "os"
"path" "path"
"testing" "testing"
@ -208,7 +210,7 @@ func parseEnvoy(ctx context.Context, s store.Storer, h helper, path string) {
h.a.NoError(err) h.a.NoError(err)
// import into the store // import into the store
se := es.NewStoreEncoder(s, nil) se := es.NewStoreEncoder(s, dal.Service(), nil)
bld := envoy.NewBuilder(se) bld := envoy.NewBuilder(se)
g, err := bld.Build(ctx, nn...) g, err := bld.Build(ctx, nn...)
h.a.NoError(err) h.a.NoError(err)

3
tests/compose/main_test.go
View File

@ -6,6 +6,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/cortezaproject/corteza-server/pkg/dal"
"io/ioutil" "io/ioutil"
"mime/multipart" "mime/multipart"
"net/http" "net/http"
@ -231,7 +232,7 @@ func parseEnvoy(ctx context.Context, s store.Storer, h helper, path string) {
h.a.NoError(err) h.a.NoError(err)
// import into the store // import into the store
se := envoyStore.NewStoreEncoder(s, nil) se := envoyStore.NewStoreEncoder(s, dal.Service(), &envoyStore.EncoderConfig{})
bld := envoy.NewBuilder(se) bld := envoy.NewBuilder(se)
g, err := bld.Build(ctx, nn...) g, err := bld.Build(ctx, nn...)
h.a.NoError(err) h.a.NoError(err)

6
tests/envoy/main.go
View File

@ -3,6 +3,7 @@ package envoy
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/cortezaproject/corteza-server/pkg/dal"
"os" "os"
"path" "path"
"sync" "sync"
@ -62,7 +63,7 @@ func decodeDirectory(ctx context.Context, suite string) ([]resource.Interface, e
} }
func encode(ctx context.Context, s store.Storer, nn []resource.Interface) error { func encode(ctx context.Context, s store.Storer, nn []resource.Interface) error {
se := es.NewStoreEncoder(s, nil) se := es.NewStoreEncoder(s, dal.Service(), &es.EncoderConfig{})
g, err := envoy.NewSafeBuilder(se).Build(ctx, nn...) g, err := envoy.NewSafeBuilder(se).Build(ctx, nn...)
if err != nil && err != envoy.BuilderErrUnresolvedReferences { if err != nil && err != envoy.BuilderErrUnresolvedReferences {
return err return err
@ -73,7 +74,7 @@ func encode(ctx context.Context, s store.Storer, nn []resource.Interface) error
df := es.NewDecodeFilter().FromRef(md...) df := es.NewDecodeFilter().FromRef(md...)
sd := es.Decoder() sd := es.Decoder()
mm, err := sd.Decode(ctx, s, df) mm, err := sd.Decode(ctx, s, dal.Service(), df)
if err != nil { if err != nil {
return err return err
} }
@ -98,7 +99,6 @@ func truncateStore(ctx context.Context, s store.Storer, t *testing.T) {
store.TruncateComposeNamespaces(ctx, s), store.TruncateComposeNamespaces(ctx, s),
store.TruncateComposeModules(ctx, s), store.TruncateComposeModules(ctx, s),
store.TruncateComposeModuleFields(ctx, s), store.TruncateComposeModuleFields(ctx, s),
store.TruncateComposeRecords(ctx, s, nil),
store.TruncateComposePages(ctx, s), store.TruncateComposePages(ctx, s),
store.TruncateComposeCharts(ctx, s), store.TruncateComposeCharts(ctx, s),

5
tests/envoy/store_csv_records_test.go
View File

@ -3,6 +3,7 @@ package envoy
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/cortezaproject/corteza-server/pkg/dal"
"strconv" "strconv"
"testing" "testing"
"time" "time"
@ -191,7 +192,7 @@ func TestStoreCsv_records(t *testing.T) {
truncateStoreRecords(ctx, s, t) truncateStoreRecords(ctx, s, t)
// Encode back into store // Encode back into store
se := su.NewStoreEncoder(s, &su.EncoderConfig{}) se := su.NewStoreEncoder(s, dal.Service(), &su.EncoderConfig{})
yd := csv.Decoder() yd := csv.Decoder()
nn = make([]resource.Interface, 0, len(nn)) nn = make([]resource.Interface, 0, len(nn))
for _, s := range ss { for _, s := range ss {
@ -406,7 +407,7 @@ func TestStoreCsv_records_fieldTypes(t *testing.T) {
truncateStoreRecords(ctx, s, t) truncateStoreRecords(ctx, s, t)
// Encode back into store // Encode back into store
se := su.NewStoreEncoder(s, &su.EncoderConfig{}) se := su.NewStoreEncoder(s, dal.Service(), &su.EncoderConfig{})
yd := csv.Decoder() yd := csv.Decoder()
nn = make([]resource.Interface, 0, len(nn)) nn = make([]resource.Interface, 0, len(nn))
for _, s := range ss { for _, s := range ss {

5
tests/envoy/store_jsonl_records_test.go
View File

@ -3,6 +3,7 @@ package envoy
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/cortezaproject/corteza-server/pkg/dal"
"strconv" "strconv"
"testing" "testing"
"time" "time"
@ -191,7 +192,7 @@ func TestStoreJsonl_records(t *testing.T) {
truncateStoreRecords(ctx, s, t) truncateStoreRecords(ctx, s, t)
// Encode back into store // Encode back into store
se := su.NewStoreEncoder(s, &su.EncoderConfig{}) se := su.NewStoreEncoder(s, dal.Service(), &su.EncoderConfig{})
jd := json.Decoder() jd := json.Decoder()
nn = make([]resource.Interface, 0, len(nn)) nn = make([]resource.Interface, 0, len(nn))
for _, s := range ss { for _, s := range ss {
@ -406,7 +407,7 @@ func TestStoreJsonl_records_fieldTypes(t *testing.T) {
truncateStoreRecords(ctx, s, t) truncateStoreRecords(ctx, s, t)
// Encode back into store // Encode back into store
se := su.NewStoreEncoder(s, &su.EncoderConfig{}) se := su.NewStoreEncoder(s, dal.Service(), &su.EncoderConfig{})
yd := csv.Decoder() yd := csv.Decoder()
nn = make([]resource.Interface, 0, len(nn)) nn = make([]resource.Interface, 0, len(nn))
for _, s := range ss { for _, s := range ss {

5
tests/envoy/store_yaml_api_gateway_test.go
View File

@ -2,6 +2,7 @@ package envoy
import ( import (
"context" "context"
"github.com/cortezaproject/corteza-server/pkg/dal"
"testing" "testing"
"github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/auth"
@ -86,7 +87,7 @@ func TestStoreYaml_APIGateway(t *testing.T) {
} }
// Decode from store // Decode from store
sd := su.Decoder() sd := su.Decoder()
nn, err := sd.Decode(ctx, s, df) nn, err := sd.Decode(ctx, s, dal.Service(), df)
if c.postStoreDecode != nil { if c.postStoreDecode != nil {
c.postStoreDecode(req, err) c.postStoreDecode(req, err)
} else { } else {
@ -110,7 +111,7 @@ func TestStoreYaml_APIGateway(t *testing.T) {
truncateStore(ctx, s, t) truncateStore(ctx, s, t)
// Encode back into store // Encode back into store
se := su.NewStoreEncoder(s, &su.EncoderConfig{}) se := su.NewStoreEncoder(s, dal.Service(), &su.EncoderConfig{})
yd := yaml.Decoder() yd := yaml.Decoder()
nn = make([]resource.Interface, 0, len(nn)) nn = make([]resource.Interface, 0, len(nn))
for _, s := range ss { for _, s := range ss {

2
tests/envoy/store_yaml_base_test.go
View File

@ -769,7 +769,7 @@ func TestStoreYaml_base(t *testing.T) {
truncateStore(ctx, s, t) truncateStore(ctx, s, t)
// Encode back into store // Encode back into store
se := su.NewStoreEncoder(s, &su.EncoderConfig{}) se := su.NewStoreEncoder(s, dal.Service(), &su.EncoderConfig{})
yd := yaml.Decoder() yd := yaml.Decoder()
nn = make([]resource.Interface, 0, len(nn)) nn = make([]resource.Interface, 0, len(nn))
for _, s := range ss { for _, s := range ss {

2
tests/envoy/store_yaml_modules_test.go
View File

@ -303,7 +303,7 @@ func TestStoreYaml_moduleFieldRefs(t *testing.T) {
truncateStore(ctx, s, t) truncateStore(ctx, s, t)
// Encode back into store // Encode back into store
se := su.NewStoreEncoder(s, &su.EncoderConfig{}) se := su.NewStoreEncoder(s, dal.Service(), &su.EncoderConfig{})
yd := yaml.Decoder() yd := yaml.Decoder()
nn = make([]resource.Interface, 0, len(nn)) nn = make([]resource.Interface, 0, len(nn))
for _, s := range ss { for _, s := range ss {

2
tests/envoy/store_yaml_pages_test.go
View File

@ -693,7 +693,7 @@ func TestStoreYaml_pageRefs(t *testing.T) {
truncateStore(ctx, s, t) truncateStore(ctx, s, t)
// Encode back into store // Encode back into store
se := su.NewStoreEncoder(s, &su.EncoderConfig{}) se := su.NewStoreEncoder(s, dal.Service(), &su.EncoderConfig{})
yd := yaml.Decoder() yd := yaml.Decoder()
nn = make([]resource.Interface, 0, len(nn)) nn = make([]resource.Interface, 0, len(nn))
for _, s := range ss { for _, s := range ss {

2
tests/envoy/store_yaml_reports_test.go
View File

@ -98,7 +98,7 @@ func TestStoreYaml_reports(t *testing.T) {
truncateStore(ctx, s, t) truncateStore(ctx, s, t)
// Encode back into store // Encode back into store
se := su.NewStoreEncoder(s, &su.EncoderConfig{}) se := su.NewStoreEncoder(s, dal.Service(), &su.EncoderConfig{})
yd := yaml.Decoder() yd := yaml.Decoder()
nn = make([]resource.Interface, 0, len(nn)) nn = make([]resource.Interface, 0, len(nn))
for _, s := range ss { for _, s := range ss {

5
tests/envoy/yaml_store_rbac_test.go
View File

@ -2,6 +2,7 @@ package envoy
import ( import (
"context" "context"
"github.com/cortezaproject/corteza-server/pkg/dal"
"testing" "testing"
"github.com/cortezaproject/corteza-server/compose/types" "github.com/cortezaproject/corteza-server/compose/types"
@ -178,7 +179,7 @@ func TestYamlStore_rbac(t *testing.T) {
// - decode store // - decode store
sd := su.Decoder() sd := su.Decoder()
nn, err = sd.Decode(ctx, s, df) nn, err = sd.Decode(ctx, s, dal.Service(), df)
req.NoError(err) req.NoError(err)
// //
// - into yaml // - into yaml
@ -194,7 +195,7 @@ func TestYamlStore_rbac(t *testing.T) {
truncateStore(ctx, s, t) truncateStore(ctx, s, t)
// //
// - back into store // - back into store
se := su.NewStoreEncoder(s, &su.EncoderConfig{}) se := su.NewStoreEncoder(s, dal.Service(), &su.EncoderConfig{})
yd := yaml.Decoder() yd := yaml.Decoder()
nn = make([]resource.Interface, 0, len(nn)) nn = make([]resource.Interface, 0, len(nn))
for _, s := range ss { for _, s := range ss {

2
tests/reporter/main_test.go
View File

@ -314,7 +314,7 @@ func parseEnvoy(ctx context.Context, s store.Storer, h helper, path string) {
h.a.NoError(err) h.a.NoError(err)
// import into the store // import into the store
se := es.NewStoreEncoder(s, nil) se := es.NewStoreEncoder(s, dal.Service(), nil)
bld := envoy.NewBuilder(se) bld := envoy.NewBuilder(se)
g, err := bld.Build(ctx, nn...) g, err := bld.Build(ctx, nn...)
h.a.NoError(err) h.a.NoError(err)

2
tests/workflows/main_test.go
View File

@ -94,7 +94,7 @@ func loadScenarioWithName(ctx context.Context, t *testing.T, scenario string) {
t.Fatalf("failed to decode scenario data: %v", err) t.Fatalf("failed to decode scenario data: %v", err)
} }
storeEnc := envoyStore.NewStoreEncoder(defStore, &envoyStore.EncoderConfig{}) storeEnc := envoyStore.NewStoreEncoder(defStore, dal.Service(), &envoyStore.EncoderConfig{})
b := envoy.NewBuilder(storeEnc) b := envoy.NewBuilder(storeEnc)
g, err := b.Build(ctx, decoded...) g, err := b.Build(ctx, decoded...)