Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.

Commit bafc48a

Browse files
fix: VCertTknClient SDK methods are working again
The VCertTknClient SDK methods left to work since the releases v.0.9.0 until v0.9.2 given a mistake which caused the endpoints used in the background were the specific endpoints declared for the VCertClient. Also it was created a bunch of tests to test the VCertTknClient SDK methods in order to confirm they are working correctly. Resolves: #115
1 parent f12fc7e commit bafc48a

12 files changed

Lines changed: 22 additions & 8 deletions

File tree

src/main/java/com/venafi/vcert/sdk/VCertTknClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.venafi.vcert.sdk.connectors.Connector;
88
import com.venafi.vcert.sdk.connectors.TokenConnector;
99
import com.venafi.vcert.sdk.connectors.tpp.TokenInfo;
10-
import com.venafi.vcert.sdk.connectors.tpp.Tpp;
10+
import com.venafi.vcert.sdk.connectors.tpp.TppToken;
1111
import com.venafi.vcert.sdk.connectors.tpp.TppTokenConnector;
1212
import com.venafi.vcert.sdk.endpoint.Authentication;
1313

@@ -22,7 +22,7 @@ protected Connector createConnector(Config config) throws VCertException {
2222
Connector connector;
2323
switch (config.connectorType()) {
2424
case TPP_TOKEN:{
25-
connector = new TppTokenConnector(Tpp.connect(config));
25+
connector = new TppTokenConnector(TppToken.connect(config));
2626
break;
2727
}
2828
default:

src/main/java/com/venafi/vcert/sdk/connectors/cloud/CloudConnector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ public static class ApiClientInformation{
703703
public static class CsrAttributes {
704704
private String commonName;
705705
private String organization;
706-
private String[] organizationalUnits;
706+
//private String[] organizationalUnits;
707707
private String locality;
708708
private String state;
709709
private String country;

src/main/java/com/venafi/vcert/sdk/connectors/cloud/CloudConnectorUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ public static CsrAttributes buildCsrAttributes(CertificateRequest request, Polic
388388
}
389389

390390
//computing the organizational Units
391-
List<String> reqOrgUnits = Optional.ofNullable(request).map(req -> req.subject()).map(s -> s.organizationalUnit()).orElse(null);
391+
/*List<String> reqOrgUnits = Optional.ofNullable(request).map(req -> req.subject()).map(s -> s.organizationalUnit()).orElse(null);
392392
393393
if( reqOrgUnits!=null && reqOrgUnits.size() > 0) {
394394
String[] reqOrgUnitsArray = reqOrgUnits.toArray(new String[0]);
@@ -405,7 +405,7 @@ public static CsrAttributes buildCsrAttributes(CertificateRequest request, Polic
405405
406406
if(defaultOrgUnits!=null && defaultOrgUnits.length>0)
407407
csrAttributes.organizationalUnits(defaultOrgUnits);
408-
}
408+
}*/
409409

410410
//computing the localities
411411
List<String> reqLocalities = Optional.ofNullable(request).map(req -> req.subject()).map(s -> s.locality()).orElse(null);

src/main/java/com/venafi/vcert/sdk/connectors/tpp/TppConnector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public ZoneConfiguration readZoneConfiguration(String zone) throws VCertExceptio
169169
Policy policy = serverPolicy.toPolicy();
170170
ZoneConfiguration zoneConfig = serverPolicy.toZoneConfig();
171171
zoneConfig.policy(policy);
172-
zoneConfig.zoneId(zone);
172+
zoneConfig.zoneId(getPolicyDN(zone));
173173
return zoneConfig;
174174
}
175175

src/test/java/com/venafi/vcert/sdk/VCertTknClientTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.venafi.vcert.sdk;
22

3+
import com.venafi.vcert.sdk.Config;
4+
import com.venafi.vcert.sdk.VCertException;
5+
import com.venafi.vcert.sdk.VCertTknClient;
36
import com.venafi.vcert.sdk.certificate.CertificateRequest;
47
import com.venafi.vcert.sdk.certificate.ImportRequest;
58
import com.venafi.vcert.sdk.certificate.RenewalRequest;

src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppConnectorATForSSH.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.venafi.vcert.sdk.certificate.SshCertificateRequest;
2525
import com.venafi.vcert.sdk.certificate.SshConfig;
2626
import com.venafi.vcert.sdk.endpoint.Authentication;
27+
import com.venafi.vcert.sdk.utils.TppTestUtils;
2728

2829
class TppConnectorATForSSH {
2930

src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorAT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.venafi.vcert.sdk.connectors.ZoneConfiguration;
3030
import com.venafi.vcert.sdk.endpoint.Authentication;
3131
import com.venafi.vcert.sdk.policy.domain.PolicySpecification;
32+
import com.venafi.vcert.sdk.utils.TppTestUtils;
3233

3334
import feign.FeignException;
3435
import feign.FeignException.BadRequest;

src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorATForSSH.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.venafi.vcert.sdk.certificate.SshCertificateRequest;
2626
import com.venafi.vcert.sdk.certificate.SshConfig;
2727
import com.venafi.vcert.sdk.endpoint.Authentication;
28+
import com.venafi.vcert.sdk.utils.TppTestUtils;
2829

2930
class TppTokenConnectorATForSSH {
3031

src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorPolicyAT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import com.venafi.vcert.sdk.connectors.tpp.endpoint.ValidateIdentityRequest;
88
import com.venafi.vcert.sdk.connectors.tpp.endpoint.ValidateIdentityResponse;
99
import com.venafi.vcert.sdk.policy.domain.PolicySpecification;
10+
import com.venafi.vcert.sdk.utils.TppTestUtils;
11+
1012
import org.junit.jupiter.api.Assertions;
1113
import org.junit.jupiter.api.DisplayName;
1214
import org.junit.jupiter.api.Test;

src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import com.venafi.vcert.sdk.policy.converter.tpp.TPPPolicySpecificationValidator;
1717
import com.venafi.vcert.sdk.policy.domain.PolicySpecification;
1818
import com.venafi.vcert.sdk.policy.domain.PolicySpecificationConst;
19+
import com.venafi.vcert.sdk.utils.TppTestUtils;
20+
1921
import feign.FeignException;
2022
import feign.Request;
2123
import feign.Response;

0 commit comments

Comments
 (0)