add more fields to the policy resource (#19)

https://linear.app/pomerium/issue/ENG-1762/policyresource-expose-all-fields
pomerium · Jan 2, 2025 · 1f9ae99 · 1f9ae99
1 parent 6ac235f
commit 1f9ae99
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/example/main.tf b/example/main.tf
@@ -41,6 +41,10 @@ resource "pomerium_settings" "settings" {
 resource "pomerium_policy" "test_policy" {
   name         = "test-policy"
   namespace_id = pomerium_namespace.test_namespace.id
+  description  = "test policy"
+  enforced     = false
+  explanation  = "test policy explanation"
+  remediation  = "test policy remediation"
   ppl          = <<EOF
 - allow:
     and:

diff --git a/internal/provider/policy.go b/internal/provider/policy.go
@@ -51,6 +51,10 @@ func (r *PolicyResource) Schema(_ context.Context, _ resource.SchemaRequest, res
 					stringplanmodifier.UseStateForUnknown(),
 				},
 			},
+			"description": schema.StringAttribute{
+				Description: "Description of the policy.",
+				Optional:    true,
+			},
 			"name": schema.StringAttribute{
 				Description: "Name of the policy.",
 				Required:    true,
@@ -64,6 +68,23 @@ func (r *PolicyResource) Schema(_ context.Context, _ resource.SchemaRequest, res
 				Required:    true,
 				CustomType:  PolicyLanguageType{},
 			},
+			"rego": schema.ListAttribute{
+				Description: "Rego policies.",
+				Optional:    true,
+				ElementType: types.StringType,
+			},
+			"enforced": schema.BoolAttribute{
+				Description: "Whether the policy is enforced within the namespace hierarchy.",
+				Optional:    true,
+			},
+			"explanation": schema.StringAttribute{
+				Description: "Explanation of the policy.",
+				Optional:    true,
+			},
+			"remediation": schema.StringAttribute{
+				Description: "Remediation of the policy.",
+				Optional:    true,
+			},
 		},
 	}
 }

diff --git a/internal/provider/policy_model.go b/internal/provider/policy_model.go
@@ -12,19 +12,29 @@ import (
 type PolicyModel struct {
 	ID          types.String   `tfsdk:"id"`
 	Name        types.String   `tfsdk:"name"`
+	Description types.String   `tfsdk:"description"`
 	NamespaceID types.String   `tfsdk:"namespace_id"`
 	PPL         PolicyLanguage `tfsdk:"ppl"`
+	Rego        types.List     `tfsdk:"rego"`
+	Enforced    types.Bool     `tfsdk:"enforced"`
+	Explanation types.String   `tfsdk:"explanation"`
+	Remediation types.String   `tfsdk:"remediation"`
 }
 
-func ConvertPolicyToPB(_ context.Context, src *PolicyResourceModel) (*pb.Policy, diag.Diagnostics) {
+func ConvertPolicyToPB(ctx context.Context, src *PolicyResourceModel) (*pb.Policy, diag.Diagnostics) {
 	var diagnostics diag.Diagnostics
 
 	pbPolicy := &pb.Policy{
 		Id:          src.ID.ValueString(),
 		Name:        src.Name.ValueString(),
+		Description: src.Description.ValueString(),
 		NamespaceId: src.NamespaceID.ValueString(),
 		Ppl:         string(src.PPL.PolicyJSON),
+		Enforced:    src.Enforced.ValueBool(),
+		Explanation: src.Explanation.ValueString(),
+		Remediation: src.Remediation.ValueString(),
 	}
+	diagnostics.Append(src.Rego.ElementsAs(ctx, &pbPolicy.Rego, false)...)
 
 	return pbPolicy, diagnostics
 }
@@ -34,7 +44,12 @@ func ConvertPolicyFromPB(dst *PolicyResourceModel, src *pb.Policy) diag.Diagnost
 
 	dst.ID = types.StringValue(src.Id)
 	dst.Name = types.StringValue(src.Name)
+	dst.Description = types.StringValue(src.Description)
 	dst.NamespaceID = types.StringValue(src.NamespaceId)
+	dst.Enforced = types.BoolValue(src.Enforced)
+	dst.Explanation = types.StringValue(src.Explanation)
+	dst.Remediation = types.StringValue(src.Remediation)
+	dst.Rego = FromStringSlice(src.Rego)
 	ppl, err := PolicyLanguageType{}.Parse(types.StringValue(src.Ppl))
 	if err != nil {
 		diagnostics.AddError("converting PPL", err.Error())