Merge pull request #747 from ckpaliwal/issue-6113

Certificate expire warning issue fix for imported component
hyperledger-labs · Jun 18, 2024 · bee8220 · bee8220
2 parents 4a291ff + 7935ffa
commit bee8220
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/packages/apollo/src/components/ImportPeerModal/ImportPeerModal.js b/packages/apollo/src/components/ImportPeerModal/ImportPeerModal.js
@@ -892,6 +892,10 @@ class ImportPeerModal extends React.Component {
 						{
 							name: 'location',
 							required: false,
+						},,
+						{
+							name: 'node_ou',
+							required: false,
 						},
 					]}
 					onChange={this.onChange}

diff --git a/packages/apollo/src/rest/PeerRestApi.js b/packages/apollo/src/rest/PeerRestApi.js
@@ -449,6 +449,9 @@ class PeerRestApi {
 			if (!_.get(exportedPeer, 'msp.tlsca.root_certs')) {
 				_.set(exportedPeer, 'msp.tlsca.root_certs', [some_peer_record.tls_ca_root_cert || some_peer_record.pem]);
 			}
+			if(some_peer_record.node_ou) {
+				exportedPeer.node_ou = some_peer_record.node_ou;
+			}
 			return NodeRestApi.importComponent(exportedPeer);
 		});
 		return Promise.all(all);

diff --git a/packages/apollo/src/utils/helper.js b/packages/apollo/src/utils/helper.js
@@ -235,6 +235,11 @@ const Helper = {
 				tls_cert: _.get(node, 'msp.component.tls_cert'),
 				tls_ca_root_cert: _.get(node, 'msp.tlsca.root_certs[0]'),
 			};
+
+			if(node.node_ou) {
+				exportNode.node_ou = node.node_ou;
+			}
+
 			if (zipExport) {
 				exportNode.id = node.id;
 				exportNode.associatedIdentityName = node.associatedIdentityName;

diff --git a/packages/athena/json_docs/json_validation/ibp_openapi_v3.yaml b/packages/athena/json_docs/json_validation/ibp_openapi_v3.yaml
@@ -9389,6 +9389,8 @@ components:
           $ref: '#/components/schemas/operations_url_peer'
         tags:
           $ref: '#/components/schemas/tags'
+        node_ou:
+          $ref: '#/components/schemas/node_ou'
 
     msp_crypto_field:
       type: object

diff --git a/packages/athena/json_docs/json_validation/swagger_flatten_validation.json b/packages/athena/json_docs/json_validation/swagger_flatten_validation.json