Merge pull request #9 from knikolov82/master

Fix expected properties in issuing template response when using cloud.

Author: knikolov82

src/main/java/com/venafi/vcert/sdk/connectors/cloud/domain/CertificateIssuingTemplate.java

@@ -3,6 +3,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
+import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import com.venafi.vcert.sdk.certificate.KeyType;
@@ -29,9 +30,8 @@ public class CertificateIssuingTemplate {
   public List<String> subjectSTRegexes;
   public List<String> subjectLRegexes;
   public List<String> subjectCValues;
+  @SerializedName("sanRegexes")
   public List<String> sanDnsNameRegexes;
-  public List<String> sanIpAddressRegexes;
-  public List<String> sanRfc822NameRegexes;
   public List<AllowedKeyType> keyTypes;
   public Boolean keyReuse;
 
@@ -52,7 +52,6 @@ public Policy toPolicy() {
         .subjectCRegexes(subjectCValues).subjectLRegexes(subjectLRegexes)
         .subjectORegexes(subjectORegexes).subjectOURegexes(subjectOURegexes)
         .subjectSTRegexes(subjectSTRegexes).dnsSanRegExs(sanDnsNameRegexes)
-        .ipSanRegExs(sanIpAddressRegexes).emailSanRegExs(sanRfc822NameRegexes)
         .allowedKeyConfigurations(allowedKeyConfigurations).allowKeyReuse(keyReuse).build();
     return policy;
   }

src/test/java/com/venafi/vcert/sdk/connectors/cloud/CloudConnectorIT.java

@@ -102,8 +102,8 @@ void readZoneConfiguration() throws VCertException {
         .containsExactly(2048);
     assertThat(zoneConfiguration.policy().allowedKeyConfigurations().get(0).keyCurves()).isNull();
     assertThat(zoneConfiguration.policy().dnsSanRegExs()).containsExactly("^.*$");
-    assertThat(zoneConfiguration.policy().ipSanRegExs()).isEmpty();
-    assertThat(zoneConfiguration.policy().emailSanRegExs()).isEmpty();
+    assertThat(zoneConfiguration.policy().ipSanRegExs()).isNull();
+    assertThat(zoneConfiguration.policy().emailSanRegExs()).isNull();
     assertThat(zoneConfiguration.policy().uriSanRegExs()).isNull();
     assertThat(zoneConfiguration.policy().upnSanRegExs()).isNull();
     assertThat(zoneConfiguration.policy().allowWildcards()).isFalse();

src/test/java/com/venafi/vcert/sdk/connectors/cloud/CloudConnectorTest.java

@@ -81,8 +81,6 @@ void requestCertificate() throws VCertException {
     cit.subjectLRegexes(Arrays.asList());
     cit.subjectCValues(Arrays.asList());
     cit.sanDnsNameRegexes(Arrays.asList());
-    cit.sanIpAddressRegexes(Arrays.asList());
-    cit.sanRfc822NameRegexes(Arrays.asList());
 
     ProjectZone projectZone = new ProjectZone("12215be0-ff0a-11e9-a3f0-2b5db8116980",
         "1a972260-fee7-11e9-a554-e72621a8452f", "My Zone", null, cit);

src/test/resources/mappings/cloud.projectzones.tag.default.json

@@ -58,14 +58,8 @@
                 "subjectCValues":[
                   "^.*$"
                 ],
-                "sanDnsNameRegexes":[
+                "sanRegexes":[
                   "^.*$"
-                ],
-                "sanRfc822NameRegexes":[
-
-                ],
-                "sanIpAddressRegexes":[
-
                 ],
                 "rsaKeyLengths":[
                   2048