fix: User resource and service context fixes (#76)

Author: maciaszczykm

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @pluralsh/server

docs/resources/user.md

@@ -18,6 +18,9 @@ user resource
 ### Required
 
 - `email` (String) Email address of this user.
+
+### Optional
+
 - `name` (String) Name of this user.
 
 ### Read-Only

example/user/main.tf

@@ -25,22 +25,22 @@ resource "plural_user" "spiderman" {
 # data "plural_group" "avengers" {
 #   name = "avengers"
 # }
-
-resource "plural_group" "avengers" {
-  name = "avengers"
-  description = "avengers group"
-}
-
-resource "plural_group_member" "spiderman" {
-  user_id = plural_user.spiderman.id
-  group_id = plural_group.avengers.id
-}
-
-resource "plural_group_member" "duplicate" {
-  user_id = plural_user.spiderman.id
-  group_id = plural_group.avengers.id
-}
-
+#
+# resource "plural_group" "avengers" {
+#   name = "avengers"
+#   description = "avengers group"
+# }
+#
+# resource "plural_group_member" "spiderman" {
+#   user_id = plural_user.spiderman.id
+#   group_id = plural_group.avengers.id
+# }
+#
+# resource "plural_group_member" "duplicate" {
+#   user_id = plural_user.spiderman.id
+#   group_id = plural_group.avengers.id
+# }
+#
 # resource "plural_rbac" "rbac" {
 #   service_id = "624bff88-05e3-45f6-bc3b-44708594e28e"
 #   bindings = {

go.mod

@@ -76,6 +76,10 @@ func (d *serviceContextDataSource) Read(ctx context.Context, req datasource.Read
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to read service context, got error: %s", err))
 		return
 	}
+	if response.ServiceContext == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to find service context, got no error")
+		return
+	}
 
 	data.From(response.ServiceContext, ctx, resp.Diagnostics)
 	resp.Diagnostics.Append(resp.State.Set(ctx, data)...)

go.sum

@@ -17,6 +17,6 @@ func (pra *PRAutomation) From(response *gqlclient.PrAutomationFragment) {
 	pra.Id = types.StringValue(response.ID)
 	pra.Name = types.StringValue(response.Name)
 	pra.Message = types.StringValue(response.Message)
-	pra.Identifier = types.StringValue(response.Identifier)
+	pra.Identifier = types.StringPointerValue(response.Identifier)
 	pra.Title = types.StringValue(response.Title)
 }

internal/datasource/service_context.go

@@ -112,6 +112,10 @@ func (r *ServiceContextResource) Read(ctx context.Context, req resource.ReadRequ
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to read service context, got error: %s", err))
 		return
 	}
+	if response.ServiceContext == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to find service context, got no error")
+		return
+	}
 
 	data.From(response.ServiceContext, ctx, resp.Diagnostics)
 	resp.Diagnostics.Append(resp.State.Set(ctx, data)...)

internal/model/pr_automation.go

@@ -47,7 +47,9 @@ func (r *UserResource) Schema(_ context.Context, _ resource.SchemaRequest, resp
 			"name": schema.StringAttribute{
 				Description:         "Name of this user.",
 				MarkdownDescription: "Name of this user.",
-				Required:            true,
+				Optional:            true,
+				Computed:            true,
+				PlanModifiers:       []planmodifier.String{stringplanmodifier.UseStateForUnknown()},
 			},
 			"email": schema.StringAttribute{
 				MarkdownDescription: "Email address of this user.",
@@ -87,13 +89,13 @@ func (r *UserResource) Create(ctx context.Context, req resource.CreateRequest, r
 		return
 	}
 
-	response, err := r.client.CreateUser(ctx, data.Attributes())
+	response, err := r.client.UpsertUser(ctx, data.Attributes())
 	if err != nil {
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to create user, got error: %s", err))
 		return
 	}
 
-	data.From(response.CreateUser)
+	data.From(response.UpsertUser)
 	resp.Diagnostics.Append(resp.State.Set(ctx, data)...)
 }