Change API call to user emails

Author: oyeliseiev-ua

docs/resources/team.md

@@ -42,7 +42,7 @@ output "singlestoredb_team_id" {
 
 - `description` (String) The description of the team.
 - `member_teams` (List of String) List of team UUIDs that are members of this team.
-- `member_users` (List of String) List of user UUIDs that are members of this team.
+- `member_users` (List of String) List of user emails that are members of this team.
 
 ### Read-Only
 

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/hashicorp/terraform-plugin-framework-validators v0.16.0
 	github.com/hashicorp/terraform-plugin-go v0.25.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0
-	github.com/singlestore-labs/singlestore-go/management v1.1.109
+	github.com/singlestore-labs/singlestore-go/management v1.1.115
 	github.com/stretchr/testify v1.8.4
 )
 

go.sum

@@ -184,8 +184,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
-github.com/singlestore-labs/singlestore-go/management v1.1.109 h1:EAIZLD3Fj1WetuL2xd0+CdcJbC8mpGhFOJz/KRpntdA=
-github.com/singlestore-labs/singlestore-go/management v1.1.109/go.mod h1:pfeKQbKr6ml61j823Pi4RUnBTug1buSxLJDmGINAoKc=
+github.com/singlestore-labs/singlestore-go/management v1.1.115 h1:0jB2P1vIX5GgfRzAWd1/vinkTxk9LEUjxz9LWttWrGM=
+github.com/singlestore-labs/singlestore-go/management v1.1.115/go.mod h1:pfeKQbKr6ml61j823Pi4RUnBTug1buSxLJDmGINAoKc=
 github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L3A=
 github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=

internal/provider/teams/resource.go

@@ -2,7 +2,6 @@ package teams
 
 import (
 	"context"
-	"strings"
 
 	otypes "github.com/deepmap/oapi-codegen/pkg/types"
 	"github.com/google/uuid"
@@ -79,7 +78,7 @@ func (r *teamResource) Schema(_ context.Context, _ resource.SchemaRequest, resp
 				Computed:            true,
 				ElementType:         types.StringType,
 				Default:             listdefault.StaticValue(emptyList),
-				MarkdownDescription: "List of user UUIDs that are members of this team.",
+				MarkdownDescription: "List of user emails that are members of this team.",
 			},
 			"member_teams": schema.ListAttribute{
 				Optional:            true,
@@ -106,7 +105,7 @@ func (r *teamResource) Create(ctx context.Context, req resource.CreateRequest, r
 	}
 
 	teamCreateResponse, err := r.PostV1TeamsWithResponse(ctx, management.PostV1TeamsJSONRequestBody{
-		Name:        plan.Name.String(),
+		Name:        util.ToString(plan.Name),
 		Description: util.MaybeString(plan.Description),
 	})
 
@@ -121,15 +120,19 @@ func (r *teamResource) Create(ctx context.Context, req resource.CreateRequest, r
 
 	id := teamCreateResponse.JSON200.TeamID
 
-	userIDs, err := util.ParseUUIDList(plan.MemberUsers)
-	if err != nil {
-		resp.Diagnostics.AddAttributeError(
-			path.Root("member_users"),
-			"Invalid user ID",
-			err.Error(),
-		)
+	memberEmails := make([]string, len(plan.MemberUsers))
+	for i, m := range plan.MemberUsers {
+		// Validate email format
+		if !util.IsValidEmail(m.ValueString()) {
+			resp.Diagnostics.AddAttributeError(
+				path.Root("member_users"),
+				"Invalid email format",
+				"The email address '"+m.ValueString()+"' is not a valid email format.",
+			)
 
-		return
+			return
+		}
+		memberEmails[i] = m.ValueString()
 	}
 
 	teamIDs, err := util.ParseUUIDList(plan.MemberTeams)
@@ -143,12 +146,12 @@ func (r *teamResource) Create(ctx context.Context, req resource.CreateRequest, r
 		return
 	}
 
-	if userIDs != nil || teamIDs != nil {
+	if len(memberEmails) > 0 || teamIDs != nil {
 		teamPatchResponse, err := r.PatchV1TeamsTeamIDWithResponse(ctx,
 			id,
 			management.PatchV1TeamsTeamIDJSONRequestBody{
-				AddMemberUserIDs: userIDs,
-				AddMemberTeamIDs: teamIDs,
+				AddMemberUserEmails: &memberEmails,
+				AddMemberTeamIDs:    teamIDs,
 			},
 		)
 
@@ -346,22 +349,22 @@ func (r *teamResource) ImportState(ctx context.Context, req resource.ImportState
 func toTeamResourceModel(team management.Team) TeamResourceModel {
 	return TeamResourceModel{
 		ID:          util.UUIDStringValue(team.TeamID),
-		Name:        types.StringValue(strings.ReplaceAll(team.Name, "\"", "")),
+		Name:        types.StringValue(team.Name),
 		Description: types.StringValue(team.Description),
 		CreatedAt:   util.MaybeStringValue(team.CreatedAt),
-		MemberUsers: toUsersUUIDList(team.MemberUsers),
+		MemberUsers: toUsersEmailList(team.MemberUsers),
 		MemberTeams: toTeamsUUIDList(team.MemberTeams),
 	}
 }
 
-func toUsersUUIDList(userList *[]management.UserInfo) []types.String {
+func toUsersEmailList(userList *[]management.UserInfo) []types.String {
 	if userList == nil {
 		return []types.String{}
 	}
 
 	users := make([]types.String, len(*userList))
 	for i, user := range *userList {
-		users[i] = util.UUIDStringValue(user.UserID)
+		users[i] = types.StringValue(user.Email)
 	}
 
 	return users

internal/provider/util/util.go

@@ -2,6 +2,7 @@ package util
 
 import (
 	"fmt"
+	"net/mail"
 	"os"
 	"path/filepath"
 	"strings"
@@ -179,3 +180,9 @@ func SubtractListValues(a, b []types.String) []types.String {
 
 	return result
 }
+
+func IsValidEmail(email string) bool {
+	_, err := mail.ParseAddress(email)
+
+	return err == nil
+}