[FAB-5686] Update protolator for resource config

With the addition of the new protos to support the resource config comes
the need for additional logic in the configtxlator/protolator to support
inspecting the new config type.

This CR adds that logic so that these new types may be inspected.

Change-Id: I91f4de3e4b260a16ddcb3531e8bb761e5f3efbbc
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

Author: Jason Yellick

protos/common/configtx.go

@@ -52,6 +52,16 @@ func (cs *ConfigSignature) StaticallyOpaqueFieldProto(name string) (proto.Messag
 	return &SignatureHeader{}, nil
 }
 
+// DynamicConfigTypes allows for other packages outside of the common package
+// to register dynamic config types
+var DynamicConfigTypes = map[ConfigType]func(cg *ConfigGroup) proto.Message{
+	ConfigType_CHANNEL: func(cg *ConfigGroup) proto.Message {
+		return &DynamicChannelGroup{
+			ConfigGroup: cg,
+		}
+	},
+}
+
 func (c *Config) DynamicFields() []string {
 	return []string{"channel_group"}
 }
@@ -66,9 +76,32 @@ func (c *Config) DynamicFieldProto(name string, base proto.Message) (proto.Messa
 		return nil, fmt.Errorf("Config must embed a config group as its dynamic field")
 	}
 
-	return &DynamicChannelGroup{
-		ConfigGroup: cg,
-	}, nil
+	dm, ok := DynamicConfigTypes[ConfigType(c.Type)]
+	if !ok {
+		return nil, fmt.Errorf("Unknown config type: %d", c.Type)
+	}
+	return dm(cg), nil
+}
+
+// ConfigUpdateIsolatedDataTypes allows other proto packages to register types for the
+// the isolated_data field.  This is necessary to break import cycles.
+var ConfigUpdateIsolatedDataTypes = map[string]func(string) proto.Message{}
+
+func (c *ConfigUpdate) StaticallyOpaqueMapFields() []string {
+	return []string{"isolated_data"}
+}
+
+func (c *ConfigUpdate) StaticallyOpaqueMapFieldProto(name string, key string) (proto.Message, error) {
+	if name != c.StaticallyOpaqueMapFields()[0] {
+		return nil, fmt.Errorf("Not a statically opaque map field: %s", name)
+	}
+
+	mf, ok := ConfigUpdateIsolatedDataTypes[key]
+	if !ok {
+		return nil, fmt.Errorf("Unknown map key: %s", key)
+	}
+
+	return mf(key), nil
 }
 
 func (c *ConfigUpdate) DynamicFields() []string {
@@ -85,9 +118,11 @@ func (c *ConfigUpdate) DynamicFieldProto(name string, base proto.Message) (proto
 		return nil, fmt.Errorf("Expected base to be *ConfigGroup, got %T", base)
 	}
 
-	return &DynamicChannelGroup{
-		ConfigGroup: cg,
-	}, nil
+	dm, ok := DynamicConfigTypes[ConfigType(c.Type)]
+	if !ok {
+		return nil, fmt.Errorf("Unknown config type: %d", c.Type)
+	}
+	return dm(cg), nil
 }
 
 func (cv *ConfigValue) VariablyOpaqueFields() []string {

protos/peer/resources.go

@@ -0,0 +1,64 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package peer
+
+import (
+	"fmt"
+
+	"github.com/hyperledger/fabric/protos/common"
+
+	"github.com/golang/protobuf/proto"
+)
+
+const RSCCSeedDataKey = "rscc_seed_data"
+
+func init() {
+	common.DynamicConfigTypes[common.ConfigType_RESOURCE] = func(cg *common.ConfigGroup) proto.Message {
+		return &DynamicResourceConfigGroup{
+			ConfigGroup: cg,
+		}
+	}
+
+	common.ConfigUpdateIsolatedDataTypes[RSCCSeedDataKey] = func(key string) proto.Message {
+		return &common.Config{}
+	}
+}
+
+type DynamicResourceConfigGroup struct {
+	*common.ConfigGroup
+}
+
+func (drcg *DynamicResourceConfigGroup) DynamicMapFields() []string {
+	return []string{"values"}
+}
+
+func (drcg *DynamicResourceConfigGroup) DynamicMapFieldProto(name string, key string, base proto.Message) (proto.Message, error) {
+	switch name {
+	case "values":
+		cv, ok := base.(*common.ConfigValue)
+		if !ok {
+			return nil, fmt.Errorf("ConfigGroup values can only contain ConfigValue messages")
+		}
+		return &DynamicResourceConfigValue{
+			ConfigValue: cv,
+		}, nil
+	default:
+		return nil, fmt.Errorf("ConfigGroup does not have a dynamic field: %s", name)
+	}
+}
+
+type DynamicResourceConfigValue struct {
+	*common.ConfigValue
+}
+
+func (drcv *DynamicResourceConfigValue) VariablyOpaqueFieldProto(name string) (proto.Message, error) {
+	if name != drcv.VariablyOpaqueFields()[0] {
+		return nil, fmt.Errorf("Not a marshaled field: %s", name)
+	}
+
+	return &Resource{}, nil
+}