Skip to content
Snippets Groups Projects
Commit f9f4265d authored by Florent Gluck's avatar Florent Gluck
Browse files

Ongoing work on userAdd with csv support

parent 5628826b
No related branches found
No related tags found
No related merge requests found
package cmdUser package cmdUser
import ( import (
"errors"
u "nexus-client/utils" u "nexus-client/utils"
g "nexus-client/globals" g "nexus-client/globals"
) )
...@@ -25,20 +26,18 @@ func (cmd *Add)PrintUsage() { ...@@ -25,20 +26,18 @@ func (cmd *Add)PrintUsage() {
} }
u.PrintlnErr("―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――") u.PrintlnErr("―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――")
u.PrintlnErr("USAGE: "+cmd.Name+" email firstname lastname password [capability ...]") u.PrintlnErr("USAGE: "+cmd.Name+" email firstname lastname password [capability ...]")
u.PrintlnErr(" "+cmd.Name+" file.csv")
u.PrintlnErr("―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――") u.PrintlnErr("―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――")
const usage string = `file.csv 5-column CSV file defining each new user:
column1 email
column2 firstname
column3 lastname
column4 password
column5 capabilities (comma-separated)`
u.PrintlnErr(usage)
} }
func (cmd *Add)Run(args []string) int { type cmdArgs struct {
client := g.GetInstance().Client
host := g.GetInstance().Host
argc := len(args)
if argc < 4 {
cmd.PrintUsage()
return 1
}
type UserArgs struct {
Email string Email string
FirstName string FirstName string
LastName string LastName string
...@@ -46,7 +45,12 @@ func (cmd *Add)Run(args []string) int { ...@@ -46,7 +45,12 @@ func (cmd *Add)Run(args []string) int {
Caps map[string]int Caps map[string]int
} }
userArgs := &UserArgs { func (cmd *Add)Run(args []string) int {
argc := len(args)
if argc >= 4 {
// Detected syntax: email firstname lastname pwd [caps]
cargs := &cmdArgs {
Email: args[0], Email: args[0],
FirstName: args[1], FirstName: args[1],
LastName: args[2], LastName: args[2],
...@@ -56,21 +60,53 @@ func (cmd *Add)Run(args []string) int { ...@@ -56,21 +60,53 @@ func (cmd *Add)Run(args []string) int {
if argc > 4 { if argc > 4 {
for _, cap := range args[4:] { for _, cap := range args[4:] {
userArgs.Caps[cap] = 1 cargs.Caps[cap] = 1
} }
} }
resp, err := client.R().SetBody(userArgs).Post(host+"/users") if err := cmd.runRequest(cargs); err != nil {
u.PrintlnErr(err.Error())
return 1
}
} else if argc == 1 {
// Detected syntax: file.csv
/*
column1 email
column2 firstname
column3 lastname
column4 password
column5 capabilities (comma-separated)`
*/
var userFields[5][]
csvFile = args[0]
emails, err = u.ReadCSVColumn(csvFile, 0)
if err != nil { if err != nil {
u.PrintlnErr("Error: "+err.Error()) u.PrintlnErr(err.Error())
return 1
}
} else {
cmd.PrintUsage()
return 1 return 1
} }
return 0
}
func (cmd *Add)runRequest(args *cmdArgs) error {
client := g.GetInstance().Client
host := g.GetInstance().Host
resp, err := client.R().SetBody(args).Post(host+"/users")
if err != nil {
return errors.New("Error: "+err.Error())
}
if resp.IsSuccess() { if resp.IsSuccess() {
u.Println(resp) u.Println(resp)
return 0 return nil
} else { } else {
u.PrintlnErr("Error: "+resp.Status()+": "+resp.String()) return errors.New("Error: "+resp.Status()+": "+resp.String())
return 1
} }
} }
package cmdVM package cmdVM
import ( import (
"os"
"fmt" "fmt"
"errors"
"strconv" "strconv"
"encoding/csv"
u "nexus-client/utils" u "nexus-client/utils"
g "nexus-client/globals" g "nexus-client/globals"
) )
...@@ -77,7 +74,7 @@ func (cmd *Create)Run(args []string) int { ...@@ -77,7 +74,7 @@ func (cmd *Create)Run(args []string) int {
// It's not a number, so we assume it's a CSV file. // It's not a number, so we assume it's a CSV file.
// Checks if the file exists. // Checks if the file exists.
file := args[5] file := args[5]
csvEntries, err = cmd.getCSVColumn(file, 0) csvEntries, err = u.ReadCSVColumn(file, 0)
if err != nil { if err != nil {
u.PrintlnErr(err.Error()) u.PrintlnErr(err.Error())
return 1 return 1
...@@ -145,22 +142,3 @@ func (cmd *Create)Run(args []string) int { ...@@ -145,22 +142,3 @@ func (cmd *Create)Run(args []string) int {
return statusCode return statusCode
} }
func (cmd *Create)getCSVColumn(csvFile string, column int) ([]string, error) {
file, err := os.Open(csvFile)
if err != nil {
return nil, errors.New("Failed opening \""+csvFile+"\"")
}
reader := csv.NewReader(file)
records, err := reader.ReadAll()
if err != nil {
return nil, errors.New("\""+csvFile+"\": "+err.Error())
}
var entries []string
for _, col := range(records) {
entries = append(entries, col[column])
}
return entries, nil
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment