Handle IBP v2.1.3 changes to exported node files

[sstone1]

IBP v2.1.3 will be changing the JSON files exported for peers and orderers so that the pem property becomes tls_ca_root_cert, so we need to handle this - whilst still supporting older IBP versions.

[sstone1]

@erin-hughes I hear you are going to work on this - I'm afraid this is a bit more complicated than just one property change!

Certificate Authority

name is now display_name
pem is now tls_cert

{
    "display_name": "Ordering Org CA",
    "api_url": "https://sstone1-alpha-orderingorgca-ca.apps.sstone1.os.fyre.ibm.com:443",
    "operations_url": "https://sstone1-alpha-orderingorgca-operations.apps.sstone1.os.fyre.ibm.com:443",
    "type": "fabric-ca",
    "ca_name": "ca",
    "tlsca_name": "tlsca",
    "tls_cert": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMxVENDQW51Z0F3SUJBZ0lSQUs4VUgwWmNhcW4rRkZIOXFDMTArUTR3Q2dZSUtvWkl6ajBFQXdJd2dhQXgKQ3pBSkJnTlZCQVlUQWxWVE1SY3dGUVlEVlFRSUV3NU9iM0owYUNCRFlYSnZiR2x1WVRFUE1BMEdBMVVFQnhNRwpSSFZ5YUdGdE1Rd3dDZ1lEVlFRS0V3TkpRazB4RXpBUkJnTlZCQXNUQ2tKc2IyTnJZMmhoYVc0eFJEQkNCZ05WCkJBTVRPM056ZEc5dVpURXRZV3h3YUdFdGIzSmtaWEpwYm1kdmNtZGpZUzFqWVM1aGNIQnpMbk56ZEc5dVpURXUKYjNNdVpubHlaUzVwWW0wdVkyOXRNQjRYRFRJd01ETXlNekUxTWpVME1Gb1hEVE13TURNeU1URTFNalUwTUZvdwpnYUF4Q3pBSkJnTlZCQVlUQWxWVE1SY3dGUVlEVlFRSUV3NU9iM0owYUNCRFlYSnZiR2x1WVRFUE1BMEdBMVVFCkJ4TUdSSFZ5YUdGdE1Rd3dDZ1lEVlFRS0V3TkpRazB4RXpBUkJnTlZCQXNUQ2tKc2IyTnJZMmhoYVc0eFJEQkMKQmdOVkJBTVRPM056ZEc5dVpURXRZV3h3YUdFdGIzSmtaWEpwYm1kdmNtZGpZUzFqWVM1aGNIQnpMbk56ZEc5dQpaVEV1YjNNdVpubHlaUzVwWW0wdVkyOXRNRmt3RXdZSEtvWkl6ajBDQVFZSUtvWkl6ajBEQVFjRFFnQUVpYnZlCmRpZUtZQ2E1emF1ejdBR20xNkZzanlydGtSeVdmYk45SXFzcFAwNXhLTmNuOEN1NWRwQUs5eml3N0JUMDVjMnEKazBRZ1E5UzVTZExnVGFIWXlLT0JrekNCa0RDQmpRWURWUjBSQklHRk1JR0NnanR6YzNSdmJtVXhMV0ZzY0doaApMVzl5WkdWeWFXNW5iM0puWTJFdFkyRXVZWEJ3Y3k1emMzUnZibVV4TG05ekxtWjVjbVV1YVdKdExtTnZiWUpECmMzTjBiMjVsTVMxaGJIQm9ZUzF2Y21SbGNtbHVaMjl5WjJOaExXOXdaWEpoZEdsdmJuTXVZWEJ3Y3k1emMzUnYKYm1VeExtOXpMbVo1Y21VdWFXSnRMbU52YlRBS0JnZ3Foa2pPUFFRREFnTklBREJGQWlFQW1NNEdVbTZsL1A0KwpNbFNadVVrVTN1eDZPK09nczJpK05SMG9TOUlxdHBrQ0lFWVViVnJSaHZPMWIvc0xRTlJXUUU2cVI2OUxSWXJJCnFUVVVMRHlXbTFtUAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
    "location": "openshift"
}

Peer

name is now display_name
pem is now tls_ca_root_cert
Note that a peer has a tls_cert field, but this is not the correct certificate to use.

{
    "display_name": "Org1 Peer",
    "grpcwp_url": "https://sstone1-beta-org1peer-grpcweb.apps.sstone1.os.fyre.ibm.com:443",
    "api_url": "grpcs://sstone1-beta-org1peer-peer.apps.sstone1.os.fyre.ibm.com:443",
    "operations_url": "https://sstone1-beta-org1peer-operations.apps.sstone1.os.fyre.ibm.com:443",
    "type": "fabric-peer",
    "msp_id": "Org1MSP",
    "tls_ca_root_cert": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUIvVENDQWFTZ0F3SUJBZ0lVRlJOOVhOV3BDczhjMEF1V09yMUNFZ1lMejR3d0NnWUlLb1pJemowRUF3SXcKWFRFTE1Ba0dBMVVFQmhNQ1ZWTXhGekFWQmdOVkJBZ1REazV2Y25Sb0lFTmhjbTlzYVc1aE1SUXdFZ1lEVlFRSwpFd3RJZVhCbGNteGxaR2RsY2pFUE1BMEdBMVVFQ3hNR1JtRmljbWxqTVE0d0RBWURWUVFERXdWMGJITmpZVEFlCkZ3MHlNREF6TWpNeE5USTBNREJhRncwek5UQXpNakF4TlRJME1EQmFNRjB4Q3pBSkJnTlZCQVlUQWxWVE1SY3cKRlFZRFZRUUlFdzVPYjNKMGFDQkRZWEp2YkdsdVlURVVNQklHQTFVRUNoTUxTSGx3WlhKc1pXUm5aWEl4RHpBTgpCZ05WQkFzVEJrWmhZbkpwWXpFT01Bd0dBMVVFQXhNRmRHeHpZMkV3V1RBVEJnY3Foa2pPUFFJQkJnZ3Foa2pPClBRTUJCd05DQUFRaDlQNmE5Q2RRc1RoZXlyaWVMNlo2Z1NvMFRiaTl6TlJ1K3UyU0tTWi9sTjY4MFRwNjN6L3YKNENxc1FKc0QzamYxMUxmNnUyYldMN3UrYzBKbFdtSk9vMEl3UURBT0JnTlZIUThCQWY4RUJBTUNBUVl3RHdZRApWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVWVZVVBKaWpqRjc0NG4wMS9LcmRrcW9pN0xtTXdDZ1lJCktvWkl6ajBFQXdJRFJ3QXdSQUlnVldCYUszNjZEbGc1a0ZUQW1oaUxlTVlkVEhMNi9wY1dLK3VIV0FqbG1pWUMKSUFyejhtWVdEMTBmQnVrVlhSL08wanNtZEJVREVuSldNWVNpbDhpT01rK0oKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=",
    "location": "openshift"
}

Ordering Service Node

name is now display_name
pem is now tls_ca_root_cert
Note that an ordering service node has either a tls_cert field, or both a client_tls_cert and a server_tls_cert field, but none of these are the correct certificate to use.

[
    {
        "display_name": "Ordering Service_1",
        "grpcwp_url": "https://sstone1-alpha-orderingservicenode1-grpcweb.apps.sstone1.os.fyre.ibm.com:443",
        "api_url": "grpcs://sstone1-alpha-orderingservicenode1-orderer.apps.sstone1.os.fyre.ibm.com:443",
        "operations_url": "https://sstone1-alpha-orderingservicenode1-operations.apps.sstone1.os.fyre.ibm.com:443",
        "type": "fabric-orderer",
        "msp_id": "OrdererMSP",
        "system_channel_id": "testchainid",
        "tls_cert": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNhRENDQWcrZ0F3SUJBZ0lVQ3BKWHhpWDlKVjQ5QXNpL3daM1dRcWdIUmc4d0NnWUlLb1pJemowRUF3SXcKWFRFTE1Ba0dBMVVFQmhNQ1ZWTXhGekFWQmdOVkJBZ1REazV2Y25Sb0lFTmhjbTlzYVc1aE1SUXdFZ1lEVlFRSwpFd3RJZVhCbGNteGxaR2RsY2pFUE1BMEdBMVVFQ3hNR1JtRmljbWxqTVE0d0RBWURWUVFERXdWMGJITmpZVEFlCkZ3MHlNREF6TWpNeE5USXpNREJhRncweU1UQXpNak14TlRJNE1EQmFNQzh4RURBT0JnTlZCQXNUQjI5eVpHVnkKWlhJeEd6QVpCZ05WQkFNVEVtOXlaR1Z5YVc1bmIzSm5iM0prWlhKbGNqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxRwpTTTQ5QXdFSEEwSUFCSmg0Y3E4UjV4UklVdXlDWXZ4TUVxMWlYRXZ3SnQ5aXBtNEFWQTIvUUFJTStRSjZYVnh3ClRYK2taem9VZDBxUHBtdS9RV2lqL1QwK29zYy84b0QvT1Jlamdkb3dnZGN3RGdZRFZSMFBBUUgvQkFRREFnT28KTUIwR0ExVWRKUVFXTUJRR0NDc0dBUVVGQndNQkJnZ3JCZ0VGQlFjREFqQU1CZ05WSFJNQkFmOEVBakFBTUIwRwpBMVVkRGdRV0JCU2Q3WitPb28ySFRnODVlOTV1bFJVWXpvWjZyREFmQmdOVkhTTUVHREFXZ0JTMVRDNkFWbGZPCkd2ZnEwa05jZVBULzdaanRQakJZQmdOVkhSRUVVVEJQZ2tkemMzUnZibVV4TFdGc2NHaGhMVzl5WkdWeWFXNW4KYzJWeWRtbGpaVzV2WkdVeExXOXlaR1Z5WlhJdVlYQndjeTV6YzNSdmJtVXhMbTl6TG1aNWNtVXVhV0p0TG1OdgpiWWNFZndBQUFUQUtCZ2dxaGtqT1BRUURBZ05IQURCRUFpQlRFc1pDTkpmNkdMZ05CaUF5SWdYMkd0WjF4ajk3CnJrOURSZGl0YTl4b25BSWdiYlBhUmppK1FPV1R1NStva25tSDh4aVYwcU44SnRLWFAxWTFsZEUxUFlZPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
        "tls_ca_root_cert": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUIvVENDQWFTZ0F3SUJBZ0lVUFJvTWtNclYraGlnb2t0ZnJ3bjFPQUppZlpNd0NnWUlLb1pJemowRUF3SXcKWFRFTE1Ba0dBMVVFQmhNQ1ZWTXhGekFWQmdOVkJBZ1REazV2Y25Sb0lFTmhjbTlzYVc1aE1SUXdFZ1lEVlFRSwpFd3RJZVhCbGNteGxaR2RsY2pFUE1BMEdBMVVFQ3hNR1JtRmljbWxqTVE0d0RBWURWUVFERXdWMGJITmpZVEFlCkZ3MHlNREF6TWpNeE5USXhNREJhRncwek5UQXpNakF4TlRJeE1EQmFNRjB4Q3pBSkJnTlZCQVlUQWxWVE1SY3cKRlFZRFZRUUlFdzVPYjNKMGFDQkRZWEp2YkdsdVlURVVNQklHQTFVRUNoTUxTSGx3WlhKc1pXUm5aWEl4RHpBTgpCZ05WQkFzVEJrWmhZbkpwWXpFT01Bd0dBMVVFQXhNRmRHeHpZMkV3V1RBVEJnY3Foa2pPUFFJQkJnZ3Foa2pPClBRTUJCd05DQUFTRU1BS1hsZFAreEkrQUR4bVRSQzMrZUI1SklJZE5MdVRBOHB0NDJmdmdWOGxWTjNPK0dBR1cKVG52T3JITTE1dDFYVlFPMUFWcnF5ajkyaWh4T0ljRTZvMEl3UURBT0JnTlZIUThCQWY4RUJBTUNBUVl3RHdZRApWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVXRVd3VnRlpYemhyMzZ0SkRYSGowLysyWTdUNHdDZ1lJCktvWkl6ajBFQXdJRFJ3QXdSQUlnWnRSU0tSZnRReGllUDgrN0hYYXhOWFQzSjV0VkttRW90SlZEeksrTkd2a0MKSUhHS3BqWGNBSXVlQ3VjRlZKY0RTb3FLREhYQUM2eXc4YTkrSUxNdUJYZ1kKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=",
        "cluster_id": "bmqobjynwq",
        "cluster_name": "Ordering Service",
        "location": "openshift",
        "associatedIdentityName": "Ordering Org Admin"
    }
]

Finally - we still need to support the old property names and the new property names - users should be able to import the 2.1.2 or the 2.1.3 versions of the files.

[erin-hughes]

Closed by #2096