Skip to content

Commit 9981a0e

Browse files
ArtemkaaasArtemkaaas
committed
Renamed endpoints for noc certificates
1 parent f22ed9f commit 9981a0e

File tree

10 files changed

+312
-281
lines changed

10 files changed

+312
-281
lines changed

‎docs/transactions/transactions.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1633,7 +1633,7 @@ Use [GET_REVOKED_NOC_ICA](#get_revoked_noc_ica-icac) to get a revoked ica certif
16331633
- CLI command:
16341634
- `dcld query pki noc-x509-cert --subject=<base64 string> --subject-key-id=<hex string>`
16351635
- REST API:
1636-
- GET `/dcl/pki/noc-certificates/{subject}/{subject_key_id}`
1636+
- GET `/dcl/pki/all-noc-certificates/{subject}/{subject_key_id}`
16371637

16381638
#### GET_NOC_ROOT_BY_VID (RCACs)
16391639

@@ -1704,7 +1704,7 @@ Use [GET_ALL_REVOKED_NOC_ICA](#get_all_revoked_noc_ica-icacs) to get a list of a
17041704
- CLI command:
17051705
- `dcld query pki all-noc-subject-x509-certs --subject=<base64 string>`
17061706
- REST API:
1707-
- GET `/dcl/pki/noc-certificates/{subject}`
1707+
- GET `/dcl/pki/all-noc-certificates/{subject}`
17081708

17091709
#### GET_REVOKED_NOC_ROOT (RCAC)
17101710

‎integration_tests/constants/upgrade_1_4_4_da_intermediate_cert

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIICKTCCAc+gAwIBAgIUPiZ8EuCMDG+LVlcHIJK8b8ao3v0wCgYIKoZIzj0EAwIw
3+
RTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGElu
4+
dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0yNDExMDUxMzQzMjFaGA8zMDI0MDMw
5+
ODEzNDMyMVowgYIxCzAJBgNVBAYTAlVaMRMwEQYDVQQIDApTb21lIFN0YXRlMRMw
6+
EQYDVQQHDApTb21lIFN0YXRlMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAX
7+
BgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xFDASBgNVBAMMC05PQy1jaGlsZC0zMFkw
8+
EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEePd2pOUOQOh7HQ1gG0imOtG9P2KWQoQj
9+
cskkDiS475E1n2WtYvXu49ZEt1FAyLC88mBvMMzPaWn7/TlFNC3X4KNdMFswHQYD
10+
VR0OBBYEFKiglRibn4FNx59etYIJJ5UTDJ+HMB8GA1UdIwQYMBaAFKiglRibn4FN
11+
x59etYIJJ5UTDJ+HMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgGCMAoGCCqGSM49
12+
BAMCA0gAMEUCIAdfKhO6Kn75tgGue/xHT0rd+z/zefM4YPNA/hDWWdISAiEAsbx/
13+
Df72UGIF7EFn4Ap/VOPg2IQIily74snXWl9uhag=
14+
-----END CERTIFICATE-----

‎integration_tests/constants/upgrade_1_4_4_da_intermediate_cert_2

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIICHzCCAcWgAwIBAgIUKsTloDKSh341om/H3t6MP4x29IQwCgYIKoZIzj0EAwIw
3+
OzELMAkGA1UEBhMCVEUxEzARBgNVBAgMClNvbWUtU3RhdGUxFzAVBgNVBAoMDlVw
4+
Z3JhZGUxLjQuNF8xMCAXDTI0MTEwNTEzNTQxOFoYDzMwMjQwMzA4MTM1NDE4WjCB
5+
gjELMAkGA1UEBhMCVVoxEzARBgNVBAgMClNvbWUgU3RhdGUxEzARBgNVBAcMClNv
6+
bWUgU3RhdGUxGDAWBgNVBAoMD0V4YW1wbGUgQ29tcGFueTEZMBcGA1UECwwQVGVz
7+
dGluZyBEaXZpc2lvbjEUMBIGA1UEAwwLTk9DLWNoaWxkLTMwWTATBgcqhkjOPQIB
8+
BggqhkjOPQMBBwNCAAR493ak5Q5A6HsdDWAbSKY60b0/YpZChCNyySQOJLjvkTWf
9+
Za1i9e7j1kS3UUDIsLzyYG8wzM9pafv9OUU0Ldfgo10wWzAdBgNVHQ4EFgQUqKCV
10+
GJufgU3Hn161ggknlRMMn4cwHwYDVR0jBBgwFoAUqKCVGJufgU3Hn161ggknlRMM
11+
n4cwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCAYIwCgYIKoZIzj0EAwIDSAAwRQIg
12+
CnZrbAP9jNdIuLRqmCQy0mIWhoe36mahkDmMkZETNVsCIQCBkgL1dpo8dxdPYw4v
13+
9fJhwtmAbX26+FMLm4Yr9su+ZQ==
14+
-----END CERTIFICATE-----

‎integration_tests/constants/upgrade_1_4_4_da_root_cert

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIB4DCCAYWgAwIBAgIUFiQ4/IBEWGVJ7hA0exUeyCu0i3cwCgYIKoZIzj0EAwIw
3+
RTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGElu
4+
dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yNDExMDUxMzQxMjNaFw0zNDExMDMx
5+
MzQxMjNaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYD
6+
VQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwWTATBgcqhkjOPQIBBggqhkjO
7+
PQMBBwNCAAR493ak5Q5A6HsdDWAbSKY60b0/YpZChCNyySQOJLjvkTWfZa1i9e7j
8+
1kS3UUDIsLzyYG8wzM9pafv9OUU0Ldfgo1MwUTAdBgNVHQ4EFgQUqKCVGJufgU3H
9+
n161ggknlRMMn4cwHwYDVR0jBBgwFoAUqKCVGJufgU3Hn161ggknlRMMn4cwDwYD
10+
VR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNJADBGAiEAwP316urSnoOge+/hc0nv
11+
dE+430sIZnC+Whr26sNC62sCIQCZC7blqbcCkioHYwQWykOYVVTYlx1AaVDh7Z5B
12+
GfDLMA==
13+
-----END CERTIFICATE-----

‎integration_tests/constants/upgrade_1_4_4_da_root_cert_2

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIByzCCAXGgAwIBAgIUZH3yzaAd7UYx7FnJ9bhVm16uOr4wCgYIKoZIzj0EAwIw
3+
OzELMAkGA1UEBhMCVEUxEzARBgNVBAgMClNvbWUtU3RhdGUxFzAVBgNVBAoMDlVw
4+
Z3JhZGUxLjQuNF8xMB4XDTI0MTEwNTEzNTMxMVoXDTM0MTEwMzEzNTMxMVowOzEL
5+
MAkGA1UEBhMCVEUxEzARBgNVBAgMClNvbWUtU3RhdGUxFzAVBgNVBAoMDlVwZ3Jh
6+
ZGUxLjQuNF8xMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEePd2pOUOQOh7HQ1g
7+
G0imOtG9P2KWQoQjcskkDiS475E1n2WtYvXu49ZEt1FAyLC88mBvMMzPaWn7/TlF
8+
NC3X4KNTMFEwHQYDVR0OBBYEFKiglRibn4FNx59etYIJJ5UTDJ+HMB8GA1UdIwQY
9+
MBaAFKiglRibn4FNx59etYIJJ5UTDJ+HMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZI
10+
zj0EAwIDSAAwRQIhALgih0vsNe2AFz3X8YrZ8KpfLVwZ+SAkxaCvC0dTqXVhAiBj
11+
X3e3OyWEITIBqpjIsxH5oSpYjf0/P/Hq4baV16b4XA==
12+
-----END CERTIFICATE-----

‎integration_tests/grpc_rest/pki/noc_cert_helpers.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func GetNocX509Cert(suite *utils.TestSuite, subject string, subjectKeyID string)
3030
var resp pkitypes.QueryGetNocCertificatesResponse
3131
err := suite.QueryREST(
3232
fmt.Sprintf(
33-
"/dcl/pki/noc-certificates/%s/%s",
33+
"/dcl/pki/all-noc-certificates/%s/%s",
3434
url.QueryEscape(subject), url.QueryEscape(subjectKeyID),
3535
),
3636
&resp,
@@ -67,7 +67,7 @@ func GetAllNocX509CertsBySubject(suite *utils.TestSuite, subject string) (*pkity
6767
var resp pkitypes.QueryGetNocCertificatesBySubjectResponse
6868
err := suite.QueryREST(
6969
fmt.Sprintf(
70-
"/dcl/pki/noc-certificates/%s",
70+
"/dcl/pki/all-noc-certificates/%s",
7171
url.QueryEscape(subject),
7272
),
7373
&resp,
@@ -108,7 +108,7 @@ func GetAllNocX509certsBySubjectKeyID(suite *utils.TestSuite, subjectKeyID strin
108108
func getAllNocX509Certs(suite *utils.TestSuite, subjectKeyID string) (res []pkitypes.NocCertificates, err error) {
109109
if suite.Rest {
110110
var resp pkitypes.QueryNocCertificatesResponse
111-
err := suite.QueryREST(fmt.Sprintf("/dcl/pki/noc-certificates?subjectKeyId=%s", subjectKeyID), &resp)
111+
err := suite.QueryREST(fmt.Sprintf("/dcl/pki/all-noc-certificates?subjectKeyId=%s", subjectKeyID), &resp)
112112
if err != nil {
113113
return nil, err
114114
}
@@ -290,7 +290,7 @@ func GetRevokedNocX509RootCert(suite *utils.TestSuite, subject string, subjectKe
290290
var resp pkitypes.QueryGetRevokedNocRootCertificatesResponse
291291
err := suite.QueryREST(
292292
fmt.Sprintf(
293-
"/dcl/pki/evoked-noc-root-certificates/%s/%s",
293+
"/dcl/pki/revoked-noc-root-certificates/%s/%s",
294294
url.QueryEscape(subject), url.QueryEscape(subjectKeyID),
295295
),
296296
&resp,
@@ -327,7 +327,7 @@ func GetRevokedNocX509IcaCert(suite *utils.TestSuite, subject string, subjectKey
327327
var resp pkitypes.QueryGetRevokedNocIcaCertificatesResponse
328328
err := suite.QueryREST(
329329
fmt.Sprintf(
330-
"/dcl/pki/evoked-noc-ica-certificates/%s/%s",
330+
"/dcl/pki/revoked-noc-ica-certificates/%s/%s",
331331
url.QueryEscape(subject), url.QueryEscape(subjectKeyID),
332332
),
333333
&resp,

0 commit comments

Comments
 (0)