feat: remove hardcoded org name

hyperledger · Dec 5, 2024 · 3cc85d3 · 3cc85d3
1 parent e58549b
commit 3cc85d3
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git a/samples/application/ccapi/common/fpc.go b/samples/application/ccapi/common/fpc.go
@@ -42,6 +42,7 @@ func InitFpcConfig() {
 	defaultFpcConfig = &pkgFpc.Config{
 		CorePeerAddress:         getStrEnv("CORE_PEER_ADDRESS"),
 		CorePeerId:              getStrEnv("CORE_PEER_ID"),
+		CorePeerOrgName:         getStrEnv("CORE_PEER_ORG_NAME"),
 		CorePeerLocalMSPID:      getStrEnv("CORE_PEER_LOCALMSPID"),
 		CorePeerMSPConfigPath:   getStrEnv("CORE_PEER_MSPCONFIGPATH"),
 		CorePeerTLSCertFile:     getStrEnv("CORE_PEER_TLS_CERT_FILE"),

diff --git a/samples/application/ccapi/fpc-docker-compose.yaml b/samples/application/ccapi/fpc-docker-compose.yaml
@@ -27,6 +27,7 @@ services:
       - SGX_MODE=SIM
       - CORE_PEER_ADDRESS=peer0.org1.example.com:7051
       - CORE_PEER_ID=peer0.org1.example.com
+      - CORE_PEER_ORG_NAME=org1
       - CORE_PEER_LOCALMSPID=Org1MSP
       - CORE_PEER_MSPCONFIGPATH=/fabric/organizations/peerOrganizations/org1.example.com/users/[email protected]/msp
       - CORE_PEER_TLS_CERT_FILE=/fabric/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt
@@ -59,13 +60,14 @@ services:
       - DOMAIN=example.com
       - CHANNEL=mychannel
       - CCNAME=cc-tools-demo
-      - FABRIC_GATEWAY_ENDPOINT=peer0.org2.example.com:7051
+      - FABRIC_GATEWAY_ENDPOINT=peer0.org2.example.com:9051
       - FABRIC_GATEWAY_NAME=peer0.org2.example.com
       - GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn
       - FPC_MODE=true
       - SGX_MODE=SIM
-      - CORE_PEER_ADDRESS=peer0.org2.example.com:7051
+      - CORE_PEER_ADDRESS=peer0.org2.example.com:9051
       - CORE_PEER_ID=peer0.org2.example.com
+      - CORE_PEER_ORG_NAME=org2
       - CORE_PEER_LOCALMSPID=Org2MSP
       - CORE_PEER_MSPCONFIGPATH=/fabric/organizations/peerOrganizations/org2.example.com/users/[email protected]/msp
       - CORE_PEER_TLS_CERT_FILE=/fabric/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt

diff --git a/samples/application/ccapi/fpcUtils/config.go b/samples/application/ccapi/fpcUtils/config.go
@@ -9,6 +9,7 @@ package fpcUtils
 type Config struct {
 	CorePeerAddress         string
 	CorePeerId              string
+	CorePeerOrgName         string
 	CorePeerLocalMSPID      string
 	CorePeerMSPConfigPath   string
 	CorePeerTLSCertFile     string

diff --git a/samples/application/ccapi/fpcUtils/fpcadmin.go b/samples/application/ccapi/fpcUtils/fpcadmin.go
@@ -42,7 +42,7 @@ func NewAdmin(config *Config) *Admin {
 	//defer sdk.Close()
 
 	orgAdmin := "Admin"
-	orgName := "org1"
+	orgName := config.CorePeerOrgName
 	adminContext := sdk.Context(fabsdk.WithUser(orgAdmin), fabsdk.WithOrg(orgName))
 
 	client, err := fpcmgmt.New(adminContext)

diff --git a/samples/application/simple-cli-go/cmd/root.go b/samples/application/simple-cli-go/cmd/root.go
@@ -56,6 +56,7 @@ func initConfig() {
 	config = &pkg.Config{
 		CorePeerAddress:         getStrEnv("CORE_PEER_ADDRESS"),
 		CorePeerId:              getStrEnv("CORE_PEER_ID"),
+		CorePeerOrgName:         getStrEnv("CORE_PEER_ORG_NAME"),
 		CorePeerLocalMSPID:      getStrEnv("CORE_PEER_LOCALMSPID"),
 		CorePeerMSPConfigPath:   getStrEnv("CORE_PEER_MSPCONFIGPATH"),
 		CorePeerTLSCertFile:     getStrEnv("CORE_PEER_TLS_CERT_FILE"),

diff --git a/samples/application/simple-cli-go/pkg/config.go b/samples/application/simple-cli-go/pkg/config.go
@@ -9,6 +9,7 @@ package pkg
 type Config struct {
 	CorePeerAddress         string
 	CorePeerId              string
+	CorePeerOrgName         string
 	CorePeerLocalMSPID      string
 	CorePeerMSPConfigPath   string
 	CorePeerTLSCertFile     string

diff --git a/samples/application/simple-cli-go/pkg/fpcadmin.go b/samples/application/simple-cli-go/pkg/fpcadmin.go
@@ -42,7 +42,7 @@ func NewAdmin(config *Config) *Admin {
 	//defer sdk.Close()
 
 	orgAdmin := "Admin"
-	orgName := "org1"
+	orgName := config.CorePeerOrgName
 	adminContext := sdk.Context(fabsdk.WithUser(orgAdmin), fabsdk.WithOrg(orgName))
 
 	client, err := fpcmgmt.New(adminContext)