add support email address

hashicorp · Aug 19, 2024 · 8912515 · 8912515
1 parent b9d9d41
commit 8912515
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 0 deletions.
diff --git a/docs/cdktf/python/resources/cert_request.md b/docs/cdktf/python/resources/cert_request.md
@@ -79,5 +79,6 @@ Optional:
 - `province` (String) Distinguished name: `ST`
 - `serial_number` (String) Distinguished name: `SERIALNUMBER`
 - `street_address` (List of String) Distinguished name: `STREET`
+- `email_address` (String) Email address: `emailAddress (x509 1.2.840.113549.1.9.1)`
 
 <!-- cache-key: cdktf-0.20.1 input-f0b329ca4c0554d420316e3aa077babdcc26589666ed69b639e7ed93d15ac558 -->
diff --git a/docs/cdktf/python/resources/self_signed_cert.md b/docs/cdktf/python/resources/self_signed_cert.md
@@ -86,6 +86,7 @@ Optional:
 - `province` (String) Distinguished name: `ST`
 - `serial_number` (String) Distinguished name: `SERIALNUMBER`
 - `street_address` (List of String) Distinguished name: `STREET`
+- `email_address` (String) Email address: `emailAddress (x509 1.2.840.113549.1.9.1)`
 
 ## Automatic Renewal
 

diff --git a/docs/resources/cert_request.md b/docs/resources/cert_request.md
@@ -66,3 +66,4 @@ Optional:
 - `province` (String) Distinguished name: `ST`
 - `serial_number` (String) Distinguished name: `SERIALNUMBER`
 - `street_address` (List of String) Distinguished name: `STREET`
+- `email_address` (String) Email address: `emailAddress (x509 1.2.840.113549.1.9.1)`
diff --git a/docs/resources/self_signed_cert.md b/docs/resources/self_signed_cert.md
@@ -79,6 +79,7 @@ Optional:
 - `province` (String) Distinguished name: `ST`
 - `serial_number` (String) Distinguished name: `SERIALNUMBER`
 - `street_address` (List of String) Distinguished name: `STREET`
+- `email_address` (String) Email address: `emailAddress (x509 1.2.840.113549.1.9.1)`
 
 ## Automatic Renewal
 

diff --git a/internal/provider/common_cert.go b/internal/provider/common_cert.go
@@ -386,5 +386,12 @@ func createSubjectDistinguishedNames(ctx context.Context, subject certificateSub
 		result.SerialNumber = subject.SerialNumber.ValueString()
 	}
 
+	if !subject.EmailAddress.IsNull() && !subject.EmailAddress.IsUnknown() {
+		result.ExtraNames = append(result.ExtraNames, pkix.AttributeTypeAndValue{
+			Type:  []int{1, 2, 840, 113549, 1, 9, 1},
+			Value: subject.EmailAddress.ValueString(),
+		})
+	}
+
 	return result
 }
diff --git a/internal/provider/models.go b/internal/provider/models.go
@@ -61,6 +61,7 @@ type certificateSubjectModel struct {
 	Country            types.String `tfsdk:"country"`
 	PostalCode         types.String `tfsdk:"postal_code"`
 	SerialNumber       types.String `tfsdk:"serial_number"`
+	EmailAddress       types.String `tfsdk:"email_address"`
 }
 
 type privateKeyResourceModel struct {

diff --git a/internal/provider/resource_cert_request.go b/internal/provider/resource_cert_request.go
@@ -193,6 +193,13 @@ func (r *certRequestResource) Schema(_ context.Context, req resource.SchemaReque
 							},
 							Description: "Distinguished name: `SERIALNUMBER`",
 						},
+						"email_address": schema.StringAttribute{
+							Optional: true,
+							PlanModifiers: []planmodifier.String{
+								stringplanmodifier.RequiresReplace(),
+							},
+							Description: "Email Address: `1.2.840.113549.1.9.1`",
+						},
 					},
 				},
 				MarkdownDescription: "The subject for which a certificate is being requested. " +