Merge pull request #48 from IBM/haim

User-provided CSR

Author: haimsch

common/version.go

@@ -17,4 +17,4 @@
 package common
 
 // Version of the SDK
-const Version = "1.0.47"
+const Version = "1.0.48"

secretsmanagerv1/secrets_manager_v1.go

@@ -15,7 +15,7 @@
  */
 
 /*
- * IBM OpenAPI SDK Code Generator Version: 3.60.0-13f6e1ba-20221019-164457
+ * IBM OpenAPI SDK Code Generator Version: 3.60.2-95dc7721-20221102-203229
  */
 
 // Package secretsmanagerv1 : Operations and models for the SecretsManagerV1 service
@@ -6923,6 +6923,7 @@ func UnmarshalRotation(m map[string]json.RawMessage, result interface{}) (err er
 // - RotateUsernamePasswordSecretBody
 // - RotateCertificateBody
 // - RotatePrivateCertBody
+// - RotatePrivateCertBodyWithCsr
 // - RotatePrivateCertBodyWithVersionCustomMetadata
 // - RestoreIamCredentialsSecretBody
 // - DeleteCredentialsForIamCredentialsSecret
@@ -6952,6 +6953,12 @@ type SecretAction struct {
 	// The new intermediate certificate to associate with the certificate.
 	Intermediate *string `json:"intermediate,omitempty"`
 
+	// The certificate signing request. If you provide a CSR, it is used for auto rotation and manual rotation requests
+	// that do not include a CSR. If you don't include the CSR, the certificate is generated with the last CSR that you
+	// provided to create the private certificate, or on a previous request to rotate the certificate. If no CSR was
+	// provided in the past, the certificate is generated with a CSR that is created internally.
+	Csr *string `json:"csr,omitempty"`
+
 	// The ID of the target version or the alias `previous`.
 	VersionID *string `json:"version_id,omitempty"`
 
@@ -7010,6 +7017,10 @@ func UnmarshalSecretAction(m map[string]json.RawMessage, result interface{}) (er
 	if err != nil {
 		return
 	}
+	err = core.UnmarshalPrimitive(m, "csr", &obj.Csr)
+	if err != nil {
+		return
+	}
 	err = core.UnmarshalPrimitive(m, "version_id", &obj.VersionID)
 	if err != nil {
 		return
@@ -8101,6 +8112,11 @@ type SecretResource struct {
 	// The intermediate certificate authority that signed this certificate.
 	CertificateAuthority *string `json:"certificate_authority,omitempty"`
 
+	// The certificate signing request. If you don't include this parameter, the CSR that is used to generate the
+	// certificate is created internally. If you provide a CSR, it is used also for auto rotation and manual rotation,
+	// unless you provide another CSR in the manual rotation request.
+	Csr *string `json:"csr,omitempty"`
+
 	// The IP Subject Alternative Names to define for the CA certificate, in a comma-delimited list.
 	IPSans *string `json:"ip_sans,omitempty"`
 
@@ -8366,6 +8382,10 @@ func UnmarshalSecretResource(m map[string]json.RawMessage, result interface{}) (
 	if err != nil {
 		return
 	}
+	err = core.UnmarshalPrimitive(m, "csr", &obj.Csr)
+	if err != nil {
+		return
+	}
 	err = core.UnmarshalPrimitive(m, "ip_sans", &obj.IPSans)
 	if err != nil {
 		return
@@ -13387,7 +13407,13 @@ type PrivateCertificateSecretResource struct {
 	// The intermediate certificate authority that signed this certificate.
 	CertificateAuthority *string `json:"certificate_authority,omitempty"`
 
-	// The fully qualified domain name or host domain name for the certificate.
+	// The certificate signing request. If you don't include this parameter, the CSR that is used to generate the
+	// certificate is created internally. If you provide a CSR, it is used also for auto rotation and manual rotation,
+	// unless you provide another CSR in the manual rotation request.
+	Csr *string `json:"csr,omitempty"`
+
+	// The fully qualified domain name or host domain name for the certificate. If you provide a CSR that includes a common
+	// name value, the certificate is generated with the common name that is provided in the CSR.
 	CommonName *string `json:"common_name" validate:"required"`
 
 	// The alternative names that are defined for the certificate.
@@ -13455,7 +13481,8 @@ type PrivateCertificateSecretResource struct {
 	// The data that is associated with the secret. The data object contains the following fields:
 	//
 	// - `certificate`: The contents of the certificate.
-	// - `private_key`: The private key that is associated with the certificate.
+	// - `private_key`: The private key that is associated with the certificate. If you provide a CSR in the request, the
+	// private_key field is not included in the data.
 	// - `issuing_ca`: The certificate of the certificate authority that signed and issued this certificate.
 	// - `ca_chain`: The chain of certificate authorities that are associated with the certificate.
 	SecretData map[string]interface{} `json:"secret_data,omitempty"`
@@ -13581,6 +13608,10 @@ func UnmarshalPrivateCertificateSecretResource(m map[string]json.RawMessage, res
 	if err != nil {
 		return
 	}
+	err = core.UnmarshalPrimitive(m, "csr", &obj.Csr)
+	if err != nil {
+		return
+	}
 	err = core.UnmarshalPrimitive(m, "common_name", &obj.CommonName)
 	if err != nil {
 		return
@@ -15231,6 +15262,54 @@ func UnmarshalRotatePrivateCertBody(m map[string]json.RawMessage, result interfa
 	return
 }
 
+// RotatePrivateCertBodyWithCsr : The body of a request to rotate a private certificate.
+// This model "extends" SecretAction
+type RotatePrivateCertBodyWithCsr struct {
+	// The certificate signing request. If you provide a CSR, it is used for auto rotation and manual rotation requests
+	// that do not include a CSR. If you don't include the CSR, the certificate is generated with the last CSR that you
+	// provided to create the private certificate, or on a previous request to rotate the certificate. If no CSR was
+	// provided in the past, the certificate is generated with a CSR that is created internally.
+	Csr *string `json:"csr" validate:"required"`
+
+	// The secret metadata that a user can customize.
+	CustomMetadata map[string]interface{} `json:"custom_metadata,omitempty"`
+
+	// The secret version metadata that a user can customize.
+	VersionCustomMetadata map[string]interface{} `json:"version_custom_metadata,omitempty"`
+}
+
+// NewRotatePrivateCertBodyWithCsr : Instantiate RotatePrivateCertBodyWithCsr (Generic Model Constructor)
+func (*SecretsManagerV1) NewRotatePrivateCertBodyWithCsr(csr string) (_model *RotatePrivateCertBodyWithCsr, err error) {
+	_model = &RotatePrivateCertBodyWithCsr{
+		Csr: core.StringPtr(csr),
+	}
+	err = core.ValidateStruct(_model, "required parameters")
+	return
+}
+
+func (*RotatePrivateCertBodyWithCsr) isaSecretAction() bool {
+	return true
+}
+
+// UnmarshalRotatePrivateCertBodyWithCsr unmarshals an instance of RotatePrivateCertBodyWithCsr from the specified map of raw messages.
+func UnmarshalRotatePrivateCertBodyWithCsr(m map[string]json.RawMessage, result interface{}) (err error) {
+	obj := new(RotatePrivateCertBodyWithCsr)
+	err = core.UnmarshalPrimitive(m, "csr", &obj.Csr)
+	if err != nil {
+		return
+	}
+	err = core.UnmarshalPrimitive(m, "custom_metadata", &obj.CustomMetadata)
+	if err != nil {
+		return
+	}
+	err = core.UnmarshalPrimitive(m, "version_custom_metadata", &obj.VersionCustomMetadata)
+	if err != nil {
+		return
+	}
+	reflect.ValueOf(result).Elem().Set(reflect.ValueOf(obj))
+	return
+}
+
 // RotatePrivateCertBodyWithVersionCustomMetadata : The request body of a rotate private certificate action.
 // This model "extends" SecretAction
 type RotatePrivateCertBodyWithVersionCustomMetadata struct {

secretsmanagerv1/secrets_manager_v1_test.go

@@ -10106,6 +10106,12 @@ var _ = Describe(`SecretsManagerV1`, func() {
 				Expect(_model).ToNot(BeNil())
 				Expect(err).To(BeNil())
 			})
+			It(`Invoke NewRotatePrivateCertBodyWithCsr successfully`, func() {
+				csr := "testString"
+				_model, err := secretsManagerService.NewRotatePrivateCertBodyWithCsr(csr)
+				Expect(_model).ToNot(BeNil())
+				Expect(err).To(BeNil())
+			})
 			It(`Invoke NewRotatePrivateCertBodyWithVersionCustomMetadata successfully`, func() {
 				versionCustomMetadata := map[string]interface{}{"anyKey": "anyValue"}
 				_model, err := secretsManagerService.NewRotatePrivateCertBodyWithVersionCustomMetadata(versionCustomMetadata)