mirror of https://github.com/mitchell/selfpass.git
Refactor Stringer implementations and scp root cmd init function
This commit is contained in:
parent
d3fa22dbb2
commit
da95f9a5f0
1
Makefile
1
Makefile
|
@ -71,6 +71,7 @@ install-spc:
|
|||
|
||||
gen-protoc:
|
||||
protoc --go_out=plugins=grpc:. \
|
||||
--dart_out=grpc:. \
|
||||
./credentials/protobuf/service.proto
|
||||
|
||||
gen-csr-json:
|
||||
|
|
|
@ -28,15 +28,17 @@ can interact with the entire Selfpass API.`,
|
|||
mgr := repositories.NewConfigManager(cfgFile)
|
||||
clientInit := credrepos.NewCredentialServiceClient
|
||||
|
||||
rootCmd.AddCommand(makeInit(mgr))
|
||||
rootCmd.AddCommand(makeEncrypt(mgr))
|
||||
rootCmd.AddCommand(makeDecrypt(mgr))
|
||||
rootCmd.AddCommand(makeDecryptCfg(mgr))
|
||||
rootCmd.AddCommand(commands.MakeList(makeInitClient(mgr, clientInit)))
|
||||
rootCmd.AddCommand(commands.MakeCreate(mgr, makeInitClient(mgr, clientInit)))
|
||||
rootCmd.AddCommand(commands.MakeUpdate(mgr, makeInitClient(mgr, clientInit)))
|
||||
rootCmd.AddCommand(commands.MakeGet(mgr, makeInitClient(mgr, clientInit)))
|
||||
rootCmd.AddCommand(commands.MakeDelete(makeInitClient(mgr, clientInit)))
|
||||
rootCmd.AddCommand(
|
||||
makeInit(mgr),
|
||||
makeEncrypt(mgr),
|
||||
makeDecrypt(mgr),
|
||||
makeDecryptCfg(mgr),
|
||||
commands.MakeList(makeInitClient(mgr, clientInit)),
|
||||
commands.MakeCreate(mgr, makeInitClient(mgr, clientInit)),
|
||||
commands.MakeUpdate(mgr, makeInitClient(mgr, clientInit)),
|
||||
commands.MakeGet(mgr, makeInitClient(mgr, clientInit)),
|
||||
commands.MakeDelete(makeInitClient(mgr, clientInit)),
|
||||
)
|
||||
|
||||
check(rootCmd.Execute())
|
||||
}
|
||||
|
|
|
@ -16,10 +16,20 @@ type Credential struct {
|
|||
}
|
||||
|
||||
func (c Credential) String() string {
|
||||
return fmt.Sprintf(
|
||||
"username = %s\nemail = %s\n%s",
|
||||
c.Username, c.Email, c.Metadata,
|
||||
)
|
||||
format := "%s"
|
||||
args := []interface{}{c.Metadata}
|
||||
|
||||
if c.Username != "" {
|
||||
format += "username = %s\n"
|
||||
args = append(args, c.Username)
|
||||
}
|
||||
|
||||
if c.Email != "" {
|
||||
format += "email = %s\n"
|
||||
args = append(args, c.Email)
|
||||
}
|
||||
|
||||
return fmt.Sprintf(format, args...)
|
||||
}
|
||||
|
||||
type CredentialInput struct {
|
||||
|
@ -41,10 +51,20 @@ type Metadata struct {
|
|||
}
|
||||
|
||||
func (m Metadata) String() string {
|
||||
return fmt.Sprintf(
|
||||
"id = %s\nsourceHost = %s\ncreatedAt = %s\nupdatedAt = %s\nprimary = %s\nloginUrl = %s\ntag = %s\n",
|
||||
m.ID, m.SourceHost, m.CreatedAt, m.UpdatedAt, m.Primary, m.LoginURL, m.Tag,
|
||||
)
|
||||
format := "id = %s\ncreatedAt = %s\nupdatedAt = %s\nsourceHost = %s\nprimary = %s\n"
|
||||
args := []interface{}{m.ID, m.CreatedAt, m.UpdatedAt, m.SourceHost, m.Primary}
|
||||
|
||||
if m.LoginURL != "" {
|
||||
format += "loginUrl = %s\n"
|
||||
args = append(args, m.LoginURL)
|
||||
}
|
||||
|
||||
if m.Tag != "" {
|
||||
format += "tag = %s\n"
|
||||
args = append(args, m.Tag)
|
||||
}
|
||||
|
||||
return fmt.Sprintf(format, args...)
|
||||
}
|
||||
|
||||
type MetadataInput struct {
|
||||
|
|
Loading…
Reference in New Issue