X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=certServiceK8sExternalProvider%2Fsrc%2Fcertserviceclient%2Fcert_service_client.go;h=4806c4a12f7b8cb2cbeebd95346d76c239f985c0;hb=af2527b17fb5f5242360cd908e4cae852b1f2512;hp=15b9062457ced0729ec17a5eed0449ea285dce45;hpb=15446c2ccfc117a0feb5a5249c2e62714b2cd3d7;p=oom%2Fplatform%2Fcert-service.git diff --git a/certServiceK8sExternalProvider/src/certserviceclient/cert_service_client.go b/certServiceK8sExternalProvider/src/certserviceclient/cert_service_client.go index 15b90624..4806c4a1 100644 --- a/certServiceK8sExternalProvider/src/certserviceclient/cert_service_client.go +++ b/certServiceK8sExternalProvider/src/certserviceclient/cert_service_client.go @@ -29,7 +29,7 @@ import ( const ( CsrHeaderName = "CSR" - PkHeaderName = "PK" + PkHeaderName = "PK" ) type CertServiceClient interface { @@ -38,7 +38,7 @@ type CertServiceClient interface { } type CertServiceClientImpl struct { - healthUrl string + healthUrl string certificationUrl string httpClient HTTPClient } @@ -52,6 +52,10 @@ type CertificatesResponse struct { TrustedCertificates []string `json:"trustedCertificates"` } +type ResponseException struct { + ErrorMessage string `json:"errorMessage"` +} + func (client *CertServiceClientImpl) CheckHealth() error { request, err := http.NewRequest("GET", client.healthUrl, nil) if err != nil { @@ -63,14 +67,13 @@ func (client *CertServiceClientImpl) CheckHealth() error { return err } - if response.StatusCode != 200 { + if response.StatusCode != http.StatusOK { return fmt.Errorf("health check retured status code [%d]", response.StatusCode) } return nil } - func (client *CertServiceClientImpl) GetCertificates(csr []byte, key []byte) (*CertificatesResponse, error) { request, err := http.NewRequest("GET", client.certificationUrl, nil) @@ -85,6 +88,13 @@ func (client *CertServiceClientImpl) GetCertificates(csr []byte, key []byte) (*C return nil, err } + if response.StatusCode != http.StatusOK { + var responseException ResponseException + err = json.NewDecoder(response.Body).Decode(&responseException) + return nil, fmt.Errorf("CertService API returned status code [%d] and message [%s]", + response.StatusCode, responseException.ErrorMessage) + } + var certificatesResponse CertificatesResponse err = json.NewDecoder(response.Body).Decode(&certificatesResponse) if err != nil {