[FAB-8983] make org names consistent in small case

Change-Id: I1e4b32f5461f521392c8ace89c8fda2c5fe3d5a8 Signed-off-by: Pavan Kappara <[email protected]>
hyperledger · Mar 20, 2018 · aaeebdd · aaeebdd
1 parent d7c5c6a
commit aaeebdd
Show file tree

Hide file tree

Showing 43 changed files with 69 additions and 67 deletions.
diff --git a/Makefile b/Makefile
@@ -36,6 +36,7 @@ FABRIC_PRERELEASE_VERSION       := 1.1.0
 FABRIC_PREV_VERSION             := 1.0.6
 FABRIC_DEVSTABLE_VERSION_MINOR  := 1.1
 FABRIC_DEVSTABLE_VERSION_MAJOR  := 1
+FABRIC_PREV_VERSION_MINOR       := 1.0
 
 # Build flags (overridable)
 GO_LDFLAGS                 ?=
@@ -93,7 +94,7 @@ FABRIC_CODELEVEL_TAG            ?= $(FABRIC_STABLE_CODELEVEL_TAG)
 
 # Code level version targets
 FABRIC_STABLE_CODELEVEL_VER     := v$(FABRIC_STABLE_VERSION_MINOR)
-FABRIC_PREV_CODELEVEL_VER       := v$(FABRIC_PREV_VERSION)
+FABRIC_PREV_CODELEVEL_VER       := v$(FABRIC_PREV_VERSION_MINOR)
 FABRIC_PRERELEASE_CODELEVEL_VER := v$(FABRIC_PRERELEASE_VERSION)
 FABRIC_DEVSTABLE_CODELEVEL_VER  := v$(FABRIC_DEVSTABLE_VERSION_MINOR)
 FABRIC_CODELEVEL_VER            ?= $(FABRIC_STABLE_CODELEVEL_VER)

diff --git a/pkg/client/msp/testdata/config_test.yaml b/pkg/client/msp/testdata/config_test.yaml
@@ -27,7 +27,7 @@ client:
 
   # Which organization does this application instance belong to? The value must be the name of an org
   # defined under "organizations"
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -167,7 +167,7 @@ channels:
 # list of participating organizations in this network
 #
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # This org's MSP store (absolute path or relative to client.cryptoconfig)
@@ -201,7 +201,7 @@ organizations:
   # peers with a public URL to send transaction proposals. The file will not contain private
   # information reserved for members of the organization, such as admin key and certificate,
   # fabric-ca registrar enroll ID and secret, etc.
-  Org2:
+  org2:
     mspid: Org2MSP
 
     # This org's MSP store (absolute path or relative to client.cryptoconfig)

diff --git a/pkg/client/resmgmt/testdata/ccproposal_test.yaml b/pkg/client/resmgmt/testdata/ccproposal_test.yaml
@@ -17,7 +17,7 @@ version: 1.0.0
 client:
 
   # Default organisation
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -81,7 +81,7 @@ channels:
         eventSource: false
 
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # Needed to load users crypto keys and certs for this org (absolute path or relative to global crypto path, DEV mode)

diff --git a/pkg/client/resmgmt/testdata/event_source_missing_test.yaml b/pkg/client/resmgmt/testdata/event_source_missing_test.yaml
@@ -17,7 +17,7 @@ version: 1.0.0
 client:
 
   # Default organisation
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -73,7 +73,7 @@ channels:
         eventSource: false
 
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # Needed to load users crypto keys and certs for this org (absolute path or relative to global crypto path, DEV mode)

diff --git a/pkg/client/resmgmt/testdata/invalidchorderer_test.yaml b/pkg/client/resmgmt/testdata/invalidchorderer_test.yaml
@@ -11,7 +11,7 @@ version: 1.0.0
 
 client:
 
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -44,7 +44,7 @@ channels:
       - invalid.example.com
 
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # Needed to load users crypto keys and certs for this org (absolute path or relative to global crypto path, DEV mode)

diff --git a/pkg/client/resmgmt/testdata/invalidorderer_test.yaml b/pkg/client/resmgmt/testdata/invalidorderer_test.yaml
@@ -11,7 +11,7 @@ version: 1.0.0
 
 client:
 
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -43,7 +43,7 @@ channels:
       - orderer.example.com
 
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # Needed to load users crypto keys and certs for this org (absolute path or relative to global crypto path, DEV mode)

diff --git a/pkg/client/resmgmt/testdata/noorderer_test.yaml b/pkg/client/resmgmt/testdata/noorderer_test.yaml
@@ -11,7 +11,7 @@ version: 1.0.0
 
 client:
 
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -38,7 +38,7 @@ client:
 
 
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # Needed to load users crypto keys and certs for this org (absolute path or relative to global crypto path, DEV mode)

diff --git a/pkg/core/config/config.go b/pkg/core/config/config.go
@@ -284,6 +284,7 @@ func (c *Config) Client() (*core.ClientConfig, error) {
 	}
 	client := config.Client
 
+	client.Organization = strings.ToLower(client.Organization)
 	client.TLSCerts.Path = SubstPathVars(client.TLSCerts.Path)
 	client.TLSCerts.Client.Key.Path = SubstPathVars(client.TLSCerts.Client.Key.Path)
 	client.TLSCerts.Client.Cert.Path = SubstPathVars(client.TLSCerts.Client.Cert.Path)

diff --git a/pkg/core/config/config_test.go b/pkg/core/config/config_test.go
@@ -31,7 +31,7 @@ var configImpl *Config
 
 const (
 	org0                            = "org0"
-	org1                            = "Org1"
+	org1                            = "org1"
 	configTestFilePath              = "testdata/config_test.yaml"
 	configEmptyTestFilePath         = "testdata/empty.yaml"
 	configPemTestFilePath           = "testdata/config_test_pem.yaml"

diff --git a/pkg/core/config/testdata/config_test.yaml b/pkg/core/config/testdata/config_test.yaml
@@ -38,7 +38,7 @@ client:
 
   # Which organization does this application instance belong to? The value must be the name of an org
   # defined under "organizations"
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -185,7 +185,7 @@ channels:
 # list of participating organizations in this network
 #
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # This org's MSP store (absolute path or relative to client.cryptoconfig)
@@ -219,7 +219,7 @@ organizations:
   # peers with a public URL to send transaction proposals. The file will not contain private
   # information reserved for members of the organization, such as admin key and certificate,
   # fabric-ca registrar enroll ID and secret, etc.
-  Org2:
+  org2:
     mspid: Org2MSP
 
     # This org's MSP store (absolute path or relative to client.cryptoconfig)

diff --git a/pkg/core/config/testdata/config_test_embedded_pems.yaml b/pkg/core/config/testdata/config_test_embedded_pems.yaml
@@ -27,7 +27,7 @@ client:
 
   # Which organization does this application instance belong to? The value must be the name of an org
   # defined under "organizations"
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -173,7 +173,7 @@ channels:
 # list of participating organizations in this network
 #
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # Needed to load users crypto keys and certs for this org (absolute path or relative to global crypto path, DEV mode)
@@ -291,7 +291,7 @@ organizations:
   # peers with a public URL to send transaction proposals. The file will not contain private
   # information reserved for members of the organization, such as admin key and certificate,
   # fabric-ca registrar enroll ID and secret, etc.
-  Org2:
+  org2:
     mspid: Org2MSP
 
     users:

diff --git a/pkg/core/config/testdata/config_test_pem.yaml b/pkg/core/config/testdata/config_test_pem.yaml
@@ -27,7 +27,7 @@ client:
 
   # Which organization does this application instance belong to? The value must be the name of an org
   # defined under "organizations"
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -165,7 +165,7 @@ channels:
 # list of participating organizations in this network
 #
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # Needed to load users crypto keys and certs for this org (absolute path or relative to global crypto path, DEV mode)
@@ -199,7 +199,7 @@ organizations:
   # peers with a public URL to send transaction proposals. The file will not contain private
   # information reserved for members of the organization, such as admin key and certificate,
   # fabric-ca registrar enroll ID and secret, etc.
-  Org2:
+  org2:
     mspid: Org2MSP
 
     # Needed to load users crypto keys and certs for this org (absolute path or relative to global crypto path, DEV mode)

diff --git a/pkg/fabsdk/fabsdk_test.go b/pkg/fabsdk/fabsdk_test.go
@@ -20,7 +20,7 @@ import (
 const (
 	sdkConfigFile      = "../../test/fixtures/config/config_test.yaml"
 	sdkValidClientUser = "User1"
-	sdkValidClientOrg1 = "Org1"
+	sdkValidClientOrg1 = "org1"
 )
 
 func TestNewGoodOpt(t *testing.T) {

diff --git a/pkg/fabsdk/testdata/test.yaml b/pkg/fabsdk/testdata/test.yaml
@@ -11,7 +11,7 @@ description: "The network to be in if you want to stay in the global trade busin
 version: 1.0.0
 
 client:
-  organization: Org2
+  organization: org2
 
   logging:
     level: info
@@ -76,7 +76,7 @@ channels:
 
 organizations:
 
-  Org2:
+  org2:
     mspid: Org2MSP
 
     # Needed to load users crypto keys and certs for this org (absolute path or relative to global crypto path, DEV mode)

diff --git a/pkg/msp/testdata/config_embedded_registrar.yaml b/pkg/msp/testdata/config_embedded_registrar.yaml
@@ -27,7 +27,7 @@ client:
 
   # Which organization does this application instance belong to? The value must be the name of an org
   # defined under "organizations"
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -161,7 +161,7 @@ channels:
 # list of participating organizations in this network
 #
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     users:

diff --git a/pkg/msp/testdata/config_no_ca.yaml b/pkg/msp/testdata/config_no_ca.yaml
@@ -27,7 +27,7 @@ client:
 
   # Which organization does this application instance belong to? The value must be the name of an org
   # defined under "organizations"
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -160,7 +160,7 @@ channels:
 # list of participating organizations in this network
 #
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # This org's MSP store (absolute path or relative to client.cryptoconfig)

diff --git a/pkg/msp/testdata/config_no_registrar.yaml b/pkg/msp/testdata/config_no_registrar.yaml
@@ -27,7 +27,7 @@ client:
 
   # Which organization does this application instance belong to? The value must be the name of an org
   # defined under "organizations"
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -161,7 +161,7 @@ channels:
 # list of participating organizations in this network
 #
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # This org's MSP store (absolute path or relative to client.cryptoconfig)

diff --git a/pkg/msp/testdata/config_test.yaml b/pkg/msp/testdata/config_test.yaml
@@ -27,7 +27,7 @@ client:
 
   # Which organization does this application instance belong to? The value must be the name of an org
   # defined under "organizations"
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -167,7 +167,7 @@ channels:
 # list of participating organizations in this network
 #
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # This org's MSP store (absolute path or relative to client.cryptoconfig)
@@ -201,7 +201,7 @@ organizations:
   # peers with a public URL to send transaction proposals. The file will not contain private
   # information reserved for members of the organization, such as admin key and certificate,
   # fabric-ca registrar enroll ID and secret, etc.
-  Org2:
+  org2:
     mspid: Org2MSP
 
     # This org's MSP store (absolute path or relative to client.cryptoconfig)

diff --git a/pkg/msp/testdata/config_wrong_url.yaml b/pkg/msp/testdata/config_wrong_url.yaml
@@ -27,7 +27,7 @@ client:
 
   # Which organization does this application instance belong to? The value must be the name of an org
   # defined under "organizations"
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -167,7 +167,7 @@ channels:
 # list of participating organizations in this network
 #
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # This org's MSP store (absolute path or relative to client.cryptoconfig)
@@ -201,7 +201,7 @@ organizations:
   # peers with a public URL to send transaction proposals. The file will not contain private
   # information reserved for members of the organization, such as admin key and certificate,
   # fabric-ca registrar enroll ID and secret, etc.
-  Org2:
+  org2:
     mspid: Org2MSP
 
     # This org's MSP store (absolute path or relative to client.cryptoconfig)

diff --git a/test/fixtures/config/config_pkcs11_test.yaml b/test/fixtures/config/config_pkcs11_test.yaml
@@ -26,7 +26,7 @@ version: 1.0.0
 client:
   # Which organization does this application instance belong to? The value must be the name of an org
   # defined under "organizations"
-  organization: Org1
+  organization: org1
 
   logging:
     level: info
@@ -190,7 +190,7 @@ channels:
 # list of participating organizations in this network
 #
 organizations:
-  Org1:
+  org1:
     mspid: Org1MSP
 
     # Needed to load users crypto certs for this org
@@ -258,7 +258,7 @@ organizations:
   # peers with a public URL to send transaction proposals. The file will not contain private
   # information reserved for members of the organization, such as admin key and certificate,
   # fabric-ca registrar enroll ID and secret, etc.
-  Org2:
+  org2:
     mspid: Org2MSP
 
     users: