Support updating labels and metadata

evertrust · Jan 16, 2024 · 65eb1ff · 65eb1ff
1 parent 9b8dd13
commit 65eb1ff
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 26 deletions.
diff --git a/horizon/resource_certificate.go b/horizon/resource_certificate.go
@@ -45,7 +45,6 @@ func resourceCertificate() *schema.Resource {
 			"certificate": {
 				Description: "PEM-encoded enrolled certificate.",
 				Type:        schema.TypeString,
-				Optional:    false,
 				Computed:    true,
 			},
 			"thumbprint": {
@@ -83,16 +82,19 @@ func resourceCertificate() *schema.Resource {
 							Description: "Subject element.",
 							Type:        schema.TypeString,
 							Required:    true,
+							ForceNew:    true,
 						},
 						"type": {
 							Description: "Subject element type.",
 							Type:        schema.TypeString,
 							Required:    true,
+							ForceNew:    true,
 						},
 						"value": {
 							Description: "Subject element value.",
 							Type:        schema.TypeString,
 							Required:    true,
+							ForceNew:    true,
 						},
 					},
 				},
@@ -108,6 +110,7 @@ func resourceCertificate() *schema.Resource {
 							Description: "SAN element type. Can be: \"RFC822NAME\", \"DNSNAME\", \"URI\", \"IPADDRESS\", \"OTHERNAME_UPN\", \"OTHERNAME_GUID\".",
 							Type:        schema.TypeString,
 							Required:    true,
+							ForceNew:    true,
 						},
 						"value": {
 							Description: "SAN element values.",
@@ -116,6 +119,7 @@ func resourceCertificate() *schema.Resource {
 								Type: schema.TypeString,
 							},
 							Required: true,
+							ForceNew: true,
 						},
 					},
 				},
@@ -291,27 +295,14 @@ func resourceCertificateUpdate(ctx context.Context, d *schema.ResourceData, m in
 
 	var diags diag.Diagnostics
 
-	// Revoke the old certificate
-	certificate, ok := d.GetOk("certificate")
-	if ok {
-		_, err := c.Requests.NewRevokeRequest(horizontypes.WebRARevokeRequestParams{
-			RevocationReason: horizontypes.Superseded,
-			CertificatePEM:   certificate.(string),
-		})
-		if err != nil {
-			return diag.FromErr(err)
-		}
-	}
-
-	template, err := utils.EnrollTemplateFromResource(c, d)
+	template, err := utils.UpdateTemplateFromResource(c, d)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	resp, err := c.Requests.NewEnrollRequest(horizontypes.WebRAEnrollRequestParams{
-		Profile:  d.Get("profile").(string),
-		Template: template,
-		Password: d.Get("password").(string),
+	resp, err := c.Requests.NewUpdateRequest(horizontypes.WebRAUpdateRequestParams{
+		CertificateId: d.Id(),
+		Template:      template,
 	})
 
 	if err != nil {
@@ -320,14 +311,6 @@ func resourceCertificateUpdate(ctx context.Context, d *schema.ResourceData, m in
 
 	utils.FillCertificateSchema(d, resp.Certificate)
 
-	if resp.Pkcs12 != nil {
-		d.Set("pkcs12", resp.Pkcs12.Value)
-	}
-
-	if resp.Password != nil {
-		d.Set("password", resp.Password.Value)
-	}
-
 	return diags
 }
 

diff --git a/utils/utils.go b/utils/utils.go
@@ -126,3 +126,47 @@ func EnrollTemplateFromResource(c *horizon.Client, d *schema.ResourceData) (*hor
 
 	return template, nil
 }
+
+func UpdateTemplateFromResource(c *horizon.Client, d *schema.ResourceData) (*horizontypes.WebRAUpdateTemplate, error) {
+	var template *horizontypes.WebRAUpdateTemplate
+
+	template, err := c.Requests.GetUpdateTemplate(horizontypes.WebRAUpdateTemplateParams{
+		CertificateId: d.Id(),
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	// Set Labels
+	var labels []horizontypes.LabelElement
+	labelElements := d.Get("labels").(*schema.Set)
+	for _, labelElement := range labelElements.List() {
+		label := labelElement.(map[string]interface{})
+		labels = append(labels, horizontypes.LabelElement{
+			Label: label["label"].(string),
+			Value: &horizontypes.String{String: label["value"].(string)},
+		})
+	}
+	template.Labels = labels
+
+	// Get owner
+	owner, hasOwner := d.GetOk("owner")
+	if hasOwner {
+		template.Owner = &horizontypes.OwnerElement{Value: &horizontypes.String{String: owner.(string)}}
+	}
+
+	// Get team
+	team, hasTeam := d.GetOk("team")
+	if hasTeam {
+		template.Team = &horizontypes.TeamElement{Value: &horizontypes.String{String: team.(string)}}
+	}
+
+	// Get contact email
+	contactEmail, hasContactEmail := d.GetOk("contact_email")
+	if hasContactEmail {
+		template.ContactEmail = &horizontypes.ContactEmailElement{Value: &horizontypes.String{String: contactEmail.(string)}}
+	}
+
+	return template, nil
+}