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
Venafi · Sep 1, 2022 · bafc48a · bafc48a
1 parent f12fc7e
commit bafc48a
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 8 deletions.
diff --git a/src/main/java/com/venafi/vcert/sdk/VCertTknClient.java b/src/main/java/com/venafi/vcert/sdk/VCertTknClient.java
@@ -7,7 +7,7 @@
 import com.venafi.vcert.sdk.connectors.Connector;
 import com.venafi.vcert.sdk.connectors.TokenConnector;
 import com.venafi.vcert.sdk.connectors.tpp.TokenInfo;
-import com.venafi.vcert.sdk.connectors.tpp.Tpp;
+import com.venafi.vcert.sdk.connectors.tpp.TppToken;
 import com.venafi.vcert.sdk.connectors.tpp.TppTokenConnector;
 import com.venafi.vcert.sdk.endpoint.Authentication;
 
@@ -22,7 +22,7 @@ protected Connector createConnector(Config config) throws VCertException {
     	Connector connector;
     	switch (config.connectorType()) {
     	case TPP_TOKEN:{
-    		connector = new TppTokenConnector(Tpp.connect(config));
+    		connector = new TppTokenConnector(TppToken.connect(config));
     		break;
     	}
     	default:

diff --git a/src/main/java/com/venafi/vcert/sdk/connectors/cloud/CloudConnector.java b/src/main/java/com/venafi/vcert/sdk/connectors/cloud/CloudConnector.java
@@ -703,7 +703,7 @@ public static class ApiClientInformation{
   public static class CsrAttributes {
 	  private String commonName;
 	  private String organization;
-	  private String[] organizationalUnits;
+	  //private String[] organizationalUnits;
 	  private String locality;
 	  private String state;
 	  private String country;

diff --git a/src/main/java/com/venafi/vcert/sdk/connectors/cloud/CloudConnectorUtils.java b/src/main/java/com/venafi/vcert/sdk/connectors/cloud/CloudConnectorUtils.java
@@ -388,7 +388,7 @@ public static CsrAttributes buildCsrAttributes(CertificateRequest request, Polic
   	  }
 
   	  //computing the organizational Units
-  	  List<String> reqOrgUnits = Optional.ofNullable(request).map(req -> req.subject()).map(s -> s.organizationalUnit()).orElse(null);
+  	  /*List<String> reqOrgUnits = Optional.ofNullable(request).map(req -> req.subject()).map(s -> s.organizationalUnit()).orElse(null);
 
   	  if( reqOrgUnits!=null && reqOrgUnits.size() > 0) {
   		  String[] reqOrgUnitsArray = reqOrgUnits.toArray(new String[0]);
@@ -405,7 +405,7 @@ public static CsrAttributes buildCsrAttributes(CertificateRequest request, Polic
 
   		  if(defaultOrgUnits!=null && defaultOrgUnits.length>0)
   			  csrAttributes.organizationalUnits(defaultOrgUnits);
-  	  }
+  	  }*/
 
   	  //computing the localities
   	  List<String> reqLocalities = Optional.ofNullable(request).map(req -> req.subject()).map(s -> s.locality()).orElse(null);

diff --git a/src/main/java/com/venafi/vcert/sdk/connectors/tpp/TppConnector.java b/src/main/java/com/venafi/vcert/sdk/connectors/tpp/TppConnector.java
@@ -169,7 +169,7 @@ public ZoneConfiguration readZoneConfiguration(String zone) throws VCertExceptio
     Policy policy = serverPolicy.toPolicy();
     ZoneConfiguration zoneConfig = serverPolicy.toZoneConfig();
     zoneConfig.policy(policy);
-    zoneConfig.zoneId(zone);
+    zoneConfig.zoneId(getPolicyDN(zone));
     return zoneConfig;
   }
 

diff --git a/src/test/java/com/venafi/vcert/sdk/VCertTknClientTest.java b/src/test/java/com/venafi/vcert/sdk/VCertTknClientTest.java
@@ -1,5 +1,8 @@
 package com.venafi.vcert.sdk;
 
+import com.venafi.vcert.sdk.Config;
+import com.venafi.vcert.sdk.VCertException;
+import com.venafi.vcert.sdk.VCertTknClient;
 import com.venafi.vcert.sdk.certificate.CertificateRequest;
 import com.venafi.vcert.sdk.certificate.ImportRequest;
 import com.venafi.vcert.sdk.certificate.RenewalRequest;

diff --git a/src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppConnectorATForSSH.java b/src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppConnectorATForSSH.java
@@ -24,6 +24,7 @@
 import com.venafi.vcert.sdk.certificate.SshCertificateRequest;
 import com.venafi.vcert.sdk.certificate.SshConfig;
 import com.venafi.vcert.sdk.endpoint.Authentication;
+import com.venafi.vcert.sdk.utils.TppTestUtils;
 
 class TppConnectorATForSSH {
 

diff --git a/src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorAT.java b/src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorAT.java
@@ -29,6 +29,7 @@
 import com.venafi.vcert.sdk.connectors.ZoneConfiguration;
 import com.venafi.vcert.sdk.endpoint.Authentication;
 import com.venafi.vcert.sdk.policy.domain.PolicySpecification;
+import com.venafi.vcert.sdk.utils.TppTestUtils;
 
 import feign.FeignException;
 import feign.FeignException.BadRequest;

diff --git a/src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorATForSSH.java b/src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorATForSSH.java
@@ -25,6 +25,7 @@
 import com.venafi.vcert.sdk.certificate.SshCertificateRequest;
 import com.venafi.vcert.sdk.certificate.SshConfig;
 import com.venafi.vcert.sdk.endpoint.Authentication;
+import com.venafi.vcert.sdk.utils.TppTestUtils;
 
 class TppTokenConnectorATForSSH {
 

diff --git a/src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorPolicyAT.java b/src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorPolicyAT.java
@@ -7,6 +7,8 @@
 import com.venafi.vcert.sdk.connectors.tpp.endpoint.ValidateIdentityRequest;
 import com.venafi.vcert.sdk.connectors.tpp.endpoint.ValidateIdentityResponse;
 import com.venafi.vcert.sdk.policy.domain.PolicySpecification;
+import com.venafi.vcert.sdk.utils.TppTestUtils;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

diff --git a/src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorTest.java b/src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorTest.java
@@ -16,6 +16,8 @@
 import com.venafi.vcert.sdk.policy.converter.tpp.TPPPolicySpecificationValidator;
 import com.venafi.vcert.sdk.policy.domain.PolicySpecification;
 import com.venafi.vcert.sdk.policy.domain.PolicySpecificationConst;
+import com.venafi.vcert.sdk.utils.TppTestUtils;
+
 import feign.FeignException;
 import feign.Request;
 import feign.Response;

diff --git a/...cert/sdk/connectors/tpp/TppTestUtils.java → .../venafi/vcert/sdk/utils/TppTestUtils.java b/...cert/sdk/connectors/tpp/TppTestUtils.java → .../venafi/vcert/sdk/utils/TppTestUtils.java
@@ -1,4 +1,4 @@
-package com.venafi.vcert.sdk.connectors.tpp;
+package com.venafi.vcert.sdk.utils;
 
 import java.time.Instant;
 

diff --git a/...t/sdk/VCertTknClientAuthenticationAT.java → ...lient/VCertTknClientAuthenticationAT.java b/...t/sdk/VCertTknClientAuthenticationAT.java → ...lient/VCertTknClientAuthenticationAT.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.venafi.vcert.sdk;
+package com.venafi.vcert.sdk.vcertTknClient;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -12,6 +12,10 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.venafi.vcert.sdk.Config;
+import com.venafi.vcert.sdk.TestUtils;
+import com.venafi.vcert.sdk.VCertException;
+import com.venafi.vcert.sdk.VCertTknClient;
 import com.venafi.vcert.sdk.connectors.ConnectorException.MissingCredentialsException;
 import com.venafi.vcert.sdk.connectors.tpp.TokenInfo;
 import com.venafi.vcert.sdk.endpoint.Authentication;