eric/onix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #520 from nirmalnr/feature/exclude_action

Browse Source 
feat(router): add excludeAction option for URL routing for backward compatibility
This commit is contained in:
Mayuresh A Nirhali
2025-09-24 22:34:19 +05:30
committed by GitHub
parent 8ab7ef06a9 e029ebe1f2
commit ff6b907dee
8 changed files with 193 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/plugin/implementation/router/router.go
View File

@@ -42,6 +42,7 @@ type routingRule struct {
type target struct {
URL string `yaml:"url,omitempty"` // URL for "url" or gateway endpoint for "bpp"/"bap"
PublisherID string `yaml:"publisherId,omitempty"` // For "msgq" type
ExcludeAction bool `yaml:"excludeAction,omitempty"` // For "url" type to exclude appending action to URL path
}
// TargetType defines possible target destinations.
@@ -115,7 +116,9 @@ func (r *Router) loadRules(configPath string) error {
if err != nil {
return fmt.Errorf("invalid URL in rule: %w", err)
}
parsedURL.Path = joinPath(parsedURL, endpoint)
if !rule.Target.ExcludeAction {
parsedURL.Path = joinPath(parsedURL, endpoint)
}
route = &model.Route{
TargetType: rule.TargetType,
URL: parsedURL,

130
pkg/plugin/implementation/router/router_test.go
View File

@@ -551,4 +551,134 @@ func TestRouteFailure(t *testing.T) {
}
})
}
}
// TestExcludeAction tests the excludeAction feature for URL routing
func TestExcludeAction(t *testing.T) {
tests := []struct {
name string
configFile string
expectedRoutes map[string]map[string]map[string]*model.Route
}{
{
name: "excludeAction true - action not appended to URL",
configFile: "exclude_action_true.yaml",
expectedRoutes: map[string]map[string]map[string]*model.Route{
"ONDC:TRV10": {
"2.0.0": {
"search": {TargetType: targetTypeURL, URL: parseURL(t, "https://services-backend.com/v2/ondc")},
"init": {TargetType: targetTypeURL, URL: parseURL(t, "https://services-backend.com/v2/ondc")},
},
},
},
},
{
name: "excludeAction false - action appended to URL",
configFile: "exclude_action_false.yaml",
expectedRoutes: map[string]map[string]map[string]*model.Route{
"ONDC:TRV10": {
"2.0.0": {
"search": {TargetType: targetTypeURL, URL: parseURL(t, "https://services-backend.com/v2/ondc/search")},
"init": {TargetType: targetTypeURL, URL: parseURL(t, "https://services-backend.com/v2/ondc/init")},
},
},
},
},
{
name: "excludeAction not specified - defaults to false (action appended)",
configFile: "exclude_action_default.yaml",
expectedRoutes: map[string]map[string]map[string]*model.Route{
"ONDC:TRV10": {
"2.0.0": {
"search": {TargetType: targetTypeURL, URL: parseURL(t, "https://services-backend.com/v2/ondc/search")},
"init": {TargetType: targetTypeURL, URL: parseURL(t, "https://services-backend.com/v2/ondc/init")},
},
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
router := &Router{
rules: make(map[string]map[string]map[string]*model.Route),
}
rulesFilePath := setupTestConfig(t, tt.configFile)
defer os.RemoveAll(filepath.Dir(rulesFilePath))
err := router.loadRules(rulesFilePath)
if err != nil {
t.Fatalf("loadRules() err = %v, want nil", err)
}
if !reflect.DeepEqual(router.rules, tt.expectedRoutes) {
t.Errorf("Loaded rules mismatch for %s.\nGot:\n%#v\nWant:\n%#v", tt.name, router.rules, tt.expectedRoutes)
}
})
}
}
// TestExcludeActionWithNonURLTargetTypes tests that excludeAction is ignored for non-URL target types
func TestExcludeActionWithNonURLTargetTypes(t *testing.T) {
tests := []struct {
name string
configFile string
expectedRoutes map[string]map[string]map[string]*model.Route
}{
{
name: "BPP target type - excludeAction should be ignored",
configFile: "exclude_action_bpp.yaml",
expectedRoutes: map[string]map[string]map[string]*model.Route{
"ONDC:TRV10": {
"2.0.0": {
"search": {TargetType: targetTypeBPP, URL: parseURL(t, "https://mock_bpp.com/v2/ondc/search")},
"init": {TargetType: targetTypeBPP, URL: parseURL(t, "https://mock_bpp.com/v2/ondc/init")},
},
},
},
},
{
name: "BAP target type - excludeAction should be ignored",
configFile: "exclude_action_bap.yaml",
expectedRoutes: map[string]map[string]map[string]*model.Route{
"ONDC:TRV10": {
"2.0.0": {
"search": {TargetType: targetTypeBAP, URL: parseURL(t, "https://mock_bap.com/v2/ondc/search")},
"init": {TargetType: targetTypeBAP, URL: parseURL(t, "https://mock_bap.com/v2/ondc/init")},
},
},
},
},
{
name: "Publisher target type - excludeAction should be ignored",
configFile: "exclude_action_publisher.yaml",
expectedRoutes: map[string]map[string]map[string]*model.Route{
"ONDC:TRV10": {
"2.0.0": {
"search": {TargetType: targetTypePublisher, PublisherID: "test_topic", URL: nil},
"init": {TargetType: targetTypePublisher, PublisherID: "test_topic", URL: nil},
},
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
router := &Router{
rules: make(map[string]map[string]map[string]*model.Route),
}
rulesFilePath := setupTestConfig(t, tt.configFile)
defer os.RemoveAll(filepath.Dir(rulesFilePath))
err := router.loadRules(rulesFilePath)
if err != nil {
t.Fatalf("loadRules() err = %v, want nil", err)
}
if !reflect.DeepEqual(router.rules, tt.expectedRoutes) {
t.Errorf("Loaded rules mismatch for %s.\nGot:\n%#v\nWant:\n%#v", tt.name, router.rules, tt.expectedRoutes)
}
})
}
}

10
pkg/plugin/implementation/router/testData/exclude_action_bap.yaml Normal file
View File

@@ -0,0 +1,10 @@
routingRules:
- domain: ONDC:TRV10
version: 2.0.0
targetType: bap
target:
url: https://mock_bap.com/v2/ondc
excludeAction: true
endpoints:
- search
- init

10
pkg/plugin/implementation/router/testData/exclude_action_bpp.yaml Normal file
View File

@@ -0,0 +1,10 @@
routingRules:
- domain: ONDC:TRV10
version: 2.0.0
targetType: bpp
target:
url: https://mock_bpp.com/v2/ondc
excludeAction: true
endpoints:
- search
- init

9
pkg/plugin/implementation/router/testData/exclude_action_default.yaml Normal file
View File

@@ -0,0 +1,9 @@
routingRules:
- domain: ONDC:TRV10
version: 2.0.0
targetType: url
target:
url: https://services-backend.com/v2/ondc
endpoints:
- search
- init

10
pkg/plugin/implementation/router/testData/exclude_action_false.yaml Normal file
View File

@@ -0,0 +1,10 @@
routingRules:
- domain: ONDC:TRV10
version: 2.0.0
targetType: url
target:
url: https://services-backend.com/v2/ondc
excludeAction: false
endpoints:
- search
- init

10
pkg/plugin/implementation/router/testData/exclude_action_publisher.yaml Normal file
View File

@@ -0,0 +1,10 @@
routingRules:
- domain: ONDC:TRV10
version: 2.0.0
targetType: publisher
target:
publisherId: test_topic
excludeAction: true
endpoints:
- search
- init

10
pkg/plugin/implementation/router/testData/exclude_action_true.yaml Normal file
View File

@@ -0,0 +1,10 @@
routingRules:
- domain: ONDC:TRV10
version: 2.0.0
targetType: url
target:
url: https://services-backend.com/v2/ondc
excludeAction: true
endpoints:
- search
- init