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

Issue 511 - Fix review comments

Browse Source
This commit is contained in:
Mayuresh Nirhali
2025-09-18 22:43:04 +05:30
parent 979763b5ec
commit 78074c34b4
9 changed files with 110 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
config/local-dev.yaml
View File

@@ -27,9 +27,9 @@ modules:
id: registry id: registry
config: config:
url: http://localhost:8080/reg url: http://localhost:8080/reg
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: keymanager id: keymanager
config: config:
@@ -70,9 +70,9 @@ modules:
id: registry id: registry
config: config:
url: http://localhost:8080/reg url: http://localhost:8080/reg
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: keymanager id: keymanager
config: config:
@@ -109,9 +109,9 @@ modules:
id: registry id: registry
config: config:
url: http://localhost:8080/reg url: http://localhost:8080/reg
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: keymanager id: keymanager
config: config:
@@ -148,9 +148,9 @@ modules:
id: registry id: registry
config: config:
url: http://localhost:8080/reg url: http://localhost:8080/reg
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: keymanager id: keymanager
config: config:

24
config/local-simple.yaml
View File

@@ -27,9 +27,9 @@ modules:
id: registry id: registry
config: config:
url: http://registry:3030/subscribers url: http://registry:3030/subscribers
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: simplekeymanager id: simplekeymanager
config: config:
@@ -72,9 +72,9 @@ modules:
id: registry id: registry
config: config:
url: http://registry:3030/subscribers url: http://registry:3030/subscribers
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: simplekeymanager id: simplekeymanager
config: config:
@@ -113,9 +113,9 @@ modules:
id: registry id: registry
config: config:
url: http://registry:3030/subscribers url: http://registry:3030/subscribers
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: simplekeymanager id: simplekeymanager
config: config:
@@ -152,9 +152,9 @@ modules:
id: registry id: registry
config: config:
url: http://registry:3030/subscribers url: http://registry:3030/subscribers
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: simplekeymanager id: simplekeymanager
config: config:

16
config/onix-bap/adapter.yaml
View File

@@ -24,13 +24,13 @@ modules:
type: std type: std
role: bap role: bap
plugins: plugins:
registry: registry:
id: registry id: registry
config: config:
url: http://localhost:8080/reg url: http://localhost:8080/reg
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: secretskeymanager id: secretskeymanager
config: config:
@@ -69,13 +69,13 @@ modules:
type: std type: std
role: bap role: bap
plugins: plugins:
registry: registry:
id: registry id: registry
config: config:
url: http://localhost:8080/reg url: http://localhost:8080/reg
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: secretskeymanager id: secretskeymanager
config: config:

16
config/onix-bpp/adapter.yaml
View File

@@ -25,13 +25,13 @@ modules:
role: bpp role: bpp
subscriberId: bpp1 subscriberId: bpp1
plugins: plugins:
registry: registry:
id: registry id: registry
config: config:
url: http://localhost:8080/reg url: http://localhost:8080/reg
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: secretskeymanager id: secretskeymanager
config: config:
@@ -70,13 +70,13 @@ modules:
type: std type: std
role: bpp role: bpp
plugins: plugins:
registry: registry:
id: registry id: registry
config: config:
url: http://localhost:8080/reg url: http://localhost:8080/reg
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: secretskeymanager id: secretskeymanager
config: config:

26
config/onix/adapter.yaml
View File

@@ -28,9 +28,9 @@ modules:
id: registry id: registry
config: config:
url: http://localhost:8080/reg url: http://localhost:8080/reg
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: secretskeymanager id: secretskeymanager
config: config:
@@ -73,9 +73,9 @@ modules:
id: registry id: registry
config: config:
url: http://localhost:8080/reg url: http://localhost:8080/reg
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: secretskeymanager id: secretskeymanager
config: config:
@@ -119,9 +119,9 @@ modules:
id: registry id: registry
config: config:
url: http://localhost:8080/reg url: http://localhost:8080/reg
retry_max: "3" retry_max: 3
retry_wait_min: "100ms" retry_wait_min: 100ms
retry_wait_max: "500ms" retry_wait_max: 500ms
keyManager: keyManager:
id: secretskeymanager id: secretskeymanager
config: config:
@@ -159,8 +159,14 @@ modules:
handler: handler:
type: std type: std
role: bpp role: bpp
registryUrl: http://localhost:8080/reg
plugins: plugins:
registry:
id: registry
config:
url: http://localhost:8080/reg
retry_max: 3
retry_wait_min: 100ms
retry_wait_max: 500ms
keyManager: keyManager:
id: secretskeymanager id: secretskeymanager
config: config:

2
pkg/plugin/definition/registry.go
View File

@@ -7,8 +7,8 @@ import (
) )
type RegistryLookup interface { type RegistryLookup interface {
// looks up Registry entry to obtain public keys to validate signature of the incoming message
Lookup(ctx context.Context, req *model.Subscription) ([]model.Subscription, error) Lookup(ctx context.Context, req *model.Subscription) ([]model.Subscription, error)
Subscribe(ctx context.Context, subscription *model.Subscription) error
} }
// RegistryLookupProvider initializes a new registry lookup instance. // RegistryLookupProvider initializes a new registry lookup instance.

69
pkg/plugin/implementation/registry/cmd/plugin.go
View File

@@ -3,6 +3,7 @@ package main
import ( import (
"context" "context"
"errors" "errors"
"fmt"
"strconv" "strconv"
"time" "time"
@@ -14,39 +15,61 @@ import (
// registryProvider implements the RegistryLookupProvider interface for the registry plugin. // registryProvider implements the RegistryLookupProvider interface for the registry plugin.
type registryProvider struct{} type registryProvider struct{}
// newRegistryFunc is a function type that creates a new Registry instance.
var newRegistryFunc = registry.New
// parseConfig parses the configuration map and returns a registry.Config with optional parameters.
func (r registryProvider) parseConfig(config map[string]string) (*registry.Config, error) {
registryConfig := &registry.Config{
URL: config["url"],
}
// Parse retry_max
if retryMaxStr, exists := config["retry_max"]; exists && retryMaxStr != "" {
retryMax, err := strconv.Atoi(retryMaxStr)
if err != nil {
return nil, fmt.Errorf("invalid retry_max value '%s': %w", retryMaxStr, err)
}
registryConfig.RetryMax = retryMax
}
// Parse retry_wait_min
if retryWaitMinStr, exists := config["retry_wait_min"]; exists && retryWaitMinStr != "" {
retryWaitMin, err := time.ParseDuration(retryWaitMinStr)
if err != nil {
return nil, fmt.Errorf("invalid retry_wait_min value '%s': %w", retryWaitMinStr, err)
}
registryConfig.RetryWaitMin = retryWaitMin
}
// Parse retry_wait_max
if retryWaitMaxStr, exists := config["retry_wait_max"]; exists && retryWaitMaxStr != "" {
retryWaitMax, err := time.ParseDuration(retryWaitMaxStr)
if err != nil {
return nil, fmt.Errorf("invalid retry_wait_max value '%s': %w", retryWaitMaxStr, err)
}
registryConfig.RetryWaitMax = retryWaitMax
}
return registryConfig, nil
}
// New creates a new registry plugin instance. // New creates a new registry plugin instance.
func (r registryProvider) New(ctx context.Context, config map[string]string) (definition.RegistryLookup, func() error, error) { func (r registryProvider) New(ctx context.Context, config map[string]string) (definition.RegistryLookup, func() error, error) {
if ctx == nil { if ctx == nil {
return nil, nil, errors.New("context cannot be nil") return nil, nil, errors.New("context cannot be nil")
} }
// Parse configuration from map // Parse configuration from map using the dedicated method
registryConfig := &registry.Config{ registryConfig, err := r.parseConfig(config)
URL: config["url"], if err != nil {
} log.Errorf(ctx, err, "Failed to parse registry configuration")
return nil, nil, fmt.Errorf("failed to parse registry configuration: %w", err)
// Parse optional retry settings
if retryMaxStr, exists := config["retry_max"]; exists && retryMaxStr != "" {
if retryMax, err := strconv.Atoi(retryMaxStr); err == nil {
registryConfig.RetryMax = retryMax
}
}
if retryWaitMinStr, exists := config["retry_wait_min"]; exists && retryWaitMinStr != "" {
if retryWaitMin, err := time.ParseDuration(retryWaitMinStr); err == nil {
registryConfig.RetryWaitMin = retryWaitMin
}
}
if retryWaitMaxStr, exists := config["retry_wait_max"]; exists && retryWaitMaxStr != "" {
if retryWaitMax, err := time.ParseDuration(retryWaitMaxStr); err == nil {
registryConfig.RetryWaitMax = retryWaitMax
}
} }
log.Debugf(ctx, "Registry config mapped: %+v", registryConfig) log.Debugf(ctx, "Registry config mapped: %+v", registryConfig)
registryClient, closer, err := registry.New(ctx, registryConfig) registryClient, closer, err := newRegistryFunc(ctx, registryConfig)
if err != nil { if err != nil {
log.Errorf(ctx, err, "Failed to create registry instance") log.Errorf(ctx, err, "Failed to create registry instance")
return nil, nil, err return nil, nil, err

16
pkg/plugin/implementation/registry/cmd/plugin_test.go
View File

@@ -145,7 +145,6 @@ func TestRegistryProvider_IntegrationTest(t *testing.T) {
require.NotNil(t, closer) require.NotNil(t, closer)
defer closer() defer closer()
// Test Subscribe
subscription := &model.Subscription{ subscription := &model.Subscription{
Subscriber: model.Subscriber{ Subscriber: model.Subscriber{
SubscriberID: "test-subscriber", SubscriberID: "test-subscriber",
@@ -161,9 +160,6 @@ func TestRegistryProvider_IntegrationTest(t *testing.T) {
Status: "SUBSCRIBED", Status: "SUBSCRIBED",
} }
err = registry.Subscribe(ctx, subscription)
require.NoError(t, err)
// Test Lookup // Test Lookup
results, err := registry.Lookup(ctx, subscription) results, err := registry.Lookup(ctx, subscription)
require.NoError(t, err) require.NoError(t, err)
@@ -249,18 +245,6 @@ func TestRegistryProvider_ConfigurationParsing(t *testing.T) {
require.NotNil(t, closer) require.NotNil(t, closer)
defer closer() defer closer()
// The registry should work regardless of invalid config values
subscription := &model.Subscription{
KeyID: "test-key",
SigningPublicKey: "test-signing-key",
EncrPublicKey: "test-encryption-key",
ValidFrom: time.Now(),
ValidUntil: time.Now().Add(24 * time.Hour),
Status: "SUBSCRIBED",
}
err = registry.Subscribe(ctx, subscription)
assert.NoError(t, err)
}) })
} }
} }

14
pkg/plugin/implementation/registry/registry.go
View File

@@ -47,22 +47,22 @@ func New(ctx context.Context, cfg *Config) (*RegistryClient, func() error, error
return nil, nil, err return nil, nil, err
} }
retryClient := retryablehttp.NewClient() rc := retryablehttp.NewClient()
// Configure retry settings if provided // Configure retry settings if provided
if cfg.RetryMax > 0 { if cfg.RetryMax > 0 {
retryClient.RetryMax = cfg.RetryMax rc.RetryMax = cfg.RetryMax
} }
if cfg.RetryWaitMin > 0 { if cfg.RetryWaitMin > 0 {
retryClient.RetryWaitMin = cfg.RetryWaitMin rc.RetryWaitMin = cfg.RetryWaitMin
} }
if cfg.RetryWaitMax > 0 { if cfg.RetryWaitMax > 0 {
retryClient.RetryWaitMax = cfg.RetryWaitMax rc.RetryWaitMax = cfg.RetryWaitMax
} }
client := &RegistryClient{ client := &RegistryClient{
config: cfg, config: cfg,
client: retryClient, client: rc,
} }
// Cleanup function // Cleanup function
@@ -74,7 +74,7 @@ func New(ctx context.Context, cfg *Config) (*RegistryClient, func() error, error
return nil return nil
} }
log.Infof(ctx, "Registry client connection established successfully") log.Infof(ctx, "Registry client is created successfully")
return client, closer, nil return client, closer, nil
} }
@@ -107,7 +107,7 @@ func (c *RegistryClient) Subscribe(ctx context.Context, subscription *model.Subs
return fmt.Errorf("subscribe request failed with status: %s", resp.Status) return fmt.Errorf("subscribe request failed with status: %s", resp.Status)
} }
log.Debugf(ctx, "Subscribe request successful") log.Debugf(ctx, "Subscribe request is initiated successfully")
return nil return nil
} }