CyberCoveLLC/threshold
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(api module): enforce typed definitions (#2238)

Browse Source
This commit is contained in:
Damian Debkowski authored and GitHub committed 2022-07-21 15:21:31 -07:00
1 parent d6c1402223
commit c2bfcc0664
79 files changed
+906 -551
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/cmd/commands/userscmd/funcs.go
+9 -7
View File
@@ -127,16 +127,19 @@ func extraFlagsHandlingFuncImpl(c *Command, _ *base.FlagSets, opts *[]users.Opti
return true
}
func executeExtraActionsImpl(c *Command, origResult api.GenericResult, origError error, userClient *users.Client, version uint32, opts []users.Option) (api.GenericResult, error) {
func executeExtraActionsImpl(c *Command, origResp *api.Response, origItem *users.User, origItems []*users.User, origError error, userClient *users.Client, version uint32, opts []users.Option) (*api.Response, *users.User, []*users.User, error) {
switch c.Func {
case "add-accounts":
return userClient.AddAccounts(c.Context, c.FlagId, version, c.flagAccounts, opts...)
result, err := userClient.AddAccounts(c.Context, c.FlagId, version, c.flagAccounts, opts...)
return result.GetResponse(), result.GetItem(), nil, err
case "set-accounts":
return userClient.SetAccounts(c.Context, c.FlagId, version, c.flagAccounts, opts...)
result, err := userClient.SetAccounts(c.Context, c.FlagId, version, c.flagAccounts, opts...)
return result.GetResponse(), result.GetItem(), nil, err
case "remove-accounts":
return userClient.RemoveAccounts(c.Context, c.FlagId, version, c.flagAccounts, opts...)
result, err := userClient.RemoveAccounts(c.Context, c.FlagId, version, c.flagAccounts, opts...)
return result.GetResponse(), result.GetItem(), nil, err
}
return origResult, origError
return origResp, origItem, origItems, origError
}
func (c *Command) printListTable(items []*users.User) string {
@@ -215,8 +218,7 @@ func (c *Command) printListTable(items []*users.User) string {
return base.WrapForHelpText(output)
}
func printItemTable(result api.GenericResult) string {
item := result.GetItem().(*users.User)
func printItemTable(item *users.User, resp *api.Response) string {
nonAttributeMap := map[string]interface{}{}
if item.Id != "" {
nonAttributeMap["ID"] = item.Id
internal/cmd/commands/userscmd/users.gen.go
+34 -15
View File
@@ -248,30 +248,50 @@ func (c *Command) Run(args []string) int {
return base.CommandUserError
}
var result api.GenericResult
var resp *api.Response
var item *users.User
var listResult api.GenericListResult
var items []*users.User
var createResult *users.UserCreateResult
var readResult *users.UserReadResult
var updateResult *users.UserUpdateResult
var deleteResult *users.UserDeleteResult
var listResult *users.UserListResult
switch c.Func {
case "create":
result, err = usersClient.Create(c.Context, c.FlagScopeId, opts...)
createResult, err = usersClient.Create(c.Context, c.FlagScopeId, opts...)
resp = createResult.GetResponse()
item = createResult.GetItem()
case "read":
result, err = usersClient.Read(c.Context, c.FlagId, opts...)
readResult, err = usersClient.Read(c.Context, c.FlagId, opts...)
resp = readResult.GetResponse()
item = readResult.GetItem()
case "update":
result, err = usersClient.Update(c.Context, c.FlagId, version, opts...)
updateResult, err = usersClient.Update(c.Context, c.FlagId, version, opts...)
resp = updateResult.GetResponse()
item = updateResult.GetItem()
case "delete":
result, err = usersClient.Delete(c.Context, c.FlagId, opts...)
deleteResult, err = usersClient.Delete(c.Context, c.FlagId, opts...)
resp = deleteResult.GetResponse()
case "list":
listResult, err = usersClient.List(c.Context, c.FlagScopeId, opts...)
resp = listResult.GetResponse()
items = listResult.GetItems()
}
result, err = executeExtraActions(c, result, err, usersClient, version, opts)
resp, item, items, err = executeExtraActions(c, resp, item, items, err, usersClient, version, opts)
if err != nil {
if apiErr := api.AsServerError(err); apiErr != nil {
@@ -298,7 +318,7 @@ func (c *Command) Run(args []string) int {
case "delete":
switch base.Format(c.UI) {
case "json":
if ok := c.PrintJsonItem(result); !ok {
if ok := c.PrintJsonItem(resp); !ok {
return base.CommandCliError
}
@@ -311,13 +331,12 @@ func (c *Command) Run(args []string) int {
case "list":
switch base.Format(c.UI) {
case "json":
if ok := c.PrintJsonItems(listResult); !ok {
if ok := c.PrintJsonItems(resp); !ok {
return base.CommandCliError
}
case "table":
listedItems := listResult.GetItems().([]*users.User)
c.UI.Output(c.printListTable(listedItems))
c.UI.Output(c.printListTable(items))
}
return base.CommandSuccess
@@ -326,10 +345,10 @@ func (c *Command) Run(args []string) int {
switch base.Format(c.UI) {
case "table":
c.UI.Output(printItemTable(result))
c.UI.Output(printItemTable(item, resp))
case "json":
if ok := c.PrintJsonItem(result); !ok {
if ok := c.PrintJsonItem(resp); !ok {
return base.CommandCliError
}
}
@@ -344,8 +363,8 @@ var (
extraSynopsisFunc = func(*Command) string { return "" }
extraFlagsFunc = func(*Command, *base.FlagSets, *base.FlagSet) {}
extraFlagsHandlingFunc = func(*Command, *base.FlagSets, *[]users.Option) bool { return true }
executeExtraActions = func(_ *Command, inResult api.GenericResult, inErr error, _ *users.Client, _ uint32, _ []users.Option) (api.GenericResult, error) {
return inResult, inErr
executeExtraActions = func(_ *Command, inResp *api.Response, inItem *users.User, inItems []*users.User, inErr error, _ *users.Client, _ uint32, _ []users.Option) (*api.Response, *users.User, []*users.User, error) {
return inResp, inItem, inItems, inErr
}
printCustomActionOutput = func(*Command) (bool, error) { return false, nil }
)