Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restore camelCase key names #988

Merged
merged 1 commit into from
Aug 19, 2022
Merged

Restore camelCase key names #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/reference/config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ nav_order: 2

|Key|Description|Type|Default Value|
|---|-----------|----|-------------|
|keynormalization|Mechanism to normalize keys before using them. Valid options are `blockchain_plugin` - use blockchain plugin (default) or `none` - do not attempt normalization (deprecated - use namespaces.predefined[].asset.manager.keynormalization)|`string`|`<nil>`
|keyNormalization|Mechanism to normalize keys before using them. Valid options are `blockchain_plugin` - use blockchain plugin (default) or `none` - do not attempt normalization (deprecated - use namespaces.predefined[].asset.manager.keyNormalization)|`string`|`<nil>`

## batch.cache

Expand Down Expand Up @@ -623,7 +623,7 @@ nav_order: 2

|Key|Description|Type|Default Value|
|---|-----------|----|-------------|
|defaultkey|A default signing key for blockchain transactions within this namespace|`string`|`<nil>`
|defaultKey|A default signing key for blockchain transactions within this namespace|`string`|`<nil>`
|description|A description for the namespace|`string`|`<nil>`
|name|The name of the namespace (must be unique)|`string`|`<nil>`
|plugins|The list of plugins for this namespace|`string`|`<nil>`
Expand All @@ -633,7 +633,7 @@ nav_order: 2

|Key|Description|Type|Default Value|
|---|-----------|----|-------------|
|keynormalization|Mechanism to normalize keys before using them. Valid options are `blockchain_plugin` - use blockchain plugin (default) or `none` - do not attempt normalization|`string`|`<nil>`
|keyNormalization|Mechanism to normalize keys before using them. Valid options are `blockchain_plugin` - use blockchain plugin (default) or `none` - do not attempt normalization|`string`|`<nil>`

## namespaces.predefined[].multiparty

Expand Down
6 changes: 3 additions & 3 deletions internal/coreconfig/coreconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ const (
// NamespacePlugins is the list of namespace plugins
NamespacePlugins = "plugins"
// NamespaceDefaultKey is the default signing key for blockchain transactions within this namespace
NamespaceDefaultKey = "defaultkey"
NamespaceDefaultKey = "defaultKey"
// NamespaceAssetKeyNormalization mechanism to normalize keys before using them. Valid options: "blockchain_plugin" - use blockchain plugin (default), "none" - do not attempt normalization
NamespaceAssetKeyNormalization = "asset.manager.keynormalization"
NamespaceAssetKeyNormalization = "asset.manager.keyNormalization"
// NamespaceMultiparty contains the multiparty configuration for a namespace
NamespaceMultiparty = "multiparty"
// NamespaceMultipartyEnabled specifies if multi-party mode is enabled for a namespace
Expand Down Expand Up @@ -293,7 +293,7 @@ var (
// TransactionCacheTTL time-to-live for cache of transactions
TransactionCacheTTL = ffc("transaction.cache.ttl")
// AssetManagerKeyNormalization mechanism to normalize keys before using them. Valid options: "blockchain_plugin" - use blockchain plugin (default), "none" - do not attempt normalization
AssetManagerKeyNormalization = ffc("asset.manager.keynormalization")
AssetManagerKeyNormalization = ffc("asset.manager.keyNormalization")
// UIEnabled set to false to disable the UI (default is true, so UI will be enabled if ui.path is valid)
UIEnabled = ffc("ui.enabled")
// UIPath the path on which to serve the UI
Expand Down
6 changes: 3 additions & 3 deletions internal/coremsgs/en_config_descriptions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ var (
ConfigAPIDefaultFilterLimit = ffc("config.api.defaultFilterLimit", "The maximum number of rows to return if no limit is specified on an API request", i18n.IntType)
ConfigAPIMaxFilterLimit = ffc("config.api.maxFilterLimit", "The largest value of `limit` that an HTTP client can specify in a request", i18n.IntType)
ConfigAPIRequestMaxTimeout = ffc("config.api.requestMaxTimeout", "The maximum amount of time that an HTTP client can specify in a `Request-Timeout` header to keep a specific request open", i18n.TimeDurationType)
ConfigAssetManagerKeyNormalization = ffc("config.asset.manager.keynormalization", "Mechanism to normalize keys before using them. Valid options are `blockchain_plugin` - use blockchain plugin (default) or `none` - do not attempt normalization (deprecated - use namespaces.predefined[].asset.manager.keynormalization)", i18n.StringType)
ConfigAssetManagerKeyNormalization = ffc("config.asset.manager.keyNormalization", "Mechanism to normalize keys before using them. Valid options are `blockchain_plugin` - use blockchain plugin (default) or `none` - do not attempt normalization (deprecated - use namespaces.predefined[].asset.manager.keyNormalization)", i18n.StringType)

ConfigBatchManagerMinimumPollDelay = ffc("config.batch.manager.minimumPollDelay", "The minimum time the batch manager waits between polls on the DB - to prevent thrashing", i18n.TimeDurationType)
ConfigBatchManagerPollTimeout = ffc("config.batch.manager.pollTimeout", "How long to wait without any notifications of new messages before doing a page query", i18n.TimeDurationType)
Expand Down Expand Up @@ -264,8 +264,8 @@ var (
ConfigNamespacesPredefinedDescription = ffc("config.namespaces.predefined[].description", "A description for the namespace", i18n.StringType)
ConfigNamespacesPredefinedPlugins = ffc("config.namespaces.predefined[].plugins", "The list of plugins for this namespace", i18n.StringType)
ConfigNamespacesPredefinedRemoteName = ffc("config.namespaces.predefined[].remotename", "The namespace name to be sent in plugin calls, if it differs from namespace name", i18n.StringType)
ConfigNamespacesPredefinedDefaultKey = ffc("config.namespaces.predefined[].defaultkey", "A default signing key for blockchain transactions within this namespace", i18n.StringType)
ConfigNamespacesPredefinedKeyNormalization = ffc("config.namespaces.predefined[].asset.manager.keynormalization", "Mechanism to normalize keys before using them. Valid options are `blockchain_plugin` - use blockchain plugin (default) or `none` - do not attempt normalization", i18n.StringType)
ConfigNamespacesPredefinedDefaultKey = ffc("config.namespaces.predefined[].defaultKey", "A default signing key for blockchain transactions within this namespace", i18n.StringType)
ConfigNamespacesPredefinedKeyNormalization = ffc("config.namespaces.predefined[].asset.manager.keyNormalization", "Mechanism to normalize keys before using them. Valid options are `blockchain_plugin` - use blockchain plugin (default) or `none` - do not attempt normalization", i18n.StringType)
ConfigNamespacesMultipartyEnabled = ffc("config.namespaces.predefined[].multiparty.enabled", "Enables multi-party mode for this namespace (defaults to true if an org name or key is configured, either here or at the root level)", i18n.BooleanType)
ConfigNamespacesMultipartyOrgName = ffc("config.namespaces.predefined[].multiparty.org.name", "A short name for the local root organization within this namespace", i18n.StringType)
ConfigNamespacesMultipartyOrgDesc = ffc("config.namespaces.predefined[].multiparty.org.description", "A description for the local root organization within this namespace", i18n.StringType)
Expand Down
2 changes: 1 addition & 1 deletion internal/identity/identitymanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func (im *identityManager) NormalizeSigningKey(ctx context.Context, inputKey str
}
// If the caller is not confident that the blockchain plugin/connector should be used to resolve,
// for example it might be a different blockchain (Eth vs Fabric etc.), or it has its own
// verification/management of keys, it should set `namespaces.predefined[].asset.manager.keynormalization: "none"` in the config.
// verification/management of keys, it should set `namespaces.predefined[].asset.manager.keyNormalization: "none"` in the config.
if keyNormalizationMode != KeyNormalizationBlockchainPlugin {
return inputKey, nil
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/gateway/tokens_only.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (suite *TokensOnlyTestSuite) TestTokensOnlyNamespaces() {
"name": testNamespace,
"asset": map[string]interface{}{
"manager": map[string]interface{}{
"keynormalization": "none",
"keyNormalization": "none",
},
},
"plugins": []string{"database0", suite.connector},
Expand Down