diff --git a/cmd/agola/cmd/directrunstart.go b/cmd/agola/cmd/directrunstart.go index 52a3db5..ae97a60 100644 --- a/cmd/agola/cmd/directrunstart.go +++ b/cmd/agola/cmd/directrunstart.go @@ -49,7 +49,7 @@ type directRunStartOptions struct { var directRunStartOpts directRunStartOptions func init() { - flags := cmdDirectRunStart.PersistentFlags() + flags := cmdDirectRunStart.Flags() flags.StringSliceVarP(&directRunStartOpts.statusFilter, "status", "s", nil, "filter runs matching the provided status. This option can be repeated multiple times") flags.StringArrayVarP(&directRunStartOpts.labelFilter, "label", "l", nil, "filter runs matching the provided label. This option can be repeated multiple times, in this case only runs matching all the labels will be returned") diff --git a/cmd/agola/cmd/orgcreate.go b/cmd/agola/cmd/orgcreate.go index 7321df6..97b43c9 100644 --- a/cmd/agola/cmd/orgcreate.go +++ b/cmd/agola/cmd/orgcreate.go @@ -47,7 +47,9 @@ func init() { flags.StringVarP(&orgCreateOpts.name, "name", "n", "", "organization name") flags.StringVar(&orgCreateOpts.visibility, "visibility", "public", `organization visibility (public or private)`) - cmdOrgCreate.MarkFlagRequired("name") + if err := cmdOrgCreate.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } cmdOrg.AddCommand(cmdOrgCreate) } diff --git a/cmd/agola/cmd/orgdelete.go b/cmd/agola/cmd/orgdelete.go index fb85540..cf0a552 100644 --- a/cmd/agola/cmd/orgdelete.go +++ b/cmd/agola/cmd/orgdelete.go @@ -44,7 +44,9 @@ func init() { flags.StringVarP(&orgDeleteOpts.name, "name", "n", "", "organization name") - cmdOrgDelete.MarkFlagRequired("name") + if err := cmdOrgDelete.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } cmdOrg.AddCommand(cmdOrgDelete) } diff --git a/cmd/agola/cmd/orgmemberadd.go b/cmd/agola/cmd/orgmemberadd.go index 66a2957..d9362d6 100644 --- a/cmd/agola/cmd/orgmemberadd.go +++ b/cmd/agola/cmd/orgmemberadd.go @@ -49,8 +49,12 @@ func init() { flags.StringVar(&orgMemberAddOpts.username, "username", "", "user name") flags.StringVarP(&orgMemberAddOpts.role, "role", "r", "member", "member role (owner or member)") - cmdOrgMemberAdd.MarkFlagRequired("orgname") - cmdOrgMemberAdd.MarkFlagRequired("username") + if err := cmdOrgMemberAdd.MarkFlagRequired("orgname"); err != nil { + log.Fatal(err) + } + if err := cmdOrgMemberAdd.MarkFlagRequired("username"); err != nil { + log.Fatal(err) + } cmdOrgMember.AddCommand(cmdOrgMemberAdd) } diff --git a/cmd/agola/cmd/orgmemberlist.go b/cmd/agola/cmd/orgmemberlist.go index 280a44d..f80ca8f 100644 --- a/cmd/agola/cmd/orgmemberlist.go +++ b/cmd/agola/cmd/orgmemberlist.go @@ -48,7 +48,9 @@ func init() { flags.StringVarP(&orgMemberListOpts.orgname, "orgname", "n", "", "organization name") - cmdOrgMemberList.MarkFlagRequired("orgname") + if err := cmdOrgMemberList.MarkFlagRequired("orgname"); err != nil { + log.Fatal(err) + } cmdOrgMember.AddCommand(cmdOrgMemberList) } diff --git a/cmd/agola/cmd/orgmemberremove.go b/cmd/agola/cmd/orgmemberremove.go index 08d09f6..0d98f2a 100644 --- a/cmd/agola/cmd/orgmemberremove.go +++ b/cmd/agola/cmd/orgmemberremove.go @@ -46,8 +46,12 @@ func init() { flags.StringVarP(&orgMemberRemoveOpts.orgname, "orgname", "n", "", "organization name") flags.StringVar(&orgMemberRemoveOpts.username, "username", "", "user name") - cmdOrgMemberRemove.MarkFlagRequired("orgname") - cmdOrgMemberRemove.MarkFlagRequired("username") + if err := cmdOrgMemberRemove.MarkFlagRequired("orgname"); err != nil { + log.Fatal(err) + } + if err := cmdOrgMemberRemove.MarkFlagRequired("username"); err != nil { + log.Fatal(err) + } cmdOrgMember.AddCommand(cmdOrgMemberRemove) } diff --git a/cmd/agola/cmd/projectcreate.go b/cmd/agola/cmd/projectcreate.go index 17ba5e4..23ceeae 100644 --- a/cmd/agola/cmd/projectcreate.go +++ b/cmd/agola/cmd/projectcreate.go @@ -55,10 +55,18 @@ func init() { flags.StringVar(&projectCreateOpts.parentPath, "parent", "", `parent project group path (i.e "org/org01" for root project group in org01, "user/user01/group01/subgroub01") or project group id where the project should be created`) flags.StringVar(&projectCreateOpts.visibility, "visibility", "public", `project visibility (public or private)`) - cmdProjectCreate.MarkFlagRequired("name") - cmdProjectCreate.MarkFlagRequired("parent") - cmdProjectCreate.MarkFlagRequired("repo-url") - cmdProjectCreate.MarkFlagRequired("remote-source") + if err := cmdProjectCreate.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } + if err := cmdProjectCreate.MarkFlagRequired("parent"); err != nil { + log.Fatal(err) + } + if err := cmdProjectCreate.MarkFlagRequired("repo-path"); err != nil { + log.Fatal(err) + } + if err := cmdProjectCreate.MarkFlagRequired("remote-source"); err != nil { + log.Fatal(err) + } cmdProject.AddCommand(cmdProjectCreate) } diff --git a/cmd/agola/cmd/projectdelete.go b/cmd/agola/cmd/projectdelete.go index 1a6bebf..dbdfcd1 100644 --- a/cmd/agola/cmd/projectdelete.go +++ b/cmd/agola/cmd/projectdelete.go @@ -44,7 +44,9 @@ func init() { flags.StringVar(&projectDeleteOpts.projectRef, "project", "", "project id or full path") - cmdProjectDelete.MarkFlagRequired("project") + if err := cmdProjectDelete.MarkFlagRequired("project"); err != nil { + log.Fatal(err) + } cmdProject.AddCommand(cmdProjectDelete) } diff --git a/cmd/agola/cmd/projectgroupcreate.go b/cmd/agola/cmd/projectgroupcreate.go index c2feead..2cbb52d 100644 --- a/cmd/agola/cmd/projectgroupcreate.go +++ b/cmd/agola/cmd/projectgroupcreate.go @@ -49,8 +49,12 @@ func init() { flags.StringVar(&projectGroupCreateOpts.parentPath, "parent", "", `parent project group path (i.e "org/org01" for root project group in org01, "user/user01/group01/subgroub01") or project group id where the project group should be created`) flags.StringVar(&projectGroupCreateOpts.visibility, "visibility", "public", `project group visibility (public or private)`) - cmdProjectGroupCreate.MarkFlagRequired("name") - cmdProjectGroupCreate.MarkFlagRequired("parent") + if err := cmdProjectGroupCreate.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } + if err := cmdProjectGroupCreate.MarkFlagRequired("parent"); err != nil { + log.Fatal(err) + } cmdProjectGroup.AddCommand(cmdProjectGroupCreate) } diff --git a/cmd/agola/cmd/projectgroupsecretcreate.go b/cmd/agola/cmd/projectgroupsecretcreate.go index d272161..973099a 100644 --- a/cmd/agola/cmd/projectgroupsecretcreate.go +++ b/cmd/agola/cmd/projectgroupsecretcreate.go @@ -35,9 +35,15 @@ func init() { flags.StringVarP(&secretCreateOpts.name, "name", "n", "", "secret name") flags.StringVar(&secretCreateOpts.data, "data", "", "json map of secret data") - cmdProjectGroupSecretCreate.MarkFlagRequired("project") - cmdProjectGroupSecretCreate.MarkFlagRequired("name") - cmdProjectGroupSecretCreate.MarkFlagRequired("data") + if err := cmdProjectGroupSecretCreate.MarkFlagRequired("projectgroup"); err != nil { + log.Fatal(err) + } + if err := cmdProjectGroupSecretCreate.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } + if err := cmdProjectGroupSecretCreate.MarkFlagRequired("data"); err != nil { + log.Fatal(err) + } cmdProjectGroupSecret.AddCommand(cmdProjectGroupSecretCreate) } diff --git a/cmd/agola/cmd/projectgroupsecretdelete.go b/cmd/agola/cmd/projectgroupsecretdelete.go index b8e118f..a3d1346 100644 --- a/cmd/agola/cmd/projectgroupsecretdelete.go +++ b/cmd/agola/cmd/projectgroupsecretdelete.go @@ -34,8 +34,12 @@ func init() { flags.StringVar(&secretDeleteOpts.parentRef, "projectgroup", "", "project group id or full path") flags.StringVarP(&secretDeleteOpts.name, "name", "n", "", "secret name") - cmdProjectGroupSecretDelete.MarkFlagRequired("projectgroup") - cmdProjectGroupSecretDelete.MarkFlagRequired("name") + if err := cmdProjectGroupSecretDelete.MarkFlagRequired("projectgroup"); err != nil { + log.Fatal(err) + } + if err := cmdProjectGroupSecretDelete.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } cmdProjectGroupSecret.AddCommand(cmdProjectGroupSecretDelete) } diff --git a/cmd/agola/cmd/projectgroupvariablecreate.go b/cmd/agola/cmd/projectgroupvariablecreate.go index 7558760..d403f4b 100644 --- a/cmd/agola/cmd/projectgroupvariablecreate.go +++ b/cmd/agola/cmd/projectgroupvariablecreate.go @@ -35,9 +35,15 @@ func init() { flags.StringVarP(&variableCreateOpts.name, "name", "n", "", "variable name") flags.StringVar(&variableCreateOpts.values, "values", "", "json list of values and conditions") - cmdProjectGroupVariableCreate.MarkFlagRequired("project") - cmdProjectGroupVariableCreate.MarkFlagRequired("name") - cmdProjectGroupVariableCreate.MarkFlagRequired("values") + if err := cmdProjectGroupVariableCreate.MarkFlagRequired("projectgroup"); err != nil { + log.Fatal(err) + } + if err := cmdProjectGroupVariableCreate.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } + if err := cmdProjectGroupVariableCreate.MarkFlagRequired("values"); err != nil { + log.Fatal(err) + } cmdProjectGroupVariable.AddCommand(cmdProjectGroupVariableCreate) } diff --git a/cmd/agola/cmd/projectgroupvariabledelete.go b/cmd/agola/cmd/projectgroupvariabledelete.go index 93132ee..2a526ad 100644 --- a/cmd/agola/cmd/projectgroupvariabledelete.go +++ b/cmd/agola/cmd/projectgroupvariabledelete.go @@ -34,8 +34,12 @@ func init() { flags.StringVar(&variableDeleteOpts.parentRef, "projectgroup", "", "project group id or full path") flags.StringVarP(&variableDeleteOpts.name, "name", "n", "", "variable name") - cmdProjectGroupVariableDelete.MarkFlagRequired("projectgroup") - cmdProjectGroupVariableDelete.MarkFlagRequired("name") + if err := cmdProjectGroupVariableDelete.MarkFlagRequired("projectgroup"); err != nil { + log.Fatal(err) + } + if err := cmdProjectGroupVariableDelete.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } cmdProjectGroupVariable.AddCommand(cmdProjectGroupVariableDelete) } diff --git a/cmd/agola/cmd/projectlist.go b/cmd/agola/cmd/projectlist.go index 7eeecd5..6cdf5b1 100644 --- a/cmd/agola/cmd/projectlist.go +++ b/cmd/agola/cmd/projectlist.go @@ -39,11 +39,13 @@ type projectListOptions struct { var projectListOpts projectListOptions func init() { - flags := cmdProjectList.PersistentFlags() + flags := cmdProjectList.Flags() flags.StringVar(&projectListOpts.parentPath, "parent", "", `project group path (i.e "org/org01" for root project group in org01, "/user/user01/group01/subgroub01") or project group id`) - cmdProjectList.MarkFlagRequired("parent") + if err := cmdProjectList.MarkFlagRequired("parent"); err != nil { + log.Fatal(err) + } cmdProject.AddCommand(cmdProjectList) } diff --git a/cmd/agola/cmd/projectreconfig.go b/cmd/agola/cmd/projectreconfig.go index bdf4dd2..0c86c16 100644 --- a/cmd/agola/cmd/projectreconfig.go +++ b/cmd/agola/cmd/projectreconfig.go @@ -44,7 +44,9 @@ func init() { flags.StringVarP(&projectReconfigOpts.name, "name", "n", "", "project name") - cmdProjectReconfig.MarkFlagRequired("name") + if err := cmdProjectReconfig.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } cmdProject.AddCommand(cmdProjectReconfig) } diff --git a/cmd/agola/cmd/projectsecretcreate.go b/cmd/agola/cmd/projectsecretcreate.go index 21c8534..cc05b72 100644 --- a/cmd/agola/cmd/projectsecretcreate.go +++ b/cmd/agola/cmd/projectsecretcreate.go @@ -50,9 +50,15 @@ func init() { flags.StringVarP(&secretCreateOpts.name, "name", "n", "", "secret name") flags.StringVar(&secretCreateOpts.data, "data", "", "json map of secret data") - cmdProjectSecretCreate.MarkFlagRequired("project") - cmdProjectSecretCreate.MarkFlagRequired("name") - cmdProjectSecretCreate.MarkFlagRequired("data") + if err := cmdProjectSecretCreate.MarkFlagRequired("project"); err != nil { + log.Fatal(err) + } + if err := cmdProjectSecretCreate.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } + if err := cmdProjectSecretCreate.MarkFlagRequired("data"); err != nil { + log.Fatal(err) + } cmdProjectSecret.AddCommand(cmdProjectSecretCreate) } diff --git a/cmd/agola/cmd/projectsecretdelete.go b/cmd/agola/cmd/projectsecretdelete.go index dee4bb4..e898b34 100644 --- a/cmd/agola/cmd/projectsecretdelete.go +++ b/cmd/agola/cmd/projectsecretdelete.go @@ -46,8 +46,12 @@ func init() { flags.StringVar(&secretDeleteOpts.parentRef, "project", "", "project id or full path") flags.StringVarP(&secretDeleteOpts.name, "name", "n", "", "secret name") - cmdProjectSecretDelete.MarkFlagRequired("projectgroup") - cmdProjectSecretDelete.MarkFlagRequired("name") + if err := cmdProjectSecretDelete.MarkFlagRequired("project"); err != nil { + log.Fatal(err) + } + if err := cmdProjectSecretDelete.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } cmdProjectSecret.AddCommand(cmdProjectSecretDelete) } diff --git a/cmd/agola/cmd/projectvariablecreate.go b/cmd/agola/cmd/projectvariablecreate.go index 3996fde..515a142 100644 --- a/cmd/agola/cmd/projectvariablecreate.go +++ b/cmd/agola/cmd/projectvariablecreate.go @@ -50,9 +50,15 @@ func init() { flags.StringVarP(&variableCreateOpts.name, "name", "n", "", "variable name") flags.StringVar(&variableCreateOpts.values, "values", "", "json list of values and conditions") - cmdProjectVariableCreate.MarkFlagRequired("project") - cmdProjectVariableCreate.MarkFlagRequired("name") - cmdProjectVariableCreate.MarkFlagRequired("values") + if err := cmdProjectVariableCreate.MarkFlagRequired("project"); err != nil { + log.Fatal(err) + } + if err := cmdProjectVariableCreate.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } + if err := cmdProjectVariableCreate.MarkFlagRequired("values"); err != nil { + log.Fatal(err) + } cmdProjectVariable.AddCommand(cmdProjectVariableCreate) } diff --git a/cmd/agola/cmd/projectvariabledelete.go b/cmd/agola/cmd/projectvariabledelete.go index 54fe811..e7943f0 100644 --- a/cmd/agola/cmd/projectvariabledelete.go +++ b/cmd/agola/cmd/projectvariabledelete.go @@ -46,8 +46,12 @@ func init() { flags.StringVar(&variableDeleteOpts.parentRef, "project", "", "project id or full path") flags.StringVarP(&variableDeleteOpts.name, "name", "n", "", "variable name") - cmdProjectVariableDelete.MarkFlagRequired("projectgroup") - cmdProjectVariableDelete.MarkFlagRequired("name") + if err := cmdProjectVariableDelete.MarkFlagRequired("project"); err != nil { + log.Fatal(err) + } + if err := cmdProjectVariableDelete.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } cmdProjectVariable.AddCommand(cmdProjectVariableDelete) } diff --git a/cmd/agola/cmd/remotesourcecreate.go b/cmd/agola/cmd/remotesourcecreate.go index c4db74d..ef86f2a 100644 --- a/cmd/agola/cmd/remotesourcecreate.go +++ b/cmd/agola/cmd/remotesourcecreate.go @@ -62,10 +62,18 @@ func init() { flags.StringVar(&remoteSourceCreateOpts.sshHostKey, "ssh-host-key", "", "remotesource ssh public host key") flags.BoolVarP(&remoteSourceCreateOpts.skipSSHHostKeyCheck, "skip-ssh-host-key-check", "s", false, "skip ssh host key check") - cmdRemoteSourceCreate.MarkFlagRequired("name") - cmdRemoteSourceCreate.MarkFlagRequired("type") - cmdRemoteSourceCreate.MarkFlagRequired("auth-type") - cmdRemoteSourceCreate.MarkFlagRequired("api-url") + if err := cmdRemoteSourceCreate.MarkFlagRequired("name"); err != nil { + log.Fatal(err) + } + if err := cmdRemoteSourceCreate.MarkFlagRequired("type"); err != nil { + log.Fatal(err) + } + if err := cmdRemoteSourceCreate.MarkFlagRequired("auth-type"); err != nil { + log.Fatal(err) + } + if err := cmdRemoteSourceCreate.MarkFlagRequired("api-url"); err != nil { + log.Fatal(err) + } cmdRemoteSource.AddCommand(cmdRemoteSourceCreate) } diff --git a/cmd/agola/cmd/remotesourcelist.go b/cmd/agola/cmd/remotesourcelist.go index a5376c8..6b06dc2 100644 --- a/cmd/agola/cmd/remotesourcelist.go +++ b/cmd/agola/cmd/remotesourcelist.go @@ -40,7 +40,7 @@ type remoteSourceListOptions struct { var remoteSourceListOpts remoteSourceListOptions func init() { - flags := cmdRemoteSourceList.PersistentFlags() + flags := cmdRemoteSourceList.Flags() flags.IntVar(&remoteSourceListOpts.limit, "limit", 10, "max number of runs to show") flags.StringVar(&remoteSourceListOpts.start, "start", "", "starting user name (excluded) to fetch") diff --git a/cmd/agola/cmd/remotesourceupdate.go b/cmd/agola/cmd/remotesourceupdate.go index 6e271fc..62a5d48 100644 --- a/cmd/agola/cmd/remotesourceupdate.go +++ b/cmd/agola/cmd/remotesourceupdate.go @@ -59,7 +59,9 @@ func init() { flags.StringVar(&remoteSourceUpdateOpts.sshHostKey, "ssh-host-key", "", "remotesource ssh public host key") flags.BoolVarP(&remoteSourceUpdateOpts.skipSSHHostKeyCheck, "skip-ssh-host-key-check", "s", false, "skip ssh host key check") - cmdRemoteSourceUpdate.MarkFlagRequired("ref") + if err := cmdRemoteSourceUpdate.MarkFlagRequired("ref"); err != nil { + log.Fatal(err) + } cmdRemoteSource.AddCommand(cmdRemoteSourceUpdate) } diff --git a/cmd/agola/cmd/runlist.go b/cmd/agola/cmd/runlist.go index 831241c..01eca79 100644 --- a/cmd/agola/cmd/runlist.go +++ b/cmd/agola/cmd/runlist.go @@ -43,7 +43,7 @@ type runListOptions struct { var runListOpts runListOptions func init() { - flags := cmdRunList.PersistentFlags() + flags := cmdRunList.Flags() flags.StringSliceVarP(&runListOpts.statusFilter, "status", "s", nil, "filter runs matching the provided status. This option can be repeated multiple times") flags.StringArrayVarP(&runListOpts.labelFilter, "label", "l", nil, "filter runs matching the provided label. This option can be repeated multiple times, in this case only runs matching all the labels will be returned") diff --git a/cmd/agola/cmd/serve.go b/cmd/agola/cmd/serve.go index 471aa76..15e21e6 100644 --- a/cmd/agola/cmd/serve.go +++ b/cmd/agola/cmd/serve.go @@ -72,14 +72,19 @@ type serveOptions struct { var serveOpts serveOptions func init() { - flags := cmdServe.PersistentFlags() + flags := cmdServe.Flags() flags.StringVar(&serveOpts.config, "config", "./config.yml", "config file path") flags.StringSliceVar(&serveOpts.components, "components", []string{}, `list of components to start. Specify "all-base" to start all base components (excluding the executor).`) flags.BoolVar(&serveOpts.embeddedEtcd, "embedded-etcd", false, "start and use an embedded etcd, only for testing purpose") flags.StringVar(&serveOpts.embeddedEtcdDataDir, "embedded-etcd-data-dir", "/tmp/agola/etcd", "embedded etcd data dir, only for testing purpose") - cmdServe.MarkFlagRequired("config") + if err := cmdServe.MarkFlagRequired("config"); err != nil { + log.Fatal(err) + } + if err := cmdServe.MarkFlagRequired("components"); err != nil { + log.Fatal(err) + } cmdAgola.AddCommand(cmdServe) } diff --git a/cmd/agola/cmd/usercreate.go b/cmd/agola/cmd/usercreate.go index 49ed877..c523269 100644 --- a/cmd/agola/cmd/usercreate.go +++ b/cmd/agola/cmd/usercreate.go @@ -44,7 +44,9 @@ func init() { flags.StringVarP(&userCreateOpts.username, "username", "n", "", "user name") - cmdUserCreate.MarkFlagRequired("username") + if err := cmdUserCreate.MarkFlagRequired("username"); err != nil { + log.Fatal(err) + } cmdUser.AddCommand(cmdUserCreate) } diff --git a/cmd/agola/cmd/userdelete.go b/cmd/agola/cmd/userdelete.go index b925bf7..3c8db0e 100644 --- a/cmd/agola/cmd/userdelete.go +++ b/cmd/agola/cmd/userdelete.go @@ -44,7 +44,9 @@ func init() { flags.StringVarP(&userDeleteOpts.username, "username", "n", "", "user name") - cmdUserDelete.MarkFlagRequired("username") + if err := cmdUserDelete.MarkFlagRequired("username"); err != nil { + log.Fatal(err) + } cmdUser.AddCommand(cmdUserDelete) } diff --git a/cmd/agola/cmd/userlacreate.go b/cmd/agola/cmd/userlacreate.go index d83c08e..ad4aff4 100644 --- a/cmd/agola/cmd/userlacreate.go +++ b/cmd/agola/cmd/userlacreate.go @@ -50,8 +50,12 @@ func init() { flags.StringVar(&userLACreateOpts.remoteSourceLoginName, "remote-name", "", "remote source login name") flags.StringVar(&userLACreateOpts.remoteSourceLoginPassword, "remote-password", "", "remote source password") - cmdUserLACreate.MarkFlagRequired("username") - cmdUserLACreate.MarkFlagRequired("remote-source") + if err := cmdUserLACreate.MarkFlagRequired("username"); err != nil { + log.Fatal(err) + } + if err := cmdUserLACreate.MarkFlagRequired("remote-source"); err != nil { + log.Fatal(err) + } cmdUserLA.AddCommand(cmdUserLACreate) } diff --git a/cmd/agola/cmd/userladelete.go b/cmd/agola/cmd/userladelete.go index 969d716..ccde33c 100644 --- a/cmd/agola/cmd/userladelete.go +++ b/cmd/agola/cmd/userladelete.go @@ -46,8 +46,12 @@ func init() { flags.StringVarP(&userLADeleteOpts.userName, "username", "n", "", "user name") flags.StringVar(&userLADeleteOpts.laID, "laid", "", "linked account id") - cmdUserLADelete.MarkFlagRequired("username") - cmdUserLADelete.MarkFlagRequired("laid") + if err := cmdUserLADelete.MarkFlagRequired("username"); err != nil { + log.Fatal(err) + } + if err := cmdUserLADelete.MarkFlagRequired("laid"); err != nil { + log.Fatal(err) + } cmdUserLA.AddCommand(cmdUserLADelete) } diff --git a/cmd/agola/cmd/userlist.go b/cmd/agola/cmd/userlist.go index c864407..1e6afd8 100644 --- a/cmd/agola/cmd/userlist.go +++ b/cmd/agola/cmd/userlist.go @@ -40,7 +40,7 @@ type userListOptions struct { var userListOpts userListOptions func init() { - flags := cmdUserList.PersistentFlags() + flags := cmdUserList.Flags() flags.IntVar(&userListOpts.limit, "limit", 10, "max number of runs to show") flags.StringVar(&userListOpts.start, "start", "", "starting user name (excluded) to fetch") diff --git a/cmd/agola/cmd/usertokencreate.go b/cmd/agola/cmd/usertokencreate.go index 0461bb4..ecd8bd5 100644 --- a/cmd/agola/cmd/usertokencreate.go +++ b/cmd/agola/cmd/usertokencreate.go @@ -47,8 +47,12 @@ func init() { flags.StringVarP(&userTokenCreateOpts.username, "username", "n", "", "user name") flags.StringVarP(&userTokenCreateOpts.tokenName, "tokenname", "t", "", "token name") - cmdUserTokenCreate.MarkFlagRequired("username") - cmdUserTokenCreate.MarkFlagRequired("tokenname") + if err := cmdUserTokenCreate.MarkFlagRequired("username"); err != nil { + log.Fatal(err) + } + if err := cmdUserTokenCreate.MarkFlagRequired("tokenname"); err != nil { + log.Fatal(err) + } cmdUserToken.AddCommand(cmdUserTokenCreate) } diff --git a/cmd/agola/cmd/usertokendelete.go b/cmd/agola/cmd/usertokendelete.go index d4db3f2..bfede1c 100644 --- a/cmd/agola/cmd/usertokendelete.go +++ b/cmd/agola/cmd/usertokendelete.go @@ -46,8 +46,12 @@ func init() { flags.StringVarP(&userTokenDeleteOpts.userName, "username", "n", "", "user name") flags.StringVarP(&userTokenDeleteOpts.tokenName, "tokenname", "t", "", "token name") - cmdUserTokenDelete.MarkFlagRequired("username") - cmdUserTokenDelete.MarkFlagRequired("tokenname") + if err := cmdUserTokenDelete.MarkFlagRequired("username"); err != nil { + log.Fatal(err) + } + if err := cmdUserTokenDelete.MarkFlagRequired("tokenname"); err != nil { + log.Fatal(err) + } cmdUserToken.AddCommand(cmdUserTokenDelete) }