diff --git a/pkg/envoy/resource/compose_chart.go b/pkg/envoy/resource/compose_chart.go index 20b957d28..458298eab 100644 --- a/pkg/envoy/resource/compose_chart.go +++ b/pkg/envoy/resource/compose_chart.go @@ -2,6 +2,7 @@ package resource import ( "fmt" + "strconv" "github.com/cortezaproject/corteza-server/compose/types" ) diff --git a/pkg/envoy/resource/resource.go b/pkg/envoy/resource/resource.go index dc423400b..622804785 100644 --- a/pkg/envoy/resource/resource.go +++ b/pkg/envoy/resource/resource.go @@ -212,6 +212,10 @@ func (t *base) Placeholder() bool { return t.ph } +func MakeRef(rt string, ii Identifiers) *Ref { + return &Ref{ResourceType: rt, Identifiers: ii} +} + func IgnoreDepResolution(ref *Ref) bool { return ref.ResourceType == composeTypes.ModuleFieldResourceType } diff --git a/pkg/envoy/yaml/report_unmarshal.go b/pkg/envoy/yaml/report_unmarshal.go index eeb3875cc..5c9af6adf 100644 --- a/pkg/envoy/yaml/report_unmarshal.go +++ b/pkg/envoy/yaml/report_unmarshal.go @@ -178,15 +178,15 @@ func (wrap report) MarshalEnvoy() ([]resource.Interface, error) { // default report translations // includes translations for nested resources also - var defaultReportTranslations []resource.Interface - dft, err := rs.EncodeTranslations() - if err != nil { - return nil, err - } - for _, d := range dft { - d.MarkDefault() - defaultReportTranslations = append(defaultReportTranslations, d) - } + // var defaultReportTranslations []resource.Interface + // dft, err := rs.EncodeTranslations() + // if err != nil { + // return nil, err + // } + // for _, d := range dft { + // d.MarkDefault() + // defaultReportTranslations = append(defaultReportTranslations, d) + // } for _, s := range wrap.sources { rs.AddReportSource(s.res) @@ -198,7 +198,7 @@ func (wrap report) MarshalEnvoy() ([]resource.Interface, error) { return envoy.CollectNodes( rs, - defaultReportTranslations, + // defaultReportTranslations, wrap.rbac.bindResource(rs), ) }