From cfd20185bf548d85098a4977b968e754216275c8 Mon Sep 17 00:00:00 2001 From: Alex Shorsher Date: Tue, 2 Aug 2022 20:16:59 -0400 Subject: [PATCH] update namespace assets key to match global key Signed-off-by: Alex Shorsher --- docs/reference/config.md | 4 ++-- internal/coreconfig/coreconfig.go | 2 +- internal/coremsgs/en_config_descriptions.go | 4 ++-- internal/identity/identitymanager.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/reference/config.md b/docs/reference/config.md index 2916da184a..a6ecfbbf64 100644 --- a/docs/reference/config.md +++ b/docs/reference/config.md @@ -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 - namespace.predefined[].assets.manager.keynormalization)|`string`|`` +|keynormalization|Mechanism to normalize keys before using them. Valid options are `blockchain_plugin` - use blockchain plugin (default) or `none` - do not attempt normalization (deprecated - namespace.predefined[].asset.manager.keynormalization)|`string`|`` ## batch.cache @@ -622,7 +622,7 @@ nav_order: 2 |plugins|The list of plugins for this namespace|`string`|`` |remotename|The namespace name to be sent in plugin calls, if it differs from namespace name|`string`|`` -## namespaces.predefined[].assets.manager +## namespaces.predefined[].asset.manager |Key|Description|Type|Default Value| |---|-----------|----|-------------| diff --git a/internal/coreconfig/coreconfig.go b/internal/coreconfig/coreconfig.go index e600a81fd8..e3b3498fd8 100644 --- a/internal/coreconfig/coreconfig.go +++ b/internal/coreconfig/coreconfig.go @@ -42,7 +42,7 @@ const ( // NamespaceDefaultKey is the default signing key for blockchain transactions within this namespace NamespaceDefaultKey = "defaultkey" // NamespaceAssetKeyNormalization mechanism to normalize keys before using them. Valid options: "blockchain_plugin" - use blockchain plugin (default), "none" - do not attempt normalization - NamespaceAssetKeyNormalization = "assets.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 diff --git a/internal/coremsgs/en_config_descriptions.go b/internal/coremsgs/en_config_descriptions.go index 915edb74ba..b6fd66457b 100644 --- a/internal/coremsgs/en_config_descriptions.go +++ b/internal/coremsgs/en_config_descriptions.go @@ -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 - namespace.predefined[].assets.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 - namespace.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) @@ -257,7 +257,7 @@ var ( 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[].assets.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) + 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) diff --git a/internal/identity/identitymanager.go b/internal/identity/identitymanager.go index 38dd733189..bf6a5e62a2 100644 --- a/internal/identity/identitymanager.go +++ b/internal/identity/identitymanager.go @@ -135,7 +135,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 `assets.keyNormalization: "none"` in the config. + // verification/management of keys, it should set `namespace.predefined[].asset.manager.keynormalization: "none"` in the config. if keyNormalizationMode != KeyNormalizationBlockchainPlugin { return inputKey, nil }