From 922ac2aa4201573dc2211a5e16f004383656c692 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Fri, 5 Jun 2020 08:58:48 -0700 Subject: [PATCH 1/2] Open API Csr rename update (#394) * openapi csr rename update --- .../okta/sdk/tests/it/ApplicationsIT.groovy | 18 ++++---- src/swagger/api.yaml | 46 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/ApplicationsIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/ApplicationsIT.groovy index 5d09ba3f5f7..3c5cde7f81d 100644 --- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/ApplicationsIT.groovy +++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/ApplicationsIT.groovy @@ -36,10 +36,10 @@ import com.okta.sdk.resource.application.BasicAuthApplication import com.okta.sdk.resource.application.BookmarkApplication import com.okta.sdk.resource.application.BookmarkApplicationSettings import com.okta.sdk.resource.application.BookmarkApplicationSettingsApplication -import com.okta.sdk.resource.application.Csr -import com.okta.sdk.resource.application.CsrMetadata -import com.okta.sdk.resource.application.CsrMetadataSubject -import com.okta.sdk.resource.application.CsrMetadataSubjectAltNames +import com.okta.sdk.resource.application.CertificateSigningRequest +import com.okta.sdk.resource.application.CertificateSigningRequestMetadata +import com.okta.sdk.resource.application.CertificateSigningRequestMetadataSubject +import com.okta.sdk.resource.application.CertificateSigningRequestMetadataSubjectAltNames import com.okta.sdk.resource.application.JsonWebKey import com.okta.sdk.resource.application.JsonWebKeyList import com.okta.sdk.resource.application.OAuth2ScopeConsentGrant @@ -531,7 +531,7 @@ class ApplicationsIT extends ITSupport { } @Test - void csrTest() { + void certificateSigningRequestTest() { Client client = getClient() String label = "app-${uniqueTestName}" @@ -562,19 +562,19 @@ class ApplicationsIT extends ITSupport { assertThat(app.getStatus(), equalTo(Application.StatusEnum.ACTIVE)) // create csr metadata - CsrMetadata csrMetadata = client.instantiate(CsrMetadata) - .setSubject(client.instantiate(CsrMetadataSubject) + CertificateSigningRequestMetadata csrMetadata = client.instantiate(CertificateSigningRequestMetadata) + .setSubject(client.instantiate(CertificateSigningRequestMetadataSubject) .setCountryName("US") .setStateOrProvinceName("California") .setLocalityName("San Francisco") .setOrganizationName("Okta, Inc.") .setOrganizationalUnitName("Dev") .setCommonName("SP Issuer")) - .setSubjectAltNames(client.instantiate(CsrMetadataSubjectAltNames) + .setSubjectAltNames(client.instantiate(CertificateSigningRequestMetadataSubjectAltNames) .setDnsNames(["dev.okta.com"])) // generate csr with metadata - Csr csr = app.generateCsr(csrMetadata) + CertificateSigningRequest csr = app.generateCsr(csrMetadata) // verify assertPresent(app.listCsrs(), csr) diff --git a/src/swagger/api.yaml b/src/swagger/api.yaml index 9a33cf077bd..7db645e9522 100644 --- a/src/swagger/api.yaml +++ b/src/swagger/api.yaml @@ -204,7 +204,7 @@ paths: get: consumes: - application/json - description: Enumerates CSRs for an application + description: Enumerates Certificate Signing Requests for an application operationId: listCsrsForApplication parameters: - in: path @@ -218,11 +218,11 @@ paths: description: Success schema: items: - $ref: '#/definitions/Csr' + $ref: '#/definitions/CertificateSigningRequest' type: array security: - api_token: [] - summary: List CSRs for Application + summary: List Certificate Signing Requests for Application tags: - Application post: @@ -241,17 +241,17 @@ paths: name: metadata required: true schema: - $ref: '#/definitions/CsrMetadata' + $ref: '#/definitions/CertificateSigningRequestMetadata' produces: - application/json responses: '201': description: Created schema: - $ref: '#/definitions/Csr' + $ref: '#/definitions/CertificateSigningRequest' security: - api_token: [] - summary: Generate CSR for Application + summary: Generate Certificate Signing Request for Application tags: - Application '/api/v1/apps/{appId}/credentials/csrs/{csrId}': @@ -296,7 +296,7 @@ paths: '200': description: Success schema: - $ref: '#/definitions/Csr' + $ref: '#/definitions/CertificateSigningRequest' security: - api_token: [] tags: @@ -3122,7 +3122,7 @@ paths: get: consumes: - application/json - description: Enumerates signing CSRs for an IdP + description: Enumerates Certificate Signing Requests for an IdP operationId: listCsrsForIdentityProvider parameters: - in: path @@ -3136,11 +3136,11 @@ paths: description: Success schema: items: - $ref: '#/definitions/Csr' + $ref: '#/definitions/CertificateSigningRequest' type: array security: - api_token: [] - summary: List Signing CSRs for IdP + summary: List Certificate Signing Requests for IdP tags: - IdentityProvider post: @@ -3159,24 +3159,24 @@ paths: name: metadata required: true schema: - $ref: '#/definitions/CsrMetadata' + $ref: '#/definitions/CertificateSigningRequestMetadata' produces: - application/pkcs10 responses: '201': description: Created schema: - $ref: '#/definitions/Csr' + $ref: '#/definitions/CertificateSigningRequest' security: - api_token: [] - summary: Generate Signing CSR for IdP + summary: Generate Certificate Signing Request for IdP tags: - IdentityProvider '/api/v1/idps/{idpId}/credentials/csrs/{csrId}': delete: consumes: - application/json - description: Revoke a CSR and delete the key pair from the IdP + description: Revoke a Certificate Signing Request and delete the key pair from the IdP operationId: revokeCsrForIdentityProvider parameters: - in: path @@ -3199,7 +3199,7 @@ paths: get: consumes: - application/json - description: Gets a specific CSR model by id + description: Gets a specific Certificate Signing Request model by id operationId: getCsrForIdentityProvider parameters: - in: path @@ -3216,7 +3216,7 @@ paths: '200': description: Success schema: - $ref: '#/definitions/Csr' + $ref: '#/definitions/CertificateSigningRequest' security: - api_token: [] tags: @@ -3226,7 +3226,7 @@ paths: consumes: - application/json description: >- - Update the CSR with a signed X.509 certificate and add it into the + Update the Certificate Signing Request with a signed X.509 certificate and add it into the signing key credentials for the IdP. parameters: - in: path @@ -7542,7 +7542,7 @@ definitions: template_swa: '#/definitions/SwaApplication' template_swa3field: '#/definitions/SwaThreeFieldApplication' propertyName: name - Csr: + CertificateSigningRequest: properties: created: format: date-time @@ -7560,15 +7560,15 @@ definitions: type: object x-okta-tags: - Application - CsrMetadata: + CertificateSigningRequestMetadata: properties: subject: - $ref: '#/definitions/CsrMetadataSubject' + $ref: '#/definitions/CertificateSigningRequestMetadataSubject' subjectAltNames: - $ref: '#/definitions/CsrMetadataSubjectAltNames' + $ref: '#/definitions/CertificateSigningRequestMetadataSubjectAltNames' x-okta-tags: - Application - CsrMetadataSubject: + CertificateSigningRequestMetadataSubject: properties: commonName: type: string @@ -7584,7 +7584,7 @@ definitions: type: string x-okta-tags: - Application - CsrMetadataSubjectAltNames: + CertificateSigningRequestMetadataSubjectAltNames: properties: dnsNames: items: From 1e1c6f52ce97a4b3eb53bdfc29bacf7fd5f752f0 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Fri, 5 Jun 2020 09:37:27 -0700 Subject: [PATCH 2/2] Merge pull request #396 --- .../com/okta/sdk/impl/client/DefaultClientBuilderTest.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/impl/src/test/groovy/com/okta/sdk/impl/client/DefaultClientBuilderTest.groovy b/impl/src/test/groovy/com/okta/sdk/impl/client/DefaultClientBuilderTest.groovy index 64b78a72e09..c616a53f6b0 100644 --- a/impl/src/test/groovy/com/okta/sdk/impl/client/DefaultClientBuilderTest.groovy +++ b/impl/src/test/groovy/com/okta/sdk/impl/client/DefaultClientBuilderTest.groovy @@ -61,6 +61,7 @@ class DefaultClientBuilderTest { System.clearProperty("okta.client.clientId") System.clearProperty("okta.client.scopes") System.clearProperty("okta.client.privateKey") + System.clearProperty("okta.client.connectionTimeout") RestoreEnvironmentVariables.setEnvironmentVariable("OKTA_CLIENT_TOKEN", null) RestoreEnvironmentVariables.setEnvironmentVariable("OKTA_CLIENT_ORGURL", null) @@ -68,6 +69,7 @@ class DefaultClientBuilderTest { RestoreEnvironmentVariables.setEnvironmentVariable("OKTA_CLIENT_CLIENTID", null) RestoreEnvironmentVariables.setEnvironmentVariable("OKTA_CLIENT_SCOPES", null) RestoreEnvironmentVariables.setEnvironmentVariable("OKTA_CLIENT_PRIVATEKEY", null) + RestoreEnvironmentVariables.setEnvironmentVariable("OKTA_CLIENT_CONNECTIONTIMEOUT", null) } @Test