Resolve merge lapsus

pkg/envoy/resource/compose_chart.go

@@ -2,6 +2,7 @@ package resource
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/cortezaproject/corteza-server/compose/types"
 )

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
 }

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),
 	)
 }