From 3cc85d39f5682b73e6bcfd74fdb88ad3aba62992 Mon Sep 17 00:00:00 2001 From: osamamagdy Date: Thu, 5 Dec 2024 11:32:01 +0200 Subject: [PATCH] feat: remove hardcoded org name --- samples/application/ccapi/common/fpc.go | 1 + samples/application/ccapi/fpc-docker-compose.yaml | 6 ++++-- samples/application/ccapi/fpcUtils/config.go | 1 + samples/application/ccapi/fpcUtils/fpcadmin.go | 2 +- samples/application/simple-cli-go/cmd/root.go | 1 + samples/application/simple-cli-go/pkg/config.go | 1 + samples/application/simple-cli-go/pkg/fpcadmin.go | 2 +- 7 files changed, 10 insertions(+), 4 deletions(-) diff --git a/samples/application/ccapi/common/fpc.go b/samples/application/ccapi/common/fpc.go index d752c8b90..b9cf49868 100644 --- 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 index 4e427df8b..1c2081b90 100644 --- 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/Admin@org1.example.com/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/Admin@org2.example.com/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 index 397a04855..78a3eca06 100644 --- 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 index 484cd51dc..4b70142da 100644 --- 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 index e989cc77f..f28655bab 100644 --- 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 index e3e48c7b2..ec5ab3aae 100644 --- 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 index 05d2b3caa..46180a118 100644 --- 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)