Add support for key_usage

Author: Ilya Sher

src/main/java/com/bettercloud/vault/api/pki/Pki.java

@@ -9,6 +9,8 @@
 import com.bettercloud.vault.rest.RestResponse;
 
 import java.util.List;
+import java.util.stream.Collectors;
+
 
 /**
  * <p>The implementing class for operations on Vault's PKI backend.</p>
@@ -484,14 +486,7 @@ private String roleOptionsToJson(final RoleOptions options) {
             addJsonFieldIfNotNull(jsonObject, "max_ttl", options.getMaxTtl());
             addJsonFieldIfNotNull(jsonObject, "allow_localhost", options.getAllowLocalhost());
             if (options.getAllowedDomains() != null && options.getAllowedDomains().size() > 0) {
-                final StringBuilder allowedDomains = new StringBuilder();
-                for (int index = 0; index < options.getAllowedDomains().size(); index++) {
-                    allowedDomains.append(options.getAllowedDomains().get(index));
-                    if (index + 1 < options.getAllowedDomains().size()) {
-                        allowedDomains.append(',');
-                    }
-                }
-                addJsonFieldIfNotNull(jsonObject, "allowed_domains", allowedDomains.toString());
+                addJsonFieldIfNotNull(jsonObject, "allowed_domains", options.getAllowedDomains().stream().collect(Collectors.joining(",")));
             }
             addJsonFieldIfNotNull(jsonObject, "allow_spiffe_name", options.getAllowSpiffename());
             addJsonFieldIfNotNull(jsonObject, "allow_bare_domains", options.getAllowBareDomains());
@@ -507,6 +502,9 @@ private String roleOptionsToJson(final RoleOptions options) {
             addJsonFieldIfNotNull(jsonObject, "key_bits", options.getKeyBits());
             addJsonFieldIfNotNull(jsonObject, "use_csr_common_name", options.getUseCsrCommonName());
             addJsonFieldIfNotNull(jsonObject, "use_csr_sans", options.getUseCsrSans());
+            if (options.getKeyUsage() != null && options.getKeyUsage().size() > 0) {
+                addJsonFieldIfNotNull(jsonObject, "key_usage", options.getKeyUsage().stream().collect(Collectors.joining(",")));
+            }
         }
         return jsonObject.toString();
     }

src/main/java/com/bettercloud/vault/api/pki/RoleOptions.java

@@ -35,12 +35,11 @@ public class RoleOptions implements Serializable {
     private String keyType;
     private Long keyBits;
     private Boolean useCsrCommonName;
-
-
     private Boolean allowSpiffename;
+    private Boolean useCsrSans;
+    private List<String> keyUsage;
 
 
-    private Boolean useCsrSans;
     /**
      * @param ttl (optional) The Time To Live value provided as a string duration with time suffix. Hour is the largest suffix.  If not set, uses the system default value or the value of max_ttl, whichever is shorter.
      *
@@ -293,4 +292,13 @@ public Boolean getUseCsrCommonName() {
     public Boolean getUseCsrSans() {        return useCsrSans;    }
     public Boolean getAllowSpiffename() {        return allowSpiffename;    }
 
+
+    public RoleOptions keyUsage(List<String> keyUsage) {
+        this.keyUsage = keyUsage;
+        return this;
+    }
+
+    public List<String> getKeyUsage() {
+        return keyUsage;
+    }
 }