Merge pull request #301 from OpsLevel/db/bugfix-identifier-input-need…

…s-pointers make UserIdentifierInput fields pointers
OpsLevel · Nov 10, 2023 · 79961b0 · 79961b0
2 parents 081e76b + 9048c95
commit 79961b0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.changes/unreleased/Bugfix-20231110-135823.yaml b/.changes/unreleased/Bugfix-20231110-135823.yaml
@@ -0,0 +1,3 @@
+kind: Bugfix
+body: make UserIdentifierInput fields pointers, fixing the omitempty struct tag behavior
+time: 2023-11-10T13:58:23.41047-06:00
diff --git a/team_test.go b/team_test.go
@@ -797,7 +797,7 @@ func TestTeamAddMemberhip(t *testing.T) {
 	team, _ := clientWithAlias.GetTeamWithAlias("example")
 	newMembership := ol.TeamMembershipUserInput{
 		Role: "user",
-		User: ol.UserIdentifierInput{Id: id1, Email: "[email protected]"},
+		User: ol.UserIdentifierInput{Id: &id1, Email: ol.NewString("[email protected]")},
 	}
 	result, err := clientWithTeamId.AddMemberships(&team.TeamId, newMembership)
 	// Assert
@@ -829,7 +829,7 @@ func TestTeamRemoveMemberhip(t *testing.T) {
 	team, _ := client1.GetTeamWithAlias("example")
 	membershipToDelete := ol.TeamMembershipUserInput{
 		Role: "user",
-		User: ol.UserIdentifierInput{Id: id1, Email: "[email protected]"},
+		User: ol.UserIdentifierInput{Id: &id1, Email: ol.NewString("[email protected]")},
 	}
 
 	result, err := client2.RemoveMemberships(&team.TeamId, membershipToDelete)

diff --git a/user.go b/user.go
@@ -30,8 +30,8 @@ type UserConnection struct {
 }
 
 type UserIdentifierInput struct {
-	Id    ID     `graphql:"id" json:"id,omitempty"`
-	Email string `graphql:"email" json:"email,omitempty"`
+	Id    *ID     `graphql:"id" json:"id,omitempty"`
+	Email *string `graphql:"email" json:"email,omitempty"`
 }
 
 type UserInput struct {
@@ -53,11 +53,11 @@ func (u *User) ResourceType() TaggableResource {
 func NewUserIdentifier(value string) UserIdentifierInput {
 	if IsID(value) {
 		return UserIdentifierInput{
-			Id: ID(value),
+			Id: NewID(value),
 		}
 	}
 	return UserIdentifierInput{
-		Email: value,
+		Email: NewString(value),
 	}
 }