AddOrgToConsortium shouldn't allow adding org that already exists

This resulted in overwriting the existing org definition. FAB-17645 Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
hyperledger · Mar 23, 2020 · 67cb2df · 67cb2df
1 parent 0e178b4
commit 67cb2df
Show file tree

Hide file tree

Showing 2 changed files with 281 additions and 152 deletions.
diff --git a/pkg/config/consortiums.go b/pkg/config/consortiums.go
@@ -37,6 +37,10 @@ func AddOrgToConsortium(config *cb.Config, org Organization, consortium string)
 		return fmt.Errorf("consortium '%s' does not exist", consortium)
 	}
 
+	if _, ok := consortiumGroup.Groups[org.Name]; ok {
+		return fmt.Errorf("org '%s' already defined in consortium '%s'", org.Name, consortium)
+	}
+
 	consortiumGroup.Groups[org.Name], err = newOrgConfigGroup(org)
 	if err != nil {
 		return fmt.Errorf("failed to create consortium org: %v", err)