ziggi/gmbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working commit

Browse Source
This commit is contained in:
Олег Бородин
2026-06-07 15:06:37 +02:00
parent 52dd2cef20
commit c656b562d8
17 changed files with 291 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/mbaseadmin/account/util.go → cmd/mbaseadmin/account/accutil.go
+26 -7
View File
@@ -4,6 +4,9 @@
package account
import (
"context"
"fmt"
"mbase/app/operator"
"github.com/spf13/cobra"
@@ -17,11 +20,12 @@ const (
type Util struct {
oper *operator.Logic
subCmd *cobra.Command
createAccountParams createAccountParams
listAccountsParams listAccountsParams
updateAccountParams updateAccountParams
deleteAccountParams deleteAccountParams
createAccountParams CreateAccountParams
listAccountsParams ListAccountsParams
updateAccountParams UpdateAccountParams
deleteAccountParams DeleteAccountParams
commonParams CommonParams
operID string
}
func NewUtil(oper *operator.Logic) *Util {
@@ -41,9 +45,10 @@ func (util *Util) GetRooCmd() *cobra.Command {
func (util *Util) BuildCmds() *cobra.Command {
subCmd := &cobra.Command{
Use: "account",
Short: "\nAccount operations",
SilenceUsage: true,
Use: "account",
Short: "\nAccount operations",
SilenceUsage: true,
PersistentPreRunE: util.ValidateOper,
}
subCmd.CompletionOptions.DisableDefaultCmd = true
@@ -79,6 +84,8 @@ func (util *Util) BuildCmds() *cobra.Command {
Args: cobra.ExactArgs(1),
Run: util.UpdateAccount,
}
updateAccountsCmd.Flags().StringVarP(&util.updateAccountParams.Password, "pass", "P", util.updateAccountParams.Password, "New Password")
//updateAccountsCmd.Flags().StringVarP(&util.updateAccountParams.Username, "user", "U", util.updateAccountParams.Username, "New Username")
subCmd.AddCommand(updateAccountsCmd)
var deleteAccountCmd = &cobra.Command{
@@ -92,3 +99,15 @@ func (util *Util) BuildCmds() *cobra.Command {
util.subCmd = subCmd
return util.subCmd
}
func (util *Util) ValidateOper(cmd *cobra.Command, args []string) error {
var err error
ctx := context.Background()
authOk, operID, err := util.oper.ValidateAccount(ctx, util.commonParams.Username, util.commonParams.Password)
if !authOk {
err := fmt.Errorf("Authentification error")
return err
}
util.operID = operID
return err
}
cmd/mbaseadmin/account/create.go
+18 -28
View File
@@ -4,50 +4,40 @@
package account
import (
"context"
"mbase/pkg/mbctl"
"github.com/spf13/cobra"
)
func (util *Util) CreateAccount(cmd *cobra.Command, args []string) {
//util.createAccountParams.Filename = args[0]
res, err := util.createAccount(util.createAccountParams)
util.createAccountParams.Username = args[0]
util.createAccountParams.Password = args[1]
res, err := util.createAccount(&util.createAccountParams)
printResponse(res, err)
}
type createAccountParams struct {
type CreateAccountParams struct {
Username string
Password string
}
type createAccountResult struct{}
func (util *Util) createAccount(params createAccountParams) (createAccountResult, error) {
var err error
res := createAccountResult{}
/*
operParams := &mbctl.CreateAccountParams{
Username: params.Username,
Password: params.Password,
}
res, err = util.lg.CreateAccount(ctx, operID, params)
if err != nil {
return res, err
}
*/
return res, err
type CreateAccountResult struct {
AccountID string `json:"accountId"`
}
/*
func (util *Util) CreateAccount(ctx context.Context, operID string) (*mbctl.CreateAccountResult, error) {
func (util *Util) createAccount(params *CreateAccountParams) (*CreateAccountResult, error) {
var err error
res := &mbctl.CreateAccountResult{}
params := &mbctl.CreateAccountParams{
Username: util.username,
Password: util.password,
res := &CreateAccountResult{}
ctx := context.Background()
operParams := &mbctl.CreateAccountParams{
Username: params.Username,
Password: params.Password,
}
res, err = util.lg.CreateAccount(ctx, operID, params)
operRes, err := util.oper.CreateAccount(ctx, util.operID, operParams)
if err != nil {
return res, err
}
res.AccountID = operRes.AccountID
return res, err
}
*/
cmd/mbaseadmin/account/delete.go
+20 -6
View File
@@ -4,20 +4,34 @@
package account
import (
"context"
"mbase/pkg/mbctl"
"github.com/spf13/cobra"
)
func (util *Util) DeleteAccount(cmd *cobra.Command, args []string) {
//util.deleteAccountParams.Filename = args[0]
res, err := util.deleteAccount(util.deleteAccountParams)
util.deleteAccountParams.Username = args[0]
res, err := util.deleteAccount(&util.deleteAccountParams)
printResponse(res, err)
}
type deleteAccountParams struct{}
type deleteAccountResult struct{}
type DeleteAccountParams struct {
Username string
}
type DeleteAccountResult struct{}
func (util *Util) deleteAccount(params deleteAccountParams) (deleteAccountResult, error) {
func (util *Util) deleteAccount(params *DeleteAccountParams) (*DeleteAccountResult, error) {
var err error
res := deleteAccountResult{}
res := &DeleteAccountResult{}
ctx := context.Background()
operParams := &mbctl.DeleteAccountParams{
Username: params.Username,
}
_, err = util.oper.DeleteAccount(ctx, util.operID, operParams)
if err != nil {
return res, err
}
return res, err
}
cmd/mbaseadmin/account/list.go
+18 -6
View File
@@ -4,20 +4,32 @@
package account
import (
"context"
"mbase/pkg/mbctl"
"github.com/spf13/cobra"
)
func (util *Util) ListAccounts(cmd *cobra.Command, args []string) {
//util.listAccountsParams.Filename = args[0]
res, err := util.listAccounts(util.listAccountsParams)
res, err := util.listAccounts(&util.listAccountsParams)
printResponse(res, err)
}
type listAccountsParams struct{}
type listAccountsResult struct{}
type ListAccountsParams struct{}
type ListAccountsResult struct {
Accounts []*mbctl.AccountShortDescr `json:"accounts"`
}
func (util *Util) listAccounts(params listAccountsParams) (listAccountsResult, error) {
func (util *Util) listAccounts(params *ListAccountsParams) (*ListAccountsResult, error) {
var err error
res := listAccountsResult{}
ctx := context.Background()
res := &ListAccountsResult{}
operParams := &mbctl.ListAccountsParams{}
operRes, err := util.oper.ListAccounts(ctx, util.operID, operParams)
if err != nil {
return res, err
}
res.Accounts = operRes.Accounts
return res, err
}
cmd/mbaseadmin/account/update.go
+24 -6
View File
@@ -4,20 +4,38 @@
package account
import (
"context"
"mbase/pkg/mbctl"
"github.com/spf13/cobra"
)
func (util *Util) UpdateAccount(cmd *cobra.Command, args []string) {
//util.updateAccountParams.Filename = args[0]
res, err := util.updateAccount(util.updateAccountParams)
util.updateAccountParams.Username = args[0]
res, err := util.updateAccount(&util.updateAccountParams)
printResponse(res, err)
}
type updateAccountParams struct{}
type updateAccountResult struct{}
type UpdateAccountParams struct {
Username string
Password string
}
type UpdateAccountResult struct {
AccountID string
}
func (util *Util) updateAccount(params updateAccountParams) (updateAccountResult, error) {
func (util *Util) updateAccount(params *UpdateAccountParams) (*UpdateAccountResult, error) {
var err error
res := updateAccountResult{}
res := &UpdateAccountResult{}
ctx := context.Background()
operParams := &mbctl.UpdateAccountParams{
Username: params.Username,
//Password: params.Password,
}
_, err = util.oper.UpdateAccount(ctx, util.operID, operParams)
if err != nil {
return res, err
}
return res, err
}