Skip to content

Commit 590f404

Browse files
LeiQLLeiQL
committed
remove naming convert in vendor
1 parent db46369 commit 590f404

14 files changed

Lines changed: 36 additions & 64 deletions

File tree

‎api/pkg/apis/v1alpha1/managers/campaigns/campaigns-manager.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"fmt"
1313

1414
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/model"
15-
api_utils "github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/utils"
1615
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2"
1716
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/contexts"
1817
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/managers"
@@ -49,7 +48,6 @@ func (m *CampaignsManager) GetState(ctx context.Context, name string, namespace
4948
var err error = nil
5049
defer observ_utils.CloseSpanWithError(span, &err)
5150

52-
name = api_utils.ReplaceSeperator(name)
5351
getRequest := states.GetRequest{
5452
ID: name,
5553
Metadata: map[string]interface{}{

‎api/pkg/apis/v1alpha1/managers/jobs/jobs-manager.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414

1515
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/model"
1616
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/utils"
17+
api_utils "github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/utils"
1718
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2"
1819
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/contexts"
1920
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/managers"
@@ -379,7 +380,8 @@ func (s *JobsManager) HandleJobEvent(ctx context.Context, event v1alpha2.Event)
379380

380381
//get solution
381382
var solution model.SolutionState
382-
solution, err = s.apiClient.GetSolution(ctx, instance.Spec.Solution, namespace, s.user, s.password)
383+
solutionName := api_utils.ReplaceSeperator(instance.Spec.Solution)
384+
solution, err = s.apiClient.GetSolution(ctx, solutionName, namespace, s.user, s.password)
383385
if err != nil {
384386
solution = model.SolutionState{
385387
ObjectMeta: model.ObjectMeta{

‎api/pkg/apis/v1alpha1/providers/config/catalog/catalogprovider.go‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ import (
1919
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/contexts"
2020
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/providers"
2121
coa_utils "github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/utils"
22+
"github.com/eclipse-symphony/symphony/coa/pkg/logger"
2223
)
2324

2425
var msLock sync.Mutex
26+
var clog = logger.NewLogger("coa.runtime")
2527

2628
type CatalogConfigProviderConfig struct {
2729
User string `json:"user"`
@@ -106,6 +108,7 @@ func (m *CatalogConfigProvider) unwindOverrides(override string, field string, n
106108
return "", v1alpha2.NewCOAError(nil, fmt.Sprintf("field '%s' is not found in configuration '%s'", field, override), v1alpha2.NotFound)
107109
}
108110
func (m *CatalogConfigProvider) Read(object string, field string, localcontext interface{}) (interface{}, error) {
111+
clog.Debug(" M (Catalog): Read, object: %s, field: %s", object, field)
109112
namespace := m.getNamespaceFromContext(localcontext)
110113
object = api_utils.ReplaceSeperator(object)
111114
catalog, err := m.ApiClient.GetCatalog(context.TODO(), object, namespace, m.Config.User, m.Config.Password)
@@ -130,8 +133,10 @@ func (m *CatalogConfigProvider) Read(object string, field string, localcontext i
130133
}
131134

132135
func (m *CatalogConfigProvider) ReadObject(object string, localcontext interface{}) (map[string]interface{}, error) {
136+
clog.Debug(" M (Catalog): ReadObject, object: %s", object)
133137
namespace := m.getNamespaceFromContext(localcontext)
134138
object = api_utils.ReplaceSeperator(object)
139+
135140
catalog, err := m.ApiClient.GetCatalog(context.TODO(), object, namespace, m.Config.User, m.Config.Password)
136141
if err != nil {
137142
return nil, err
@@ -223,7 +228,7 @@ func (m *CatalogConfigProvider) traceValue(v interface{}, localcontext interface
223228
// TODO: IConfigProvider interface methods should be enhanced to accept namespace as a parameter
224229
// so we can get rid of getCatalogInDefaultNamespace.
225230
func (m *CatalogConfigProvider) Set(object string, field string, value interface{}) error {
226-
object = api_utils.ReplaceSeperator(object)
231+
clog.Debug(" M (Catalog): Set, object: %s, field: %s", object, field)
227232
catalog, err := m.getCatalogInDefaultNamespace(context.TODO(), object)
228233
if err != nil {
229234
return err
@@ -233,7 +238,7 @@ func (m *CatalogConfigProvider) Set(object string, field string, value interface
233238
return m.ApiClient.UpsertCatalog(context.TODO(), object, data, m.Config.User, m.Config.Password)
234239
}
235240
func (m *CatalogConfigProvider) SetObject(object string, value map[string]interface{}) error {
236-
object = api_utils.ReplaceSeperator(object)
241+
clog.Debug(" M (Catalog): SetObject, object: %s", object)
237242
catalog, err := m.getCatalogInDefaultNamespace(context.TODO(), object)
238243
if err != nil {
239244
return err
@@ -246,7 +251,7 @@ func (m *CatalogConfigProvider) SetObject(object string, value map[string]interf
246251
return m.ApiClient.UpsertCatalog(context.TODO(), object, data, m.Config.User, m.Config.Password)
247252
}
248253
func (m *CatalogConfigProvider) Remove(object string, field string) error {
249-
object = api_utils.ReplaceSeperator(object)
254+
clog.Debug(" M (Catalog): Remove, object: %s, field: %s", object, field)
250255
catlog, err := m.getCatalogInDefaultNamespace(context.TODO(), object)
251256
if err != nil {
252257
return err
@@ -259,10 +264,12 @@ func (m *CatalogConfigProvider) Remove(object string, field string) error {
259264
return m.ApiClient.UpsertCatalog(context.TODO(), object, data, m.Config.User, m.Config.Password)
260265
}
261266
func (m *CatalogConfigProvider) RemoveObject(object string) error {
267+
clog.Debug(" M (Catalog): RemoveObject, object: %s", object)
262268
object = api_utils.ReplaceSeperator(object)
263269
return m.ApiClient.DeleteCatalog(context.TODO(), object, m.Config.User, m.Config.Password)
264270
}
265271

266272
func (m *CatalogConfigProvider) getCatalogInDefaultNamespace(context context.Context, catalog string) (model.CatalogState, error) {
273+
catalog = api_utils.ReplaceSeperator(catalog)
267274
return m.ApiClient.GetCatalog(context, catalog, "", m.Config.User, m.Config.Password)
268275
}

‎api/pkg/apis/v1alpha1/providers/stage/materialize/materialize.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
api_utils "github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/utils"
2020
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2"
2121
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/contexts"
22-
2322
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/observability"
2423
observ_utils "github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/observability/utils"
2524
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/providers"

‎api/pkg/apis/v1alpha1/providers/stage/patch/patch.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/model"
1515
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/providers/stage"
1616
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/utils"
17+
api_utils "github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/utils"
1718
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2"
1819
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/contexts"
1920
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/observability"
@@ -141,7 +142,7 @@ func (i *PatchStageProvider) Process(ctx context.Context, mgrContext contexts.Ma
141142
outputs := make(map[string]interface{})
142143

143144
objectType := stage.ReadInputString(inputs, "objectType")
144-
objectName := stage.ReadInputString(inputs, "objectName")
145+
objectName := api_utils.ReplaceSeperator(stage.ReadInputString(inputs, "objectName"))
145146
patchSource := stage.ReadInputString(inputs, "patchSource")
146147
var patchContent interface{}
147148
if v, ok := inputs["patchContent"]; ok {
@@ -166,6 +167,7 @@ func (i *PatchStageProvider) Process(ctx context.Context, mgrContext contexts.Ma
166167
switch patchSource {
167168
case "", "catalog":
168169
if v, ok := patchContent.(string); ok {
170+
v := api_utils.ReplaceSeperator(v)
169171
catalog, err = i.ApiClient.GetCatalog(ctx, v, objectNamespace, i.Config.User, i.Config.Password)
170172

171173
if err != nil {

‎api/pkg/apis/v1alpha1/vendors/campaigns-vendor.go‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/managers/campaigns"
1313
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/model"
1414
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/utils"
15-
api_utils "github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/utils"
1615
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2"
1716
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/managers"
1817
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/observability"
@@ -78,14 +77,7 @@ func (c *CampaignsVendor) onCampaigns(request v1alpha2.COARequest) v1alpha2.COAR
7877
defer span.End()
7978
cLog.Infof("V (Campaigns): onCampaigns, method: %s, traceId: %s", string(request.Method), span.SpanContext().TraceID().String())
8079

81-
id, err := api_utils.GetUnescapaedString(request.Parameters["__name"])
82-
if err != nil {
83-
iLog.Errorf("V (Campaigns): onCampaigns failed - %s, traceId: %s", err.Error(), span.SpanContext().TraceID().String())
84-
return observ_utils.CloseSpanWithCOAResponse(span, v1alpha2.COAResponse{
85-
State: v1alpha2.BadRequest,
86-
Body: []byte(err.Error()),
87-
})
88-
}
80+
id := request.Parameters["__name"]
8981
namespace, namespaceSupplied := request.Parameters["namespace"]
9082
if !namespaceSupplied {
9183
namespace = "default"

‎api/pkg/apis/v1alpha1/vendors/campaigns-vendor_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func TestCampaignsOnCampaigns(t *testing.T) {
8484
resp = vendor.onCampaigns(v1alpha2.COARequest{
8585
Method: fasthttp.MethodGet,
8686
Parameters: map[string]string{
87-
"__name": "campaign1:v1",
87+
"__name": "campaign1-v1",
8888
},
8989
Context: context.Background(),
9090
})

‎api/pkg/apis/v1alpha1/vendors/catalogs-vendor.go‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/managers/catalogs"
1515
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/model"
1616
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/utils"
17-
api_utils "github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/utils"
1817
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2"
1918
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/managers"
2019
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/observability"
@@ -229,7 +228,7 @@ func (e *CatalogsVendor) onCatalogsGraph(request v1alpha2.COARequest) v1alpha2.C
229228
})
230229
defer span.End()
231230

232-
lLog.Infof("V (Catalogs): onCatalogsGraph, method: %s, traceId: %s", string(request.Method), span.SpanContext().TraceID().String())
231+
lLog.Infof("V (Catalogs Vendor): onCatalogsGraph, method: %s, traceId: %s", string(request.Method), span.SpanContext().TraceID().String())
233232
namespace, namesapceSupplied := request.Parameters["namespace"]
234233
if !namesapceSupplied {
235234
namespace = ""
@@ -295,14 +294,7 @@ func (e *CatalogsVendor) onCatalogs(request v1alpha2.COARequest) v1alpha2.COARes
295294

296295
lLog.Infof("V (Catalogs Vendor): onCatalogs, method: %s, traceId: %s", string(request.Method), span.SpanContext().TraceID().String())
297296

298-
id, err := api_utils.GetUnescapaedString(request.Parameters["__name"])
299-
if err != nil {
300-
iLog.Errorf("V (Catalogs): onCatalogsGraph failed - %s, traceId: %s", err.Error(), span.SpanContext().TraceID().String())
301-
return observ_utils.CloseSpanWithCOAResponse(span, v1alpha2.COAResponse{
302-
State: v1alpha2.BadRequest,
303-
Body: []byte(err.Error()),
304-
})
305-
}
297+
id := request.Parameters["__name"]
306298
namespace, namesapceSupplied := request.Parameters["namespace"]
307299
if !namesapceSupplied {
308300
namespace = "default"

‎api/pkg/apis/v1alpha1/vendors/instances-vendor.go‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/managers/instances"
1515
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/model"
1616
"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/utils"
17-
api_utils "github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/utils"
1817
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2"
1918
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/managers"
2019
"github.com/eclipse-symphony/symphony/coa/pkg/apis/v1alpha2/observability"
@@ -80,14 +79,7 @@ func (c *InstancesVendor) onInstances(request v1alpha2.COARequest) v1alpha2.COAR
8079
defer span.End()
8180
iLog.Infof("V (Instances): onInstances, method: %s, traceId: %s", request.Method, span.SpanContext().TraceID().String())
8281

83-
id, err := api_utils.GetUnescapaedString(request.Parameters["__name"])
84-
if err != nil {
85-
iLog.Errorf("V (Instances): onInstances failed - %s, traceId: %s", err.Error(), span.SpanContext().TraceID().String())
86-
return observ_utils.CloseSpanWithCOAResponse(span, v1alpha2.COAResponse{
87-
State: v1alpha2.BadRequest,
88-
Body: []byte(err.Error()),
89-
})
90-
}
82+
id := request.Parameters["__name"]
9183
namespace, exist := request.Parameters["namespace"]
9284
if !exist {
9385
namespace = constants.DefaultScope

‎api/pkg/apis/v1alpha1/vendors/instances-vendor_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ func TestInstancesOnInstances(t *testing.T) {
100100
Body: data,
101101
Parameters: map[string]string{
102102
"__name": "instance1-v1",
103-
"target": "target1:v1",
104-
"solution": "solution1:v1",
103+
"target": "target1-v1",
104+
"solution": "solution1-v1",
105105
},
106106
Context: context.Background(),
107107
})
@@ -120,7 +120,7 @@ func TestInstancesOnInstances(t *testing.T) {
120120
assert.Nil(t, err)
121121
assert.Equal(t, v1alpha2.OK, resp.State)
122122
assert.Equal(t, "instance1-v1", instance.ObjectMeta.Name)
123-
assert.Equal(t, "target1:v1", instance.Spec.Target.Name)
123+
assert.Equal(t, "target1-v1", instance.Spec.Target.Name)
124124

125125
resp = vendor.onInstances(v1alpha2.COARequest{
126126
Method: fasthttp.MethodGet,
@@ -132,7 +132,7 @@ func TestInstancesOnInstances(t *testing.T) {
132132
assert.Equal(t, v1alpha2.OK, resp.State)
133133
assert.Equal(t, 1, len(instances))
134134
assert.Equal(t, "instance1-v1", instances[0].ObjectMeta.Name)
135-
assert.Equal(t, "target1:v1", instances[0].Spec.Target.Name)
135+
assert.Equal(t, "target1-v1", instances[0].Spec.Target.Name)
136136

137137
resp = vendor.onInstances(v1alpha2.COARequest{
138138
Method: fasthttp.MethodDelete,
@@ -183,7 +183,7 @@ func TestInstancesTargetSelector(t *testing.T) {
183183
Parameters: map[string]string{
184184
"__name": "instance1-v1",
185185
"target-selector": "property1=value1",
186-
"solution": "solution1:v1",
186+
"solution": "solution1-v1",
187187
},
188188
Context: context.Background(),
189189
})

0 commit comments

Comments
 (0)