Skip to content

Commit acc7a88

Browse files
dzikowskidzikowski
committed
Add explicit fabricToolsVetsion
Signed-off-by: Jakub Dzikowski <jakub.t.dzikowski@gmail.com>
1 parent c9fc458 commit acc7a88

13 files changed

+41
-28
lines changed

‎e2e/__snapshots__/extendConfig.test.ts.snap‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `
594594
"fabricJavaenvVersion": "2.5",
595595
"fabricNodeenvVersion": "2.5",
596596
"fabricRecommendedNodeVersion": "16",
597+
"fabricToolsVersion": "2.5.9",
597598
"fabricVersion": "2.5.9",
598599
"monitoring": {
599600
"loglevel": "info",
@@ -1419,6 +1420,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] =
14191420
"fabricJavaenvVersion": "2.4",
14201421
"fabricNodeenvVersion": "2.4",
14211422
"fabricRecommendedNodeVersion": "16",
1423+
"fabricToolsVersion": "2.4.7",
14221424
"fabricVersion": "2.4.7",
14231425
"monitoring": {
14241426
"loglevel": "info",
@@ -2219,6 +2221,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j
22192221
"fabricJavaenvVersion": "2.3",
22202222
"fabricNodeenvVersion": "2.3",
22212223
"fabricRecommendedNodeVersion": "12",
2224+
"fabricToolsVersion": "2.3.3",
22222225
"fabricVersion": "2.3.3",
22232226
"monitoring": {
22242227
"loglevel": "info",
@@ -3588,6 +3591,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.
35883591
"fabricJavaenvVersion": "2.4",
35893592
"fabricNodeenvVersion": "2.4",
35903593
"fabricRecommendedNodeVersion": "16",
3594+
"fabricToolsVersion": "2.4.7",
35913595
"fabricVersion": "2.4.7",
35923596
"monitoring": {
35933597
"loglevel": "info",
@@ -5846,6 +5850,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
58465850
"fabricJavaenvVersion": "2.4",
58475851
"fabricNodeenvVersion": "2.4",
58485852
"fabricRecommendedNodeVersion": "16",
5853+
"fabricToolsVersion": "2.4.3",
58495854
"fabricVersion": "2.4.3",
58505855
"monitoring": {
58515856
"loglevel": "debug",
@@ -8435,6 +8440,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.
84358440
"fabricJavaenvVersion": "2.3",
84368441
"fabricNodeenvVersion": "2.3",
84378442
"fabricRecommendedNodeVersion": "12",
8443+
"fabricToolsVersion": "2.3.2",
84388444
"fabricVersion": "2.3.2",
84398445
"monitoring": {
84408446
"loglevel": "info",
@@ -9806,6 +9812,7 @@ exports[`extend config samples/fablo-config-hlf3-1orgs-1chaincode.json 1`] = `
98069812
"fabricJavaenvVersion": "2.5",
98079813
"fabricNodeenvVersion": "2.5",
98089814
"fabricRecommendedNodeVersion": "16",
9815+
"fabricToolsVersion": "2.5",
98099816
"fabricVersion": "3.0.0",
98109817
"monitoring": {
98119818
"loglevel": "debug",
@@ -10763,6 +10770,7 @@ exports[`extend config samples/fablo-config-hlf3-bft-1orgs-1chaincode.json 1`] =
1076310770
"fabricJavaenvVersion": "2.5",
1076410771
"fabricNodeenvVersion": "2.5",
1076510772
"fabricRecommendedNodeVersion": "16",
10773+
"fabricToolsVersion": "2.5",
1076610774
"fabricVersion": "3.0.0",
1076710775
"monitoring": {
1076810776
"loglevel": "debug",
@@ -11629,6 +11637,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1162911637
"fabricJavaenvVersion": "2.3",
1163011638
"fabricNodeenvVersion": "2.3",
1163111639
"fabricRecommendedNodeVersion": "12",
11640+
"fabricToolsVersion": "2.3.3",
1163211641
"fabricVersion": "2.3.3",
1163311642
"monitoring": {
1163411643
"loglevel": "info",

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,11 +1539,11 @@ COMPOSE_PROJECT_NAME=<name with timestamp>
15391539
LOGGING_LEVEL=info
15401540
15411541
FABRIC_VERSION=2.3.3
1542+
FABRIC_TOOLS_VERSION=2.3.3
15421543
FABRIC_CA_VERSION=1.5.5
15431544
FABRIC_CA_POSTGRES_VERSION=14
15441545
FABRIC_CCENV_VERSION=2.3.3
15451546
FABRIC_BASEOS_VERSION=2.3.3
1546-
15471547
FABRIC_JAVAENV_VERSION=2.3
15481548
FABRIC_NODEENV_VERSION=2.3
15491549
RECOMMENDED_NODE_VERSION=12
@@ -1890,7 +1890,7 @@ services:
18901890
18911891
cli.orderer.example.com:
18921892
container_name: cli.orderer.example.com
1893-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
1893+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
18941894
tty: true
18951895
environment:
18961896
- GOPATH=/opt/gopath
@@ -2002,7 +2002,7 @@ services:
20022002
20032003
cli.org1.example.com:
20042004
container_name: cli.org1.example.com
2005-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
2005+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
20062006
tty: true
20072007
environment:
20082008
- GOPATH=/opt/gopath

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,11 +1450,11 @@ COMPOSE_PROJECT_NAME=<name with timestamp>
14501450
LOGGING_LEVEL=info
14511451
14521452
FABRIC_VERSION=2.5.9
1453+
FABRIC_TOOLS_VERSION=2.5.9
14531454
FABRIC_CA_VERSION=1.5.5
14541455
FABRIC_CA_POSTGRES_VERSION=14
14551456
FABRIC_CCENV_VERSION=2.5.9
14561457
FABRIC_BASEOS_VERSION=2.5.9
1457-
14581458
FABRIC_JAVAENV_VERSION=2.5
14591459
FABRIC_NODEENV_VERSION=2.5
14601460
RECOMMENDED_NODE_VERSION=16
@@ -1853,7 +1853,7 @@ services:
18531853
18541854
cli.orderer.example.com:
18551855
container_name: cli.orderer.example.com
1856-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
1856+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
18571857
tty: true
18581858
environment:
18591859
- GOPATH=/opt/gopath
@@ -1924,7 +1924,7 @@ services:
19241924
19251925
cli.org1.example.com:
19261926
container_name: cli.org1.example.com
1927-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
1927+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
19281928
tty: true
19291929
environment:
19301930
- GOPATH=/opt/gopath

‎e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2111,11 +2111,11 @@ COMPOSE_PROJECT_NAME=<name with timestamp>
21112111
LOGGING_LEVEL=info
21122112
21132113
FABRIC_VERSION=2.4.7
2114+
FABRIC_TOOLS_VERSION=2.4.7
21142115
FABRIC_CA_VERSION=1.5.5
21152116
FABRIC_CA_POSTGRES_VERSION=14
21162117
FABRIC_CCENV_VERSION=2.4.7
21172118
FABRIC_BASEOS_VERSION=2.4.7
2118-
21192119
FABRIC_JAVAENV_VERSION=2.4
21202120
FABRIC_NODEENV_VERSION=2.4
21212121
RECOMMENDED_NODE_VERSION=16
@@ -2681,7 +2681,7 @@ services:
26812681
26822682
cli.orderer.example.com:
26832683
container_name: cli.orderer.example.com
2684-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
2684+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
26852685
tty: true
26862686
environment:
26872687
- GOPATH=/opt/gopath
@@ -2755,7 +2755,7 @@ services:
27552755
27562756
cli.org1.example.com:
27572757
container_name: cli.org1.example.com
2758-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
2758+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
27592759
tty: true
27602760
environment:
27612761
- GOPATH=/opt/gopath
@@ -2892,7 +2892,7 @@ services:
28922892
28932893
cli.org2.example.com:
28942894
container_name: cli.org2.example.com
2895-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
2895+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
28962896
tty: true
28972897
environment:
28982898
- GOPATH=/opt/gopath

‎e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3034,11 +3034,11 @@ COMPOSE_PROJECT_NAME=<name with timestamp>
30343034
LOGGING_LEVEL=debug
30353035
30363036
FABRIC_VERSION=2.4.3
3037+
FABRIC_TOOLS_VERSION=2.4.3
30373038
FABRIC_CA_VERSION=1.5.5
30383039
FABRIC_CA_POSTGRES_VERSION=14
30393040
FABRIC_CCENV_VERSION=2.4.3
30403041
FABRIC_BASEOS_VERSION=2.4.3
3041-
30423042
FABRIC_JAVAENV_VERSION=2.4
30433043
FABRIC_NODEENV_VERSION=2.4
30443044
RECOMMENDED_NODE_VERSION=16
@@ -3798,7 +3798,7 @@ services:
37983798
37993799
cli.orderer1.com:
38003800
container_name: cli.orderer1.com
3801-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
3801+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
38023802
tty: true
38033803
environment:
38043804
- GOPATH=/opt/gopath
@@ -3964,7 +3964,7 @@ services:
39643964
39653965
cli.orderer2.com:
39663966
container_name: cli.orderer2.com
3967-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
3967+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
39683968
tty: true
39693969
environment:
39703970
- GOPATH=/opt/gopath
@@ -4058,7 +4058,7 @@ services:
40584058
40594059
cli.org1.example.com:
40604060
container_name: cli.org1.example.com
4061-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
4061+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
40624062
tty: true
40634063
environment:
40644064
- GOPATH=/opt/gopath
@@ -4237,7 +4237,7 @@ services:
42374237
42384238
cli.org2.example.com:
42394239
container_name: cli.org2.example.com
4240-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
4240+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
42414241
tty: true
42424242
environment:
42434243
- GOPATH=/opt/gopath

‎e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3329,11 +3329,11 @@ COMPOSE_PROJECT_NAME=<name with timestamp>
33293329
LOGGING_LEVEL=info
33303330
33313331
FABRIC_VERSION=2.3.2
3332+
FABRIC_TOOLS_VERSION=2.3.2
33323333
FABRIC_CA_VERSION=1.5.5
33333334
FABRIC_CA_POSTGRES_VERSION=14
33343335
FABRIC_CCENV_VERSION=2.3.2
33353336
FABRIC_BASEOS_VERSION=2.3.2
3336-
33373337
FABRIC_JAVAENV_VERSION=2.3
33383338
FABRIC_NODEENV_VERSION=2.3
33393339
RECOMMENDED_NODE_VERSION=12
@@ -4044,7 +4044,7 @@ services:
40444044
40454045
cli.orderer.example.com:
40464046
container_name: cli.orderer.example.com
4047-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
4047+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
40484048
tty: true
40494049
environment:
40504050
- GOPATH=/opt/gopath
@@ -4177,7 +4177,7 @@ services:
41774177
41784178
cli.org1.example.com:
41794179
container_name: cli.org1.example.com
4180-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
4180+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
41814181
tty: true
41824182
environment:
41834183
- GOPATH=/opt/gopath
@@ -4406,7 +4406,7 @@ services:
44064406
44074407
cli.org2.example.com:
44084408
container_name: cli.org2.example.com
4409-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
4409+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
44104410
tty: true
44114411
environment:
44124412
- GOPATH=/opt/gopath
@@ -4635,7 +4635,7 @@ services:
46354635
46364636
cli.org3.example.com:
46374637
container_name: cli.org3.example.com
4638-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
4638+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
46394639
tty: true
46404640
environment:
46414641
- GOPATH=/opt/gopath

‎e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,11 +1522,11 @@ COMPOSE_PROJECT_NAME=<name with timestamp>
15221522
LOGGING_LEVEL=debug
15231523
15241524
FABRIC_VERSION=3.0.0
1525+
FABRIC_TOOLS_VERSION=2.5
15251526
FABRIC_CA_VERSION=1.5.5
15261527
FABRIC_CA_POSTGRES_VERSION=14
15271528
FABRIC_CCENV_VERSION=3.0.0
15281529
FABRIC_BASEOS_VERSION=3.0.0
1529-
15301530
FABRIC_JAVAENV_VERSION=2.5
15311531
FABRIC_NODEENV_VERSION=2.5
15321532
RECOMMENDED_NODE_VERSION=16
@@ -1919,7 +1919,7 @@ services:
19191919
19201920
cli.orderer.example.com:
19211921
container_name: cli.orderer.example.com
1922-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
1922+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
19231923
tty: true
19241924
environment:
19251925
- GOPATH=/opt/gopath
@@ -2145,7 +2145,7 @@ services:
21452145
21462146
cli.org1.example.com:
21472147
container_name: cli.org1.example.com
2148-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
2148+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
21492149
tty: true
21502150
environment:
21512151
- GOPATH=/opt/gopath

‎e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1548,11 +1548,11 @@ COMPOSE_PROJECT_NAME=<name with timestamp>
15481548
LOGGING_LEVEL=debug
15491549
15501550
FABRIC_VERSION=3.0.0
1551+
FABRIC_TOOLS_VERSION=2.5
15511552
FABRIC_CA_VERSION=1.5.5
15521553
FABRIC_CA_POSTGRES_VERSION=14
15531554
FABRIC_CCENV_VERSION=3.0.0
15541555
FABRIC_BASEOS_VERSION=3.0.0
1555-
15561556
FABRIC_JAVAENV_VERSION=2.5
15571557
FABRIC_NODEENV_VERSION=2.5
15581558
RECOMMENDED_NODE_VERSION=16
@@ -1944,7 +1944,7 @@ services:
19441944
19451945
cli.orderer.example.com:
19461946
container_name: cli.orderer.example.com
1947-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
1947+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
19481948
tty: true
19491949
environment:
19501950
- GOPATH=/opt/gopath
@@ -2170,7 +2170,7 @@ services:
21702170
21712171
cli.org1.example.com:
21722172
container_name: cli.org1.example.com
2173-
image: hyperledger/fabric-tools:\${FABRIC_VERSION}
2173+
image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
21742174
tty: true
21752175
environment:
21762176
- GOPATH=/opt/gopath

‎e2e/__snapshots__/fabloCommands.test.ts.snap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Validation warnings count: 0
1111
"monitoring": {
1212
"loglevel": "debug"
1313
},
14+
"fabricToolsVersion": "2.4.3",
1415
"fabricCaVersion": "1.5.5",
1516
"fabricCcenvVersion": "2.4.3",
1617
"fabricBaseosVersion": "2.4.3",
@@ -2476,6 +2477,7 @@ Validation warnings count: 0
24762477
"tls": false,
24772478
"engine": "docker",
24782479
"peerDevMode": false,
2480+
"fabricToolsVersion": "2.5.9",
24792481
"fabricCaVersion": "1.5.5",
24802482
"fabricCcenvVersion": "2.5.9",
24812483
"fabricBaseosVersion": "2.5.9",

‎src/extend-config/extendGlobal.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const getVersions = (fabricVersion: string): FabricVersions => {
2626

2727
return {
2828
fabricVersion,
29+
fabricToolsVersion: below3_0_0(fabricVersion),
2930
fabricCaVersion: version(fabricVersion).isGreaterOrEqual("1.4.10") ? "1.5.5" : fabricVersion,
3031
fabricCcenvVersion: fabricVersion,
3132
fabricBaseosVersion: version(fabricVersion).isGreaterOrEqual("2.0") ? fabricVersion : "0.4.9",

0 commit comments

Comments
 (0)