Skip to content

Commit 6d8c9e6

Browse files
HejwoHejwo
authored
Merge pull request #405 from Hejwo/release-1.2.0
release 1.2.0
2 parents f0b6d09 + 6944338 commit 6d8c9e6

32 files changed

+35
-133
lines changed

‎docs/sample.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
33
"global": {
44
"fabricVersion": "2.3.2",
55
"tls": false,

‎docs/schema.json

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"properties": {
1414
"$schema": {
15-
"const": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json"
15+
"const": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json"
1616
},
1717
"global": {
1818
"$id": "#/properties/global",
@@ -28,47 +28,6 @@
2828
"$id": "#/properties/global/properties/fabricVersion",
2929
"title": "Hyperledger Fabric version",
3030
"type": "string",
31-
"enum": [
32-
"1.3.0",
33-
"1.4.0",
34-
"1.4.1",
35-
"1.4.2",
36-
"1.4.3",
37-
"1.4.4",
38-
"1.4.5",
39-
"1.4.6",
40-
"1.4.7",
41-
"1.4.8",
42-
"1.4.9",
43-
"1.4.10",
44-
"1.4.11",
45-
"1.4.12",
46-
"2.0.1",
47-
"2.1.0",
48-
"2.1.1",
49-
"2.2.0",
50-
"2.2.1",
51-
"2.2.2",
52-
"2.2.3",
53-
"2.2.4",
54-
"2.2.5",
55-
"2.2.6",
56-
"2.2.7",
57-
"2.2.8",
58-
"2.2.9",
59-
"2.3.0",
60-
"2.3.1",
61-
"2.3.2",
62-
"2.3.3",
63-
"2.4.0",
64-
"2.4.1",
65-
"2.4.2",
66-
"2.4.3",
67-
"2.4.4",
68-
"2.4.5",
69-
"2.4.6",
70-
"2.4.7"
71-
],
7231
"default": "2.4.2"
7332
},
7433
"tls": {

‎e2e/__snapshots__/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2081,7 +2081,7 @@ fi
20812081
`;
20822082
20832083
exports[`samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json 1`] = `
2084-
"FABLO_VERSION=1.2.0-unstable
2084+
"FABLO_VERSION=1.2.0
20852085
FABLO_BUILD=<date with git hash>
20862086
FABLO_REST_VERSION=0.1.0
20872087
HYPERLEDGER_EXPLORER_VERSION=1.1.8

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1492,7 +1492,7 @@ fi
14921492
`;
14931493
14941494
exports[`samples/fablo-config-hlf1.4-1org-1chaincode-raft.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-1org-1chaincode-raft.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-1org-1chaincode-raft.json 1`] = `
1495-
"FABLO_VERSION=1.2.0-unstable
1495+
"FABLO_VERSION=1.2.0
14961496
FABLO_BUILD=<date with git hash>
14971497
FABLO_REST_VERSION=0.1.0
14981498
HYPERLEDGER_EXPLORER_VERSION=1.1.8

‎e2e/__snapshots__/fablo-config-hlf1.4-2orgs-1chaincode.json.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2107,7 +2107,7 @@ fi
21072107
`;
21082108
21092109
exports[`samples/fablo-config-hlf1.4-2orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-2orgs-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-2orgs-1chaincode.json 1`] = `
2110-
"FABLO_VERSION=1.2.0-unstable
2110+
"FABLO_VERSION=1.2.0
21112111
FABLO_BUILD=<date with git hash>
21122112
FABLO_REST_VERSION=0.1.0
21132113
HYPERLEDGER_EXPLORER_VERSION=1.1.8

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2088,7 +2088,7 @@ fi
20882088
`;
20892089
20902090
exports[`samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml 1`] = `
2091-
"FABLO_VERSION=1.2.0-unstable
2091+
"FABLO_VERSION=1.2.0
20922092
FABLO_BUILD=<date with git hash>
20932093
FABLO_REST_VERSION=0.1.0
20942094
HYPERLEDGER_EXPLORER_VERSION=1.1.8

‎e2e/__snapshots__/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2278,7 +2278,7 @@ fi
22782278
`;
22792279
22802280
exports[`samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json 1`] = `
2281-
"FABLO_VERSION=1.2.0-unstable
2281+
"FABLO_VERSION=1.2.0
22822282
FABLO_BUILD=<date with git hash>
22832283
FABLO_REST_VERSION=0.1.0
22842284
HYPERLEDGER_EXPLORER_VERSION=1.1.8

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-k8s.json should create proper
8686
REPOSITORY=\\"https://kfsoftware.github.io/hlf-helm-charts\\"
8787
STORAGE_CLASS=$(kubectl describe sc | grep Name | tr -s ' ' | cut -d ':' -f 2 | cut -d ' ' -f 2)
8888
89-
FABLO_VERSION=1.2.0-unstable
89+
FABLO_VERSION=1.2.0
9090
FABLO_BUILD=<date with git hash>
9191
FABLO_CONFIG=<absolute path>
9292
ORDERER_IMAGE=hyperledger/fabric-orderer

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1519,7 +1519,7 @@ fi
15191519
`;
15201520
15211521
exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json 1`] = `
1522-
"FABLO_VERSION=1.2.0-unstable
1522+
"FABLO_VERSION=1.2.0
15231523
FABLO_BUILD=<date with git hash>
15241524
FABLO_REST_VERSION=0.1.0
15251525
HYPERLEDGER_EXPLORER_VERSION=1.1.8

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1429,7 +1429,7 @@ fi
14291429
`;
14301430
14311431
exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `
1432-
"FABLO_VERSION=1.2.0-unstable
1432+
"FABLO_VERSION=1.2.0
14331433
FABLO_BUILD=<date with git hash>
14341434
FABLO_REST_VERSION=0.1.0
14351435
HYPERLEDGER_EXPLORER_VERSION=1.1.8

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3016,7 +3016,7 @@ fi
30163016
`;
30173017
30183018
exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = `
3019-
"FABLO_VERSION=1.2.0-unstable
3019+
"FABLO_VERSION=1.2.0
30203020
FABLO_BUILD=<date with git hash>
30213021
FABLO_REST_VERSION=0.1.0
30223022
HYPERLEDGER_EXPLORER_VERSION=1.1.8

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3311,7 +3311,7 @@ fi
33113311
`;
33123312
33133313
exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = `
3314-
"FABLO_VERSION=1.2.0-unstable
3314+
"FABLO_VERSION=1.2.0
33153315
FABLO_BUILD=<date with git hash>
33163316
FABLO_REST_VERSION=0.1.0
33173317
HYPERLEDGER_EXPLORER_VERSION=1.1.8

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2907,7 +2907,7 @@ Validation warnings count: 0
29072907

29082908
exports[`init should init simple fablo config 1`] = `
29092909
"{
2910-
\\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json\\",
2910+
\\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json\\",
29112911
\\"global\\": {
29122912
\\"fabricVersion\\": \\"2.4.7\\",
29132913
\\"tls\\": false,
@@ -2961,7 +2961,7 @@ exports[`init should init simple fablo config 1`] = `
29612961

29622962
exports[`init should init simple fablo config with node chaincode 1`] = `
29632963
"{
2964-
\\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json\\",
2964+
\\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json\\",
29652965
\\"global\\": {
29662966
\\"fabricVersion\\": \\"2.4.7\\",
29672967
\\"tls\\": false,
@@ -3023,7 +3023,7 @@ exports[`init should init simple fablo config with node chaincode 1`] = `
30233023

30243024
exports[`init should init simple fablo config with node chaincode and rest api 1`] = `
30253025
"{
3026-
\\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json\\",
3026+
\\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json\\",
30273027
\\"global\\": {
30283028
\\"fabricVersion\\": \\"2.4.7\\",
30293029
\\"tls\\": false,

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

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Object {
77
"default": Object {},
88
"properties": Object {
99
"$schema": Object {
10-
"const": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
10+
"const": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
1111
},
1212
"chaincodes": Object {
1313
"$id": "#/properties/chaincodes",
@@ -252,47 +252,6 @@ Object {
252252
"fabricVersion": Object {
253253
"$id": "#/properties/global/properties/fabricVersion",
254254
"default": "2.4.2",
255-
"enum": Array [
256-
"1.3.0",
257-
"1.4.0",
258-
"1.4.1",
259-
"1.4.2",
260-
"1.4.3",
261-
"1.4.4",
262-
"1.4.5",
263-
"1.4.6",
264-
"1.4.7",
265-
"1.4.8",
266-
"1.4.9",
267-
"1.4.10",
268-
"1.4.11",
269-
"1.4.12",
270-
"2.0.1",
271-
"2.1.0",
272-
"2.1.1",
273-
"2.2.0",
274-
"2.2.1",
275-
"2.2.2",
276-
"2.2.3",
277-
"2.2.4",
278-
"2.2.5",
279-
"2.2.6",
280-
"2.2.7",
281-
"2.2.8",
282-
"2.2.9",
283-
"2.3.0",
284-
"2.3.1",
285-
"2.3.2",
286-
"2.3.3",
287-
"2.4.0",
288-
"2.4.1",
289-
"2.4.2",
290-
"2.4.3",
291-
"2.4.4",
292-
"2.4.5",
293-
"2.4.6",
294-
"2.4.7",
295-
],
296255
"title": "Hyperledger Fabric version",
297256
"type": "string",
298257
},

‎e2e/fabloCommands.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ describe("version", () => {
177177
build: expect.stringMatching(/.*/),
178178
supported: expect.objectContaining({
179179
fabloVersions: expect.stringMatching(/.*/),
180-
hyperledgerFabricVersions: expect.anything(),
181180
}),
182181
}),
183182
);

‎e2e/schema.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ describe("schema", () => {
3636

3737
expect(withFabricVersion("1.4.3")).toMatchSchema(schema);
3838
expect(withFabricVersion("1.4.4")).toMatchSchema(schema);
39-
expect(withFabricVersion("1.3.1")).not.toMatchSchema(schema);
40-
expect(withFabricVersion("2.0.0")).not.toMatchSchema(schema);
39+
expect(withFabricVersion("1.3.1")).toMatchSchema(schema);
40+
expect(withFabricVersion("2.0.0")).toMatchSchema(schema);
4141
});
4242

4343
it("should validate first orderer org domain prefix", () => {

‎fablo.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
FABLO_VERSION="1.2.0-unstable"
5+
FABLO_VERSION="1.2.0"
66
FABLO_IMAGE_NAME="softwaremill/fablo"
77
FABLO_IMAGE="$FABLO_IMAGE_NAME:$FABLO_VERSION"
88

@@ -188,7 +188,7 @@ networkPrune() {
188188
if [ -f "$FABLO_TARGET/fabric-k8s.sh" ]; then
189189
"$FABLO_TARGET/fabric-k8s.sh" down
190190
fi
191-
191+
192192
echo "Removing $FABLO_TARGET"
193193
rm -rf "$FABLO_TARGET"
194194
}

‎package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "generator-fablo",
3-
"version": "1.2.0-unstable",
3+
"version": "1.2.0",
44
"description": "Fablo is a simple tool to generate the Hyperledger Fabric blockchain network and run it on Docker. It supports RAFT and solo consensus protocols, multiple organizations and channels, chaincode installation and upgrade.",
55
"author": "Piotr Hejwowski <piotr.hejwowski@gmail.com>, Jakub Dzikowski <jakub@dzikowski.online>",
66
"repository": {

‎samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
33
"global": {
44
"fabricVersion": "1.3.0",
55
"tls": false

‎samples/fablo-config-hlf1.4-1org-1chaincode-raft.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
33
"global": {
44
"fabricVersion": "1.4.6",
55
"tls": true,

‎samples/fablo-config-hlf1.4-2orgs-1chaincode.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
33
"global": {
44
"fabricVersion": "1.4.6",
55
"tls": false

‎samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json
2+
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json
33
global:
44
fabricVersion: 1.4.11
55
tls: false

‎samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
33
"global": {
44
"fabricVersion": "1.4.6",
55
"tls": true

‎samples/fablo-config-hlf2-1org-1chaincode-k8s.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
33
"global": {
44
"fabricVersion": "2.4.7",
55
"tls": false,

‎samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
33
"global": {
44
"fabricVersion": "2.3.3",
55
"tls": true,

‎samples/fablo-config-hlf2-1org-1chaincode.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
33
"global": {
44
"fabricVersion": "2.4.7",
55
"tls": false

‎samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json
2+
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json
33
global:
44
fabricVersion: 2.4.3
55
tls: true

‎samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
33
"global": {
44
"fabricVersion": "2.3.2",
55
"tls": true,

‎src/config.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@ const getVersionFromSchemaUrl = (url?: string): string => {
1818

1919
const isFabloVersionSupported = (versionName: string): boolean => versionName.startsWith(supportedVersionPrefix);
2020

21-
const supportedFabricVersions = schemaJson.properties.global.properties.fabricVersion.enum as string[];
22-
23-
const versionsSupportingRaft = supportedFabricVersions.filter((v) => version(v).isGreaterOrEqual("1.4.3"));
21+
const versionsSupportingRaft = (v: string): boolean => version(v).isGreaterOrEqual("1.4.3");
2422

2523
export {
2624
schema,
2725
fabloVersion,
28-
supportedFabricVersions,
2926
versionsSupportingRaft,
3027
getVersionFromSchemaUrl,
3128
isFabloVersionSupported,

0 commit comments

Comments
 (0)