Merge branch 'hyperledger-labs:main' into issue436

hyperledger-labs · Apr 10, 2024 · f214e6f · f214e6f
2 parents b465ec4 + 21d1a35
commit f214e6f
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 37 deletions.
diff --git a/e2e/__snapshots__/fablo-config-hlf1.4-1org-1chaincode-raft.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf1.4-1org-1chaincode-raft.json.test.ts.snap
@@ -235,7 +235,7 @@ exports[`samples/fablo-config-hlf1.4-1org-1chaincode-raft.json should create pro
   },
   \\"certificateAuthorities\\": {
     \\"ca.orderer.example.com\\": {
-      \\"url\\": \\"http://localhost:7020\\",
+      \\"url\\": \\"https://localhost:7020\\",
       \\"caName\\": \\"ca.orderer.example.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/orderer.example.com/ca/ca.orderer.example.com-cert.pem\\"
@@ -280,7 +280,7 @@ peers:
       ssl-target-name-override: peer1.org1.example.com
 certificateAuthorities:
   ca.orderer.example.com:
-    url: http://localhost:7020
+    url: https://localhost:7020
     caName: ca.orderer.example.com
     tlsCACerts:
       path: >-
@@ -332,7 +332,7 @@ exports[`samples/fablo-config-hlf1.4-1org-1chaincode-raft.json should create pro
   },
   \\"certificateAuthorities\\": {
     \\"ca.org1.example.com\\": {
-      \\"url\\": \\"http://localhost:7040\\",
+      \\"url\\": \\"https://localhost:7040\\",
       \\"caName\\": \\"ca.org1.example.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem\\"
@@ -377,7 +377,7 @@ peers:
       ssl-target-name-override: peer1.org1.example.com
 certificateAuthorities:
   ca.org1.example.com:
-    url: http://localhost:7040
+    url: https://localhost:7040
     caName: ca.org1.example.com
     tlsCACerts:
       path: >-

diff --git a/e2e/__snapshots__/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json.test.ts.snap
@@ -317,7 +317,7 @@ exports[`samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json should create p
   },
   \\"certificateAuthorities\\": {
     \\"ca.orderer.example.com\\": {
-      \\"url\\": \\"http://localhost:7020\\",
+      \\"url\\": \\"https://localhost:7020\\",
       \\"caName\\": \\"ca.orderer.example.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/orderer.example.com/ca/ca.orderer.example.com-cert.pem\\"
@@ -378,7 +378,7 @@ peers:
       ssl-target-name-override: peer1.org2.example.com
 certificateAuthorities:
   ca.orderer.example.com:
-    url: http://localhost:7020
+    url: https://localhost:7020
     caName: ca.orderer.example.com
     tlsCACerts:
       path: >-
@@ -450,7 +450,7 @@ exports[`samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json should create p
   },
   \\"certificateAuthorities\\": {
     \\"ca.org1.example.com\\": {
-      \\"url\\": \\"http://localhost:7040\\",
+      \\"url\\": \\"https://localhost:7040\\",
       \\"caName\\": \\"ca.org1.example.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem\\"
@@ -511,7 +511,7 @@ peers:
       ssl-target-name-override: peer1.org2.example.com
 certificateAuthorities:
   ca.org1.example.com:
-    url: http://localhost:7040
+    url: https://localhost:7040
     caName: ca.org1.example.com
     tlsCACerts:
       path: >-
@@ -583,7 +583,7 @@ exports[`samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json should create p
   },
   \\"certificateAuthorities\\": {
     \\"ca.org2.example.com\\": {
-      \\"url\\": \\"http://localhost:7060\\",
+      \\"url\\": \\"https://localhost:7060\\",
       \\"caName\\": \\"ca.org2.example.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem\\"
@@ -644,7 +644,7 @@ peers:
       ssl-target-name-override: peer1.org2.example.com
 certificateAuthorities:
   ca.org2.example.com:
-    url: http://localhost:7060
+    url: https://localhost:7060
     caName: ca.org2.example.com
     tlsCACerts:
       path: >-

diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap
@@ -222,7 +222,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should cre
   },
   \\"certificateAuthorities\\": {
     \\"ca.orderer.example.com\\": {
-      \\"url\\": \\"http://localhost:7020\\",
+      \\"url\\": \\"https://localhost:7020\\",
       \\"caName\\": \\"ca.orderer.example.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/orderer.example.com/ca/ca.orderer.example.com-cert.pem\\"
@@ -259,7 +259,7 @@ peers:
       ssl-target-name-override: peer0.org1.example.com
 certificateAuthorities:
   ca.orderer.example.com:
-    url: http://localhost:7020
+    url: https://localhost:7020
     caName: ca.orderer.example.com
     tlsCACerts:
       path: >-
@@ -301,7 +301,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should cre
   },
   \\"certificateAuthorities\\": {
     \\"ca.org1.example.com\\": {
-      \\"url\\": \\"http://localhost:7040\\",
+      \\"url\\": \\"https://localhost:7040\\",
       \\"caName\\": \\"ca.org1.example.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem\\"
@@ -338,7 +338,7 @@ peers:
       ssl-target-name-override: peer0.org1.example.com
 certificateAuthorities:
   ca.org1.example.com:
-    url: http://localhost:7040
+    url: https://localhost:7040
     caName: ca.org1.example.com
     tlsCACerts:
       path: >-
@@ -2113,9 +2113,6 @@ services:
       - COUCHDB_PASSWORD=peer0Password
     ports:
       - 5100:5984
-    depends_on:
-      couchdb.peer0.org1.example.com:
-        condition: service_healthy
     networks:
       - basic
 

diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap
@@ -408,7 +408,7 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create pro
   },
   \\"certificateAuthorities\\": {
     \\"ca.orderer1.com\\": {
-      \\"url\\": \\"http://localhost:7020\\",
+      \\"url\\": \\"https://localhost:7020\\",
       \\"caName\\": \\"ca.orderer1.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/orderer1.com/ca/ca.orderer1.com-cert.pem\\"
@@ -469,7 +469,7 @@ peers:
       ssl-target-name-override: peer1.org2.example.com
 certificateAuthorities:
   ca.orderer1.com:
-    url: http://localhost:7020
+    url: https://localhost:7020
     caName: ca.orderer1.com
     tlsCACerts:
       path: >-
@@ -541,7 +541,7 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create pro
   },
   \\"certificateAuthorities\\": {
     \\"ca.orderer2.com\\": {
-      \\"url\\": \\"http://localhost:7040\\",
+      \\"url\\": \\"https://localhost:7040\\",
       \\"caName\\": \\"ca.orderer2.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/orderer2.com/ca/ca.orderer2.com-cert.pem\\"
@@ -602,7 +602,7 @@ peers:
       ssl-target-name-override: peer1.org2.example.com
 certificateAuthorities:
   ca.orderer2.com:
-    url: http://localhost:7040
+    url: https://localhost:7040
     caName: ca.orderer2.com
     tlsCACerts:
       path: >-
@@ -674,7 +674,7 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create pro
   },
   \\"certificateAuthorities\\": {
     \\"ca.org1.example.com\\": {
-      \\"url\\": \\"http://localhost:7060\\",
+      \\"url\\": \\"https://localhost:7060\\",
       \\"caName\\": \\"ca.org1.example.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem\\"
@@ -735,7 +735,7 @@ peers:
       ssl-target-name-override: peer1.org2.example.com
 certificateAuthorities:
   ca.org1.example.com:
-    url: http://localhost:7060
+    url: https://localhost:7060
     caName: ca.org1.example.com
     tlsCACerts:
       path: >-
@@ -807,7 +807,7 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create pro
   },
   \\"certificateAuthorities\\": {
     \\"ca.org2.example.com\\": {
-      \\"url\\": \\"http://localhost:7080\\",
+      \\"url\\": \\"https://localhost:7080\\",
       \\"caName\\": \\"ca.org2.example.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem\\"
@@ -868,7 +868,7 @@ peers:
       ssl-target-name-override: peer1.org2.example.com
 certificateAuthorities:
   ca.org2.example.com:
-    url: http://localhost:7080
+    url: https://localhost:7080
     caName: ca.org2.example.com
     tlsCACerts:
       path: >-

diff --git a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap
@@ -423,7 +423,7 @@ exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should cr
   },
   \\"certificateAuthorities\\": {
     \\"ca.orderer.example.com\\": {
-      \\"url\\": \\"http://localhost:7020\\",
+      \\"url\\": \\"https://localhost:7020\\",
       \\"caName\\": \\"ca.orderer.example.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/orderer.example.com/ca/ca.orderer.example.com-cert.pem\\"
@@ -500,7 +500,7 @@ peers:
       ssl-target-name-override: peer1.org3.example.com
 certificateAuthorities:
   ca.orderer.example.com:
-    url: http://localhost:7020
+    url: https://localhost:7020
     caName: ca.orderer.example.com
     tlsCACerts:
       path: >-
@@ -592,7 +592,7 @@ exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should cr
   },
   \\"certificateAuthorities\\": {
     \\"ca.org1.example.com\\": {
-      \\"url\\": \\"http://localhost:7040\\",
+      \\"url\\": \\"https://localhost:7040\\",
       \\"caName\\": \\"ca.org1.example.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem\\"
@@ -669,7 +669,7 @@ peers:
       ssl-target-name-override: peer1.org3.example.com
 certificateAuthorities:
   ca.org1.example.com:
-    url: http://localhost:7040
+    url: https://localhost:7040
     caName: ca.org1.example.com
     tlsCACerts:
       path: >-
@@ -761,7 +761,7 @@ exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should cr
   },
   \\"certificateAuthorities\\": {
     \\"ca.org2.example.com\\": {
-      \\"url\\": \\"http://localhost:7060\\",
+      \\"url\\": \\"https://localhost:7060\\",
       \\"caName\\": \\"ca.org2.example.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem\\"
@@ -838,7 +838,7 @@ peers:
       ssl-target-name-override: peer1.org3.example.com
 certificateAuthorities:
   ca.org2.example.com:
-    url: http://localhost:7060
+    url: https://localhost:7060
     caName: ca.org2.example.com
     tlsCACerts:
       path: >-
@@ -930,7 +930,7 @@ exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should cr
   },
   \\"certificateAuthorities\\": {
     \\"ca.org3.example.com\\": {
-      \\"url\\": \\"http://localhost:7080\\",
+      \\"url\\": \\"https://localhost:7080\\",
       \\"caName\\": \\"ca.org3.example.com\\",
       \\"tlsCACerts\\": {
         \\"path\\": \\"<absolute path>/samples/fablo-target/fabric-config/crypto-config/peerOrganizations/org3.example.com/ca/ca.org3.example.com-cert.pem\\"
@@ -1007,7 +1007,7 @@ peers:
       ssl-target-name-override: peer1.org3.example.com
 certificateAuthorities:
   ca.org3.example.com:
-    url: http://localhost:7080
+    url: https://localhost:7080
     caName: ca.org3.example.com
     tlsCACerts:
       path: >-

diff --git a/src/setup-docker/templates/fabric-docker/docker-compose.yaml b/src/setup-docker/templates/fabric-docker/docker-compose.yaml
@@ -298,9 +298,6 @@ services:
       - COUCHDB_PASSWORD=<%= peer.name %>Password
     ports:
       - <%= peer.couchDbExposePort %>:5984
-    depends_on:
-      couchdb.<%= peer.name %>.<%= org.domain %>:
-        condition: service_healthy
     networks:
       - basic
   <%_ } _%>

diff --git a/src/types/ConnectionProfile.ts b/src/types/ConnectionProfile.ts
@@ -155,7 +155,7 @@ function certificateAuthorities(
   if (isTls) {
     return {
       [org.ca.address]: {
-        url: `http://localhost:${org.ca.exposePort}`,
+        url: `https://localhost:${org.ca.exposePort}`,
         caName: org.ca.address,
         tlsCACerts: {
           path: `${rootPath}/peerOrganizations/${org.domain}/ca/${org.ca.address}-cert.pem`,