Skip to content

Commit 2b5a9ca

Browse files
ArtemkaaasArtemkaaas
committed
Processed review comments
1 parent 31f91df commit 2b5a9ca

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

‎docs/transactions.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@ Please make sure that TLS is enabled in gRPC, REST or Light Client Proxy for sec
167167

168168
| Method | CLI command / REST API |
169169
|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
170-
| Global - Work for all certificate types (DA, NOC) | |
170+
| **GLOBAL - Work for all certificate types (DA, NOC)** | |
171171
| [GET_CERT](transactions/pki.md#get_cert) <br><br> Gets a certificate (PAA, PAI, RCAC, ICAC) | CLI `dcld query pki cert --subject=<base64 string> --subject-key-id=<hex string>` <br><br> GET `/dcl/pki/all-certificates/{subject}/{subject_key_id}` |
172172
| [GET_ALL_CERTS](transactions/pki.md#get_all_certs) <br><br> Gets all certificates (PAA, PAI, RCAC, ICAC) | CLI `dcld query pki all-certs` <br><br> GET `/dcl/pki/all-certificates` |
173173
| [GET_ALL_CERTS_BY_SUBJECT](transactions/pki.md#get_all_certs_by_subject) <br><br> | CLI `dcld query pki all-subject-certs --subject=<base64 string>` <br><br> GET `/dcl/pki/all-certificates/{subject}` |
174174
| [GET_CHILD_CERTS](transactions/pki.md#get_child_certs) <br><br> Gets all child certificates for the given certificate (PAA, PAI, RCAC, ICAC) | CLI `dcld query pki all-child-x509-certs --subject=<base64 string> --subject-key-id=<hex string>` <br><br> GET `/dcl/pki/child-certificates/{subject}/{subject_key_id}` |
175-
| DA - Work for DA certificate types (PAA, PAI) | |
175+
| **DA - Work for DA certificate types (PAA, PAI)** | |
176176
| [PROPOSE_ADD_PAA](transactions/pki.md#propose_add_paa) <br><br> Proposes a new PAA (self-signed root certificate) | CLI `dcld tx pki propose-add-x509-root-cert --certificate=<string-or-path>` <br><br> POST `/cosmos/tx/v1beta1/txs`([MsgProposeAddX509RootCert](https://github.com/zigbee-alliance/distributed-compliance-ledger/blob/master/proto/zigbeealliance/distributedcomplianceledger/pki/tx.proto#L34)) |
177177
| [APPROVE_ADD_PAA](transactions/pki.md#approve_add_paa) <br><br> Approves the proposed PAA / Re-vote | CLI `dcld tx pki approve-add-x509-root-cert --subject=<base64 string> --subject-key-id=<hex string>` <br><br> POST `/cosmos/tx/v1beta1/txs`([MsgApproveAddX509RootCert](https://github.com/zigbee-alliance/distributed-compliance-ledger/blob/master/proto/zigbeealliance/distributedcomplianceledger/pki/tx.proto#L46)) |
178178
| [REJECT_ADD_PAA](transactions/pki.md#reject_add_paa) <br><br> Rejects the proposed PAA / Re-vote | CLI `dcld tx pki reject-add-x509-root-cert --subject=<base64 string> --subject-key-id=<hex string>` <br><br> POST `/cosmos/tx/v1beta1/txs`([MsgRejectAddX509RootCert](https://github.com/zigbee-alliance/distributed-compliance-ledger/blob/master/proto/zigbeealliance/distributedcomplianceledger/pki/tx.proto#L106)) |
@@ -202,9 +202,10 @@ Please make sure that TLS is enabled in gRPC, REST or Light Client Proxy for sec
202202
| [GET_ALL_REVOKED_PAA](transactions/pki.md#get_all_revoked_paa) <br><br> Gets all revoked PAA certificates | CLI `dcld query pki all-revoked-x509-root-certs` <br><br> GET `/dcl/pki/revoked-root-certificates` |
203203
| [GET_ALL_REJECTED_PAA](transactions/pki.md#get_all_rejected_paa) <br><br> Gets all rejected root certificates | CLI `dcld query pki all-rejected-x509-root-certs` <br><br> GET `dcl/pki/rejected-certificates` |
204204
| [GET_REJECTED_PAA](transactions/pki.md#get_rejected_paa) <br><br> Get a rejected PAA certificate | CLI `dcld query pki rejected-x509-root-cert --subject=<base64 string> --subject-key-id=<hex string>` <br><br> GET `/dcl/pki/rejected-certificates/{subject}/{subject_key_id}` |
205-
| NOC - Work for NOC certificate types (RCAC, ICAC) | |
205+
| **NOC - Work for NOC certificate types (RCAC, ICAC)** | |
206206
| [ADD_NOC_ROOT](transactions/pki.md#add_noc_root-rcac) <br><br> Adds a NOC root certificate (RCAC) | CLI `dcld tx pki add-noc-x509-root-cert --certificate=<string-or-path> ...` <br><br> POST `/cosmos/tx/v1beta1/txs`([MsgAddNocX509RootCert](https://github.com/zigbee-alliance/distributed-compliance-ledger/blob/master/proto/zigbeealliance/distributedcomplianceledger/pki/tx.proto#L174)) |
207207
| [REVOKE_NOC_ROOT](transactions/pki.md#revoke_noc_root-rcac) <br><br> Revokes a NOC root certificate (RCAC) | CLI `dcld tx pki revoke-noc-x509-root-cert --subject=<base64 string> --subject-key-id=<hex string> ...` <br><br> POST `/cosmos/tx/v1beta1/txs`([MsgRevokeNocX509RootCert](https://github.com/zigbee-alliance/distributed-compliance-ledger/blob/master/proto/zigbeealliance/distributedcomplianceledger/pki/tx.proto#L202)) |
208+
| [REMOVE_NOC_ROOT](transactions/pki.md#remove_noc_root-rcac) <br><br> Removes a NOC root certificate (RCAC) | CLI `dcld tx pki remove-noc-x509-root-cert --subject=<base64 string> --subject-key-id=<hex string> ...` <br><br> POST `/cosmos/tx/v1beta1/txs`([MsgRemoveNocX509RootCert](https://github.com/zigbee-alliance/distributed-compliance-ledger/blob/master/proto/zigbeealliance/distributedcomplianceledger/pki/tx.proto#L235)) |
208209
| [ADD_NOC_ICA](transactions/pki.md#add_noc_ica-icac) <br><br> Adds a NOC ica certificate (ICAC) | CLI `dcld tx pki add-noc-x509-ica-cert --certificate=<string-or-path> ...` <br><br> POST `/cosmos/tx/v1beta1/txs`([MsgAddNocX509IcaCert](https://github.com/zigbee-alliance/distributed-compliance-ledger/blob/master/proto/zigbeealliance/distributedcomplianceledger/pki/tx.proto#L193)) |
209210
| [REVOKE_NOC_ICA](transactions/pki.md#revoke_noc_ica-icac) <br><br> Revokes a NOC ica certificate (ICAC) | CLI `dcld tx pki revoke-noc-x509-ica-cert --subject=<base64 string> --subject-key-id=<hex string> ...` <br><br> POST `/cosmos/tx/v1beta1/txs`([MsgRevokeNocX509IcaCert](https://github.com/zigbee-alliance/distributed-compliance-ledger/blob/master/proto/zigbeealliance/distributedcomplianceledger/pki/tx.proto#L215)) |
210211
| [REMOVE_NOC_ICA](transactions/pki.md#remove_noc_ica-icac) <br><br> Remove a NOC ica certificate (ICAC) | CLI `dcld tx pki remove-noc-x509-ica-cert --subject=<base64 string> --subject-key-id=<hex string> ...` <br><br> POST `/cosmos/tx/v1beta1/txs`([MsgRemoveNocX509IcaCert](https://github.com/zigbee-alliance/distributed-compliance-ledger/blob/master/proto/zigbeealliance/distributedcomplianceledger/pki/tx.proto#L228)) |

‎x/pki/client/cli/query_noc_certificates.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func CmdShowNocCertificates() *cobra.Command {
5959

6060
cmd := &cobra.Command{
6161
Use: "noc-x509-cert",
62-
Short: "Gets certificates (either root or ica) by one of property combinations: " +
62+
Short: "Gets NOC certificates (either root or ica) by one of property combinations: " +
6363
"'subject + subject-key-id' or 'VID and subject-key-id' or just 'subject-key-id'",
6464
Args: cobra.ExactArgs(0),
6565
RunE: func(cmd *cobra.Command, args []string) (err error) {
@@ -68,6 +68,12 @@ func CmdShowNocCertificates() *cobra.Command {
6868
return err
6969
}
7070

71+
if vid != 0 && subject != "" && subjectKeyID != "" {
72+
return clientCtx.PrintString("Incorrect parameters combination. " +
73+
"You must provide '--subject, --subject-key-id' or '--vid , --subject-key-id' or " +
74+
"just '--subject-key-id'")
75+
}
76+
7177
if subject != "" && subjectKeyID != "" {
7278
var res types.NocCertificates
7379

0 commit comments

Comments
 (0)