[FAB-5522] Log policy manager path for GetPolicy

The configtx processing looks up policies by relative name, which triggers
finding the right policy manager, then querying the relative name.  The problem
with this however, is that the logs only show the relative name, which can make
debugging challenging.

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

Author: Jason Yellick

common/configtx/update.go

@@ -81,6 +81,7 @@ func (cm *configManager) verifyDeltaSet(deltaSet map[string]comparable, signedDa
 	}
 
 	for key, value := range deltaSet {
+		logger.Debugf("Processing change to key: %s", key)
 		if err := validateModPolicy(value.modPolicy()); err != nil {
 			return fmt.Errorf("invalid mod_policy for element %s: %s", key, err)
 		}

common/policies/policy.go

@@ -1,17 +1,7 @@
 /*
-Copyright IBM Corp. 2016 All Rights Reserved.
+Copyright IBM Corp. All Rights Reserved.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-                 http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+SPDX-License-Identifier: Apache-2.0
 */
 
 package policies
@@ -126,8 +116,9 @@ type policyConfig struct {
 // In general, it should only be referenced as an Impl for the configtx.ConfigManager
 type ManagerImpl struct {
 	parent        *ManagerImpl
-	basePath      string
-	fqPrefix      string
+	basePath      string // The group level path
+	fqPrefix      string // If this manager is treated as the root, the fully qualified prefix for policy names
+	fqPath        string // The true absolute path, taking parents into consideration
 	providers     map[int32]Provider
 	config        *policyConfig
 	pendingConfig map[interface{}]*policyConfig
@@ -148,6 +139,7 @@ func NewManagerImpl(basePath string, providers map[int32]Provider) *ManagerImpl
 	return &ManagerImpl{
 		basePath:  basePath,
 		fqPrefix:  PathSeparator + basePath + PathSeparator,
+		fqPath:    PathSeparator + basePath, // Overridden after construction in the sub-manager case
 		providers: providers,
 		config: &policyConfig{
 			policies: make(map[string]Policy),
@@ -223,7 +215,7 @@ func (pm *ManagerImpl) GetPolicy(id string) (Policy, bool) {
 		return rejectPolicy(relpath), false
 	}
 	if logger.IsEnabledFor(logging.DEBUG) {
-		logger.Debugf("Returning policy %s for evaluation", relpath)
+		logger.Debugf("Returning policy %s from manager %s for evaluation", relpath, pm.fqPath)
 	}
 	return policy, true
 }
@@ -247,6 +239,13 @@ func (pm *ManagerImpl) BeginPolicyProposals(tx interface{}, groups []string) ([]
 	for i, group := range groups {
 		newManager := NewManagerImpl(group, pm.providers)
 		newManager.parent = pm
+		mi := newManager
+		var fqPath []string
+		for mi != nil {
+			fqPath = append([]string{PathSeparator, mi.basePath}, fqPath...)
+			mi = mi.parent
+		}
+		newManager.fqPath = strings.Join(fqPath, "")
 		pendingConfig.managers[group] = newManager
 		managers[i] = newManager
 	}

common/policies/policy_test.go

@@ -1,22 +1,13 @@
 /*
-Copyright IBM Corp. 2017 All Rights Reserved.
+Copyright IBM Corp. All Rights Reserved.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-                 http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+SPDX-License-Identifier: Apache-2.0
 */
 
 package policies
 
 import (
+	"fmt"
 	"testing"
 
 	cb "github.com/hyperledger/fabric/protos/common"
@@ -192,3 +183,19 @@ func TestNestedManager(t *testing.T) {
 		}
 	}
 }
+
+func TestFQPathName(t *testing.T) {
+	fqPath := []string{"base", "nest1", "nest2"}
+	m := NewManagerImpl(fqPath[0], defaultProviders())
+	nesting1, err := m.BeginPolicyProposals(t, []string{fqPath[1]})
+	assert.NoError(t, err)
+	assert.Len(t, nesting1, 1)
+
+	nesting2, err := nesting1[0].BeginPolicyProposals(t, []string{fqPath[2]})
+	assert.NoError(t, err)
+	assert.Len(t, nesting2, 1)
+
+	assert.Equal(t, fmt.Sprintf("/%s/%s/%s", fqPath[0], fqPath[1], fqPath[2]), nesting2[0].(*ManagerImpl).fqPath)
+	assert.Equal(t, fmt.Sprintf("/%s/%s", fqPath[0], fqPath[1]), nesting1[0].(*ManagerImpl).fqPath)
+	assert.Equal(t, fmt.Sprintf("/%s", fqPath[0]), m.fqPath)
+}