Skip to content

Commit f79e653

Browse files
OsamaRab3OsamaRab3
committed
update snapshots
Signed-off-by: Osama Rabea <osrab3@gmail.com>
1 parent cda3ba1 commit f79e653

10 files changed

+34
-9
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,8 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should cre
373373
"
374374
`;
375375
376+
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-config/explorer/.gitkeep from samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json 1`] = `""`;
377+
376378
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-config/explorer/config-global.json from samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json 1`] = `
377379
"{
378380
"network-configs": {
@@ -2154,9 +2156,9 @@ services:
21542156
- CORE_PEER_TLS_KEY_FILE=/tmp/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key
21552157
- CORE_PEER_TLS_ROOTCERT_FILE=/tmp/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt
21562158
volumes:
2157-
- ../fabric-config/explorer/config.json:/opt/explorer/app/platform/fabric/config.json
2158-
- ../fabric-config/explorer/connection-profile.json:/opt/explorer/app/platform/fabric/connection-profile/connection-profile.json
2159-
- ../fabric-config/crypto-config:/tmp/crypto
2159+
- ../fabric-config/explorer/config.json:/opt/explorer/app/platform/fabric/config.json:ro
2160+
- ../fabric-config/explorer/connection-profile.json:/opt/explorer/app/platform/fabric/connection-profile/connection-profile.json:ro
2161+
- ../fabric-config/crypto-config:/tmp/crypto:ro
21602162
ports:
21612163
- "7010:8080"
21622164
depends_on:
@@ -3292,6 +3294,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should cre
32923294
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/connection-profiles/connection-profile-org1.yaml",
32933295
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/crypto-config-orderer.yaml",
32943296
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/crypto-config-org1.yaml",
3297+
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/explorer/.gitkeep",
32953298
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/explorer/config-global.json",
32963299
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/explorer/config-org1.json",
32973300
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/explorer/connection-profile-org1.json",

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,8 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e
350350
"
351351
`;
352352
353+
exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-config/explorer/.gitkeep from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `""`;
354+
353355
exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-config/explorer/config-global.json from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `
354356
"{
355357
"network-configs": {
@@ -3156,6 +3158,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper fil
31563158
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-config/connection-profiles/connection-profile-org1.yaml",
31573159
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-config/crypto-config-orderer.yaml",
31583160
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-config/crypto-config-org1.yaml",
3161+
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-config/explorer/.gitkeep",
31593162
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-config/explorer/config-global.json",
31603163
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-config/fabric-ca-server-config/orderer.example.com/fabric-ca-server-config.yaml",
31613164
"e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-config/fabric-ca-server-config/org1.example.com/fabric-ca-server-config.yaml",

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,8 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should cr
506506
"
507507
`;
508508
509+
exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-config/explorer/.gitkeep from samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml 1`] = `""`;
510+
509511
exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-config/explorer/config-global.json from samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml 1`] = `
510512
"{
511513
"network-configs": {
@@ -4089,6 +4091,7 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should cr
40894091
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-config/crypto-config-orderer.yaml",
40904092
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-config/crypto-config-org1.yaml",
40914093
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-config/crypto-config-org2.yaml",
4094+
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-config/explorer/.gitkeep",
40924095
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-config/explorer/config-global.json",
40934096
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-config/fabric-ca-server-config/orderer.example.com/fabric-ca-server-config.yaml",
40944097
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-config/fabric-ca-server-config/org1.example.com/fabric-ca-server-config.yaml",

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -928,6 +928,8 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create pro
928928
"
929929
`;
930930
931+
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-config/explorer/.gitkeep from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = `""`;
932+
931933
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-config/explorer/config-global.json from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = `
932934
"{
933935
"network-configs": {
@@ -5498,6 +5500,7 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create pro
54985500
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-config/crypto-config-orderer2.yaml",
54995501
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-config/crypto-config-org1.yaml",
55005502
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-config/crypto-config-org2.yaml",
5503+
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-config/explorer/.gitkeep",
55015504
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-config/explorer/config-global.json",
55025505
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-config/fabric-ca-server-config/orderer1.com/fabric-ca-server-config.yaml",
55035506
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-config/fabric-ca-server-config/orderer2.com/fabric-ca-server-config.yaml",

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,6 +1071,8 @@ exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should cr
10711071
"
10721072
`;
10731073
1074+
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-config/explorer/.gitkeep from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = `""`;
1075+
10741076
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-config/explorer/config-global.json from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = `
10751077
"{
10761078
"network-configs": {
@@ -4858,9 +4860,9 @@ services:
48584860
- CORE_PEER_TLS_KEY_FILE=/tmp/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key
48594861
- CORE_PEER_TLS_ROOTCERT_FILE=/tmp/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt
48604862
volumes:
4861-
- ../fabric-config/explorer/config.json:/opt/explorer/app/platform/fabric/config.json
4862-
- ../fabric-config/explorer/connection-profile.json:/opt/explorer/app/platform/fabric/connection-profile/connection-profile.json
4863-
- ../fabric-config/crypto-config:/tmp/crypto
4863+
- ../fabric-config/explorer/config.json:/opt/explorer/app/platform/fabric/config.json:ro
4864+
- ../fabric-config/explorer/connection-profile.json:/opt/explorer/app/platform/fabric/connection-profile/connection-profile.json:ro
4865+
- ../fabric-config/crypto-config:/tmp/crypto:ro
48644866
ports:
48654867
- "7010:8080"
48664868
depends_on:
@@ -6014,6 +6016,7 @@ exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should cr
60146016
"e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/crypto-config-org1.yaml",
60156017
"e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/crypto-config-org2.yaml",
60166018
"e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/crypto-config-org3.yaml",
6019+
"e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/explorer/.gitkeep",
60176020
"e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/explorer/config-global.json",
60186021
"e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/explorer/config-org1.json",
60196022
"e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/explorer/config-org2.json",

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,8 @@ exports[`samples/fablo-config-hlf3-1orgs-1chaincode.json should create proper e2
426426
"
427427
`;
428428
429+
exports[`samples/fablo-config-hlf3-1orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/explorer/.gitkeep from samples/fablo-config-hlf3-1orgs-1chaincode.json 1`] = `""`;
430+
429431
exports[`samples/fablo-config-hlf3-1orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/explorer/config-global.json from samples/fablo-config-hlf3-1orgs-1chaincode.json 1`] = `
430432
"{
431433
"network-configs": {
@@ -3406,6 +3408,7 @@ exports[`samples/fablo-config-hlf3-1orgs-1chaincode.json should create proper fi
34063408
"e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/connection-profiles/connection-profile-org1.yaml",
34073409
"e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/crypto-config-orderer.yaml",
34083410
"e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/crypto-config-org1.yaml",
3411+
"e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/explorer/.gitkeep",
34093412
"e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/explorer/config-global.json",
34103413
"e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/fabric-ca-server-config/orderer.example.com/fabric-ca-server-config.yaml",
34113414
"e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/fabric-ca-server-config/org1.example.com/fabric-ca-server-config.yaml",

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,8 @@ exports[`samples/fablo-config-hlf3-bft-1orgs-1chaincode.json should create prope
451451
"
452452
`;
453453
454+
exports[`samples/fablo-config-hlf3-bft-1orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/explorer/.gitkeep from samples/fablo-config-hlf3-bft-1orgs-1chaincode.json 1`] = `""`;
455+
454456
exports[`samples/fablo-config-hlf3-bft-1orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/explorer/config-global.json from samples/fablo-config-hlf3-bft-1orgs-1chaincode.json 1`] = `
455457
"{
456458
"network-configs": {
@@ -3430,6 +3432,7 @@ exports[`samples/fablo-config-hlf3-bft-1orgs-1chaincode.json should create prope
34303432
"e2e/__tmp__/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/connection-profiles/connection-profile-org1.yaml",
34313433
"e2e/__tmp__/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/crypto-config-orderer.yaml",
34323434
"e2e/__tmp__/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/crypto-config-org1.yaml",
3435+
"e2e/__tmp__/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/explorer/.gitkeep",
34333436
"e2e/__tmp__/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/explorer/config-global.json",
34343437
"e2e/__tmp__/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/fabric-ca-server-config/orderer.example.com/fabric-ca-server-config.yaml",
34353438
"e2e/__tmp__/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/fabric-ca-server-config/org1.example.com/fabric-ca-server-config.yaml",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ exports[`extend config should extend custom config 1`] = `
44
"Validation errors count: 0
55
Validation warnings count: 0
66
===========================================================
7+
Could not check for updates. Url: 'https://api.github.com/repos/hyperledger-labs/fablo/releases' not available
78
{
89
"global": {
910
"fabricVersion": "2.4.3",

‎src/setup-docker/index.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ export default class SetupDockerGenerator extends Generator {
131131
const orgs = orgsTransformed.filter((o) => o.anchorPeers.length > 0);
132132
const orgWithChannels = pairOrgWithChannels(orgs, channels);
133133

134+
// Ensure explorer config directory exists
135+
this.fs.write(this.destinationPath("fabric-config/explorer/.gitkeep"), "");
136+
134137
orgWithChannels
135138
.filter((p: OrgWithChannels) => global.tools.explorer !== undefined || p.org.tools.explorer !== undefined)
136139
.forEach((p: OrgWithChannels) => {

‎src/setup-docker/templates/fabric-docker/docker-compose.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,9 @@ services:
374374
- CORE_PEER_TLS_ROOTCERT_FILE=/tmp/crypto/peerOrganizations/<%= firstPeerOrg.domain %>/peers/<%= firstPeerOrg.peers[0].address %>/tls/ca.crt
375375
<%_ } _%>
376376
volumes:
377-
- ../fabric-config/explorer/config.json:/opt/explorer/app/platform/fabric/config.json
378-
- ../fabric-config/explorer/connection-profile.json:/opt/explorer/app/platform/fabric/connection-profile/connection-profile.json
379-
- ../fabric-config/crypto-config:/tmp/crypto
377+
- ../fabric-config/explorer/config.json:/opt/explorer/app/platform/fabric/config.json:ro
378+
- ../fabric-config/explorer/connection-profile.json:/opt/explorer/app/platform/fabric/connection-profile/connection-profile.json:ro
379+
- ../fabric-config/crypto-config:/tmp/crypto:ro
380380
ports:
381381
- "<%= global.tools.explorer.port %>:8080"
382382
depends_on:

0 commit comments

Comments
 (0)