Merge pull request #36 from IBM/shacharn-3850-sign-fail

1.0.40 - fixes in private cert

Author: ShacharN

README.md

@@ -44,14 +44,14 @@ Service name | Imported class name
 <dependency>
     <groupId>com.ibm.cloud</groupId>
     <artifactId>secrets-manager</artifactId>
-    <version>1.0.39</version>
+    <version>1.0.40</version>
 </dependency>
 ```
 
 ##### Gradle
 
 ```gradle
-'com.ibm.cloud:secrets-manager:1.0.37'
+'com.ibm.cloud:secrets-manager:1.0.40'
 ```
 
 ## Authentication

modules/common/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>secrets-manager-sdk</artifactId>
         <groupId>com.ibm.cloud</groupId>
-        <version>1.0.39</version>
+        <version>1.0.40</version>
         <relativePath>../..</relativePath>
     </parent>
 

modules/coverage-reports/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>secrets-manager-sdk</artifactId>
         <groupId>com.ibm.cloud</groupId>
-        <version>1.0.39</version>
+        <version>1.0.40</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/secrets-manager/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secrets-manager-sdk</artifactId>
         <groupId>com.ibm.cloud</groupId>
-        <version>1.0.39</version>
+        <version>1.0.40</version>
         <relativePath>../..</relativePath>
     </parent>
 

modules/secrets-manager/src/main/java/com/ibm/cloud/secrets_manager_sdk/secrets_manager/v1/SecretsManager.java

@@ -12,7 +12,7 @@
  */
 
 /*
- * IBM OpenAPI SDK Code Generator Version: 3.47.1-be944570-20220406-170244
+ * IBM OpenAPI SDK Code Generator Version: 3.48.0-e80b60a1-20220414-145125
  */
 
 package com.ibm.cloud.secrets_manager_sdk.secrets_manager.v1;

modules/secrets-manager/src/main/java/com/ibm/cloud/secrets_manager_sdk/secrets_manager/v1/model/CertificateSecretResource.java

@@ -67,7 +67,7 @@ public static class Builder {
         private String privateKey;
         private String intermediate;
         private CertificateValidity validity;
-        private List<String> altNames;
+        private Object altNames;
 
         public Builder(SecretResource certificateSecretResource) {
             this.name = certificateSecretResource.name;
@@ -121,22 +121,6 @@ public Builder addLabels(String labels) {
             return this;
         }
 
-        /**
-         * Adds an altNames to altNames.
-         *
-         * @param altNames the new altNames
-         * @return the CertificateSecretResource builder
-         */
-        public Builder addAltNames(String altNames) {
-            com.ibm.cloud.sdk.core.util.Validator.notNull(altNames,
-                    "altNames cannot be null");
-            if (this.altNames == null) {
-                this.altNames = new ArrayList<String>();
-            }
-            this.altNames.add(altNames);
-            return this;
-        }
-
         /**
          * Set the name.
          *
@@ -228,12 +212,11 @@ public Builder validity(CertificateValidity validity) {
 
         /**
          * Set the altNames.
-         * Existing altNames will be replaced.
          *
          * @param altNames the altNames
          * @return the CertificateSecretResource builder
          */
-        public Builder altNames(List<String> altNames) {
+        public Builder altNames(Object altNames) {
             this.altNames = altNames;
             return this;
         }

modules/secrets-manager/src/main/java/com/ibm/cloud/secrets_manager_sdk/secrets_manager/v1/model/CertificateTemplateConfig.java

@@ -26,8 +26,7 @@ public class CertificateTemplateConfig extends ConfigElementDefConfig {
      * The type of private key to generate for private certificates and the type of key that is expected for submitted
      * certificate signing requests (CSRs).
      * <p>
-     * Allowable values are: `rsa`, `ec` and `any`. A value of `any` allow keys of either type and with any bit size. The
-     * bit size must be greater than 1024 bits for RSA keys.
+     * Allowable values are: `rsa` and `ec`.
      */
     public interface KeyType {
         /**
@@ -38,10 +37,6 @@ public interface KeyType {
          * ec.
          */
         String EC = "ec";
-        /**
-         * any.
-         */
-        String ANY = "any";
     }
 
 
@@ -52,7 +47,7 @@ public static class Builder {
         private String certificateAuthority;
         private String allowedSecretGroups;
         private Object maxTtl;
-        private String ttl;
+        private Object ttl;
         private Boolean allowLocalhost;
         private List<String> allowedDomains;
         private Boolean allowedDomainsTemplate;
@@ -416,7 +411,7 @@ public Builder maxTtl(Object maxTtl) {
          * @param ttl the ttl
          * @return the CertificateTemplateConfig builder
          */
-        public Builder ttl(String ttl) {
+        public Builder ttl(Object ttl) {
             this.ttl = ttl;
             return this;
         }

modules/secrets-manager/src/main/java/com/ibm/cloud/secrets_manager_sdk/secrets_manager/v1/model/CertificateTemplatesConfig.java

@@ -0,0 +1,21 @@
+/*
+ * (C) Copyright IBM Corp. 2022.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.ibm.cloud.secrets_manager_sdk.secrets_manager.v1.model;
+
+/**
+ * Certificate templates configuration.
+ */
+public class CertificateTemplatesConfig extends GetConfigElementsResourcesItem {
+
+}
+

modules/secrets-manager/src/main/java/com/ibm/cloud/secrets_manager_sdk/secrets_manager/v1/model/CertificateTemplatesConfigItem.java

@@ -0,0 +1,95 @@
+/*
+ * (C) Copyright IBM Corp. 2022.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.ibm.cloud.secrets_manager_sdk.secrets_manager.v1.model;
+
+import com.ibm.cloud.sdk.core.service.model.GenericModel;
+
+/**
+ * Certificate templates configuration.
+ */
+public class CertificateTemplatesConfigItem extends GenericModel {
+
+    /**
+     * The type of configuration. Value options differ depending on the `config_element` property that you want to define.
+     */
+    public interface Type {
+        /**
+         * letsencrypt.
+         */
+        String LETSENCRYPT = "letsencrypt";
+        /**
+         * letsencrypt-stage.
+         */
+        String LETSENCRYPT_STAGE = "letsencrypt-stage";
+        /**
+         * cis.
+         */
+        String CIS = "cis";
+        /**
+         * classic_infrastructure.
+         */
+        String CLASSIC_INFRASTRUCTURE = "classic_infrastructure";
+        /**
+         * root_certificate_authority.
+         */
+        String ROOT_CERTIFICATE_AUTHORITY = "root_certificate_authority";
+        /**
+         * intermediate_certificate_authority.
+         */
+        String INTERMEDIATE_CERTIFICATE_AUTHORITY = "intermediate_certificate_authority";
+        /**
+         * certificate_template.
+         */
+        String CERTIFICATE_TEMPLATE = "certificate_template";
+    }
+
+    protected String name;
+    protected String type;
+    protected CertificateTemplateConfig config;
+
+    /**
+     * Gets the name.
+     * <p>
+     * The human-readable name to assign to your configuration.
+     *
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Gets the type.
+     * <p>
+     * The type of configuration. Value options differ depending on the `config_element` property that you want to define.
+     *
+     * @return the type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Gets the config.
+     * <p>
+     * Properties that describe a certificate template. You can use a certificate template to control the parameters that
+     * are applied to your issued private certificates. For more information, see the
+     * [docs](https://cloud.ibm.com/docs/secrets-manager?topic=secrets-manager-certificate-templates).
+     *
+     * @return the config
+     */
+    public CertificateTemplateConfig getConfig() {
+        return config;
+    }
+}
+

modules/secrets-manager/src/main/java/com/ibm/cloud/secrets_manager_sdk/secrets_manager/v1/model/ConfigAction.java

@@ -36,10 +36,6 @@ public interface Format {
          * pem.
          */
         String PEM = "pem";
-        /**
-         * der.
-         */
-        String DER = "der";
         /**
          * pem_bundle.
          */
@@ -49,14 +45,14 @@ public interface Format {
     @SerializedName("common_name")
     protected String commonName;
     @SerializedName("alt_names")
-    protected List<String> altNames;
+    protected String altNames;
     @SerializedName("ip_sans")
     protected String ipSans;
     @SerializedName("uri_sans")
     protected String uriSans;
     @SerializedName("other_sans")
     protected List<String> otherSans;
-    protected String ttl;
+    protected Object ttl;
     protected String format;
     @SerializedName("max_path_length")
     protected Long maxPathLength;
@@ -105,7 +101,7 @@ public String commonName() {
      *
      * @return the altNames
      */
-    public List<String> altNames() {
+    public String altNames() {
         return altNames;
     }
 
@@ -149,14 +145,14 @@ public List<String> otherSans() {
     /**
      * Gets the ttl.
      * <p>
-     * The time-to-live (TTL) or lease duration to assign to a private certificate.
+     * The time-to-live (TTL) to assign to a private certificate.
      * <p>
      * The value can be supplied as a string representation of a duration in hours, such as `12h`. The value can't exceed
      * the `max_ttl` that is defined in the associated certificate template.
      *
      * @return the ttl
      */
-    public String ttl() {
+    public Object ttl() {
         return ttl;
     }
 
@@ -233,7 +229,7 @@ public Boolean useCsrValues() {
     /**
      * Gets the ou.
      * <p>
-     * The Organizational Unit (OU) values to define in the subject field of the resulting CA certificate.
+     * The Organizational Unit (OU) values to define in the subject field of the resulting certificate.
      *
      * @return the ou
      */
@@ -244,7 +240,7 @@ public List<String> ou() {
     /**
      * Gets the organization.
      * <p>
-     * The Organization (O) values to define in the subject field of the resulting CA certificate.
+     * The Organization (O) values to define in the subject field of the resulting certificate.
      *
      * @return the organization
      */
@@ -255,7 +251,7 @@ public List<String> organization() {
     /**
      * Gets the country.
      * <p>
-     * The Country (C) values to define in the subject field of the resulting CA certificate.
+     * The Country (C) values to define in the subject field of the resulting certificate.
      *
      * @return the country
      */
@@ -266,7 +262,7 @@ public List<String> country() {
     /**
      * Gets the locality.
      * <p>
-     * The Locality (L) values to define in the subject field of the resulting CA certificate.
+     * The Locality (L) values to define in the subject field of the resulting certificate.
      *
      * @return the locality
      */
@@ -277,7 +273,7 @@ public List<String> locality() {
     /**
      * Gets the province.
      * <p>
-     * The Province (ST) values to define in the subject field of the resulting CA certificate.
+     * The Province (ST) values to define in the subject field of the resulting certificate.
      *
      * @return the province
      */
@@ -288,7 +284,7 @@ public List<String> province() {
     /**
      * Gets the streetAddress.
      * <p>
-     * The Street Address values in the subject field of the resulting CA certificate.
+     * The Street Address values in the subject field of the resulting certificate.
      *
      * @return the streetAddress
      */
@@ -299,7 +295,7 @@ public List<String> streetAddress() {
     /**
      * Gets the postalCode.
      * <p>
-     * The Postal Code values in the subject field of the resulting CA certificate.
+     * The Postal Code values in the subject field of the resulting certificate.
      *
      * @return the postalCode
      */
@@ -310,8 +306,8 @@ public List<String> postalCode() {
     /**
      * Gets the serialNumber.
      * <p>
-     * The serial number to assign to the generated private certificate. To assign a random serial number, you can omit
-     * this field.
+     * The serial number to assign to the generated certificate. To assign a random serial number, you can omit this
+     * field.
      *
      * @return the serialNumber
      */