[FAB-9325] make CA matcher section consistent

Change-Id: I44c3518421a5cc4e400c3d6df4f6b7b441b9863f Signed-off-by: Troy Ronda <[email protected]>
hyperledger · Apr 4, 2018 · 582c2fc · 582c2fc
1 parent 449a24d
commit 582c2fc
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/pkg/core/config/testdata/config_test.yaml b/pkg/core/config/testdata/config_test.yaml
@@ -423,7 +423,7 @@ entityMatchers:
       sslTargetOverrideUrlSubstitutionExp: $1.example.$2
       mappedHost: local.orderer.example.com
 
-  certificateAuthorities:
+  certificateAuthority:
     - pattern: (\w+).org1.example.(\w+)
       urlSubstitutionExp:
       mappedHost: local.ca.org1.example.com

diff --git a/pkg/core/config/testdata/config_test_embedded_pems.yaml b/pkg/core/config/testdata/config_test_embedded_pems.yaml
@@ -644,7 +644,7 @@ entityMatchers:
       sslTargetOverrideUrlSubstitutionExp: $1.example.$2
       mappedHost: local.orderer.example.com
 
-  certificateAuthorities:
+  certificateAuthority:
     - pattern: (\w+)-org1
       urlSubstitutionExp:
       mappedHost: local.ca-org1

diff --git a/pkg/core/config/testdata/config_test_template.yaml b/pkg/core/config/testdata/config_test_template.yaml
@@ -458,7 +458,7 @@ entityMatchers:
       sslTargetOverrideUrlSubstitutionExp: $1.example.$2
       mappedHost: local.orderer.example.com
 
-  certificateAuthorities:
+  certificateAuthority:
     - pattern: (\w+).org1.example.(\w+)
       urlSubstitutionExp:
       mappedHost: local.ca.org1.example.com

diff --git a/pkg/core/config/testdata/template/config.yaml b/pkg/core/config/testdata/template/config.yaml
@@ -314,7 +314,7 @@ entityMatchers:
       #sslTargetOverrideUrlSubstitutionExp: $1.org1.example.$2
       #mappedHost: orderer.example.com
 
-  #certificateAuthorities:
+  #certificateAuthority:
     #- pattern: (\w+).org1.example.(\w+)
       #urlSubstitutionExp:
       #mappedHost: ca.org1.example.com

diff --git a/pkg/fab/endpointconfig.go b/pkg/fab/endpointconfig.go
@@ -887,8 +887,8 @@ func (c *EndpointConfig) compileMatchers() error {
 			}
 		}
 	}
-	if networkConfig.EntityMatchers["certificateauthorities"] != nil {
-		certMatchersConfig := networkConfig.EntityMatchers["certificateauthorities"]
+	if networkConfig.EntityMatchers["certificateauthority"] != nil {
+		certMatchersConfig := networkConfig.EntityMatchers["certificateauthority"]
 		for i := 0; i < len(certMatchersConfig); i++ {
 			if certMatchersConfig[i].Pattern != "" {
 				c.caMatchers[i], err = regexp.Compile(certMatchersConfig[i].Pattern)

diff --git a/pkg/msp/identityconfig.go b/pkg/msp/identityconfig.go
@@ -273,7 +273,7 @@ func (c *IdentityConfig) tryMatchingCAConfig(caName string) (*msp.CAConfig, stri
 		v := caMatchers[k]
 		if v.MatchString(caName) {
 			// get the matching Config from the index number
-			certAuthorityMatchConfig := networkConfig.EntityMatchers["certificateauthorities"][k]
+			certAuthorityMatchConfig := networkConfig.EntityMatchers["certificateauthority"][k]
 			//Get the certAuthorityMatchConfig from mapped host
 			caConfig, ok := networkConfig.CertificateAuthorities[strings.ToLower(certAuthorityMatchConfig.MappedHost)]
 			if !ok {

diff --git a/test/fixtures/config/config_revoke_test.yaml b/test/fixtures/config/config_revoke_test.yaml
@@ -437,7 +437,7 @@ entityMatchers:
       sslTargetOverrideUrlSubstitutionExp: $1.example.$2
       mappedHost: local.orderer.example.com
 
-  certificateAuthorities:
+  certificateAuthority:
     - pattern: (\w+).org1.example.(\w+)
       urlSubstitutionExp:
       mappedHost: local.ca.org1.example.com

diff --git a/test/fixtures/config/config_test.yaml b/test/fixtures/config/config_test.yaml
@@ -440,7 +440,7 @@ entityMatchers:
       sslTargetOverrideUrlSubstitutionExp: $1.example.$2
       mappedHost: local.orderer.example.com
 
-  certificateAuthorities:
+  certificateAuthority:
     - pattern: (\w+).org1.example.(\w+)
       urlSubstitutionExp:
       mappedHost: local.ca.org1.example.com

diff --git a/test/fixtures/config/config_test_local.yaml b/test/fixtures/config/config_test_local.yaml
@@ -443,7 +443,7 @@ entityMatchers:
       sslTargetOverrideUrlSubstitutionExp: $1.example.$2
       mappedHost: local.orderer.example.com
 
-  certificateAuthorities:
+  certificateAuthority:
     - pattern: (\w+).org1.example.(\w+)
       urlSubstitutionExp: https://localhost:7054
       mappedHost: local.ca.org1.example.com