Skip to content

Fix order of error checking (accesslist) #32280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kimlisa merged 2 commits into from
Sep 21, 2023
Merged

Fix order of error checking (accesslist) #32280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70bbc24
Fix order of error checking (accesslist)
kimlisa Sep 21, 2023
2edede6
Merge branch 'master' into lisa/fix-error-checking
kimlisa Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion api/types/accesslist/convert/v1/accesslist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,15 @@ func FromProto(msg *accesslistv1.AccessList, opts ...AccessListOption) (*accessl
Traits: traitv1.FromProto(msg.Spec.Grants.Traits),
},
})
if err != nil {
return nil, trace.Wrap(err)
}

for _, opt := range opts {
opt(accessList)
}

return accessList, trace.Wrap(err)
return accessList, nil
}

// ToProto converts an internal access list into a v1 access list object.
Expand Down
5 changes: 4 additions & 1 deletion api/types/accesslist/convert/v1/member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,15 @@ func FromMemberProto(msg *accesslistv1.Member, opts ...MemberOption) (*accesslis
// Must provide as options to set it with the provided value.
IneligibleStatus: "",
})
if err != nil {
return nil, trace.Wrap(err)
}

for _, opt := range opts {
opt(member)
}

return member, trace.Wrap(err)
return member, nil
}

// FromMembersProto converts a list of v1 access list members into a list of internal access list members.
Expand Down