fix rbac resource

pluralsh · Jul 25, 2024 · d20e1af · d20e1af
1 parent bfd5e84
commit d20e1af
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 34 deletions.
diff --git a/example/user/main.tf b/example/user/main.tf
@@ -26,11 +26,14 @@ resource "plural_group" "test" {
   description = "test group"
 }
 
-resource "plural_group" "empty" {
-  name = "empty"
-}
-
-resource "plural_group_member" "test" {
-  user_id = data.plural_user.user.id
-  group_id = plural_group.test.id
+resource "plural_rbac" "rbac" {
+  service_id = "624bff88-05e3-45f6-bc3b-44708594e28e"
+  bindings = {
+    read  = [{
+      user_id = data.plural_user.user.id
+    }]
+    write = [{
+      user_id = data.plural_user.user.id
+    }]
+  }
 }
diff --git a/internal/model/rbac.go b/internal/model/rbac.go
@@ -13,7 +13,7 @@ import (
 type RBAC struct {
 	ClusterId types.String     `tfsdk:"cluster_id"`
 	ServiceId types.String     `tfsdk:"service_id"`
-	Bindings  *common.Bindings `tfsdk:"rbac"`
+	Bindings  *common.Bindings `tfsdk:"bindings"`
 }
 
 func (rbac *RBAC) Attributes(ctx context.Context, d diag.Diagnostics) gqlclient.RbacAttributes {

diff --git a/internal/resource/rbac.go b/internal/resource/rbac.go
@@ -8,6 +8,8 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/objectplanmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 
 	"terraform-provider-plural/internal/client"
 	"terraform-provider-plural/internal/common"
@@ -56,19 +58,13 @@ func (r *rbacResource) Schema(_ context.Context, _ resource.SchemaRequest, resp
 						NestedObject: schema.NestedAttributeObject{
 							Attributes: map[string]schema.Attribute{
 								"group_id": schema.StringAttribute{
-									Description:         "",
-									MarkdownDescription: "",
-									Optional:            true,
+									Optional: true,
 								},
 								"id": schema.StringAttribute{
-									Description:         "",
-									MarkdownDescription: "",
-									Optional:            true,
+									Optional: true,
 								},
 								"user_id": schema.StringAttribute{
-									Description:         "",
-									MarkdownDescription: "",
-									Optional:            true,
+									Optional: true,
 								},
 							},
 						},
@@ -80,24 +76,19 @@ func (r *rbacResource) Schema(_ context.Context, _ resource.SchemaRequest, resp
 						NestedObject: schema.NestedAttributeObject{
 							Attributes: map[string]schema.Attribute{
 								"group_id": schema.StringAttribute{
-									Description:         "",
-									MarkdownDescription: "",
-									Optional:            true,
+									Optional: true,
 								},
 								"id": schema.StringAttribute{
-									Description:         "",
-									MarkdownDescription: "",
-									Optional:            true,
+									Optional: true,
 								},
 								"user_id": schema.StringAttribute{
-									Description:         "",
-									MarkdownDescription: "",
-									Optional:            true,
+									Optional: true,
 								},
 							},
 						},
 					},
 				},
+				PlanModifiers: []planmodifier.Object{objectplanmodifier.UseStateForUnknown()},
 			},
 		},
 	}
@@ -122,45 +113,44 @@ func (r *rbacResource) Configure(_ context.Context, req resource.ConfigureReques
 }
 
 func (r *rbacResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
-	var data model.RBAC
+	data := new(model.RBAC)
 	resp.Diagnostics.Append(req.Plan.Get(ctx, data)...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
 	_, err := r.client.UpdateRbac(ctx, data.Attributes(ctx, resp.Diagnostics), data.ServiceId.ValueStringPointer(), data.ClusterId.ValueStringPointer(), nil)
 	if err != nil {
-		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to update rbac, got error: %s", err))
+		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to update RBAC, got error: %s", err))
 		return
 	}
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }
 
-func (r *rbacResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
+func (r *rbacResource) Read(_ context.Context, _ resource.ReadRequest, _ *resource.ReadResponse) {
 	// ignore
 }
 
 func (r *rbacResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
-	var data model.RBAC
+	data := new(model.RBAC)
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &data)...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
 	_, err := r.client.UpdateRbac(ctx, data.Attributes(ctx, resp.Diagnostics), data.ServiceId.ValueStringPointer(), data.ClusterId.ValueStringPointer(), nil)
 	if err != nil {
-		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to update rbac, got error: %s", err))
+		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to update RBAC, got error: %s", err))
 		return
 	}
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }
 
-func (r *rbacResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
+func (r *rbacResource) Delete(_ context.Context, _ resource.DeleteRequest, _ *resource.DeleteResponse) {
 	// ignore
 }
 
-func (r *rbacResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
-	// ignore
+func (r *rbacResource) ImportState(_ context.Context, _ resource.ImportStateRequest, _ *resource.ImportStateResponse) {
 }