Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ linters:
- nakedret
- golint
- gocritic
- goconst
- gocognit
- funlen
- gocyclo
Expand All @@ -61,6 +60,9 @@ linters-settings:
revive:
ignore-generated-header: true
severity: warning
goconst:
ignore-tests: true
numbers: true
gomnd:
ignored-numbers: # Why we have a big range of file permissions
- '0644'
Expand Down
8 changes: 4 additions & 4 deletions cmd/backup_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ func backupCreateCommand(l log.Logger, datastoreRepo models.DatastoreRepo, conf
}

if !skipConfirm {
proceedWithBackup := "Yes"
proceedWithBackup := AnswerYes
if err := survey.AskOne(&survey.Select{
Message: "Proceed with backup?",
Options: []string{"Yes", "No"},
Default: "No",
Options: []string{AnswerYes, AnswerNo},
Default: AnswerNo,
}, &proceedWithBackup); err != nil {
return err
}
if proceedWithBackup == "No" {
if proceedWithBackup == AnswerNo {
l.Info(coloredNotice("Aborting..."))
return nil
}
Expand Down
34 changes: 17 additions & 17 deletions cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ func configInitCommand(l log.Logger, dsRepo models.DatastoreRepo) *cli.Command {
Name: "RegisterProjectConfig",
Prompt: &survey.Select{
Message: "Register project configs?",
Options: []string{"Yes", "No"},
Default: "No",
Options: []string{AnswerYes, AnswerNo},
Default: AnswerNo,
},
},
}
Expand All @@ -59,7 +59,7 @@ func configInitCommand(l log.Logger, dsRepo models.DatastoreRepo) *cli.Command {
conf.Project.Name = answers["ProjectName"].(string)

// for project config
if option, ok := answers["RegisterProjectConfig"]; ok && option.(survey.OptionAnswer).Value == "Yes" {
if option, ok := answers["RegisterProjectConfig"]; ok && option.(survey.OptionAnswer).Value == AnswerYes {
conf, err = projectConfigQuestions(conf)
if err != nil {
return err
Expand All @@ -80,8 +80,8 @@ func configInitCommand(l log.Logger, dsRepo models.DatastoreRepo) *cli.Command {
Name: "RegisterNamespaceConfig",
Prompt: &survey.Select{
Message: "Register namespace configs?",
Options: []string{"Yes", "No"},
Default: "No",
Options: []string{AnswerYes, AnswerNo},
Default: AnswerNo,
},
},
}
Expand All @@ -92,7 +92,7 @@ func configInitCommand(l log.Logger, dsRepo models.DatastoreRepo) *cli.Command {

conf.Namespace.Name = answers["NamespaceName"].(string)
// for namespace config
if option, ok := answers["RegisterNamespaceConfig"]; ok && option.(survey.OptionAnswer).Value == "Yes" {
if option, ok := answers["RegisterNamespaceConfig"]; ok && option.(survey.OptionAnswer).Value == AnswerYes {
conf, err = namespaceConfigQuestions(conf)
if err != nil {
return err
Expand All @@ -114,8 +114,8 @@ func configInitCommand(l log.Logger, dsRepo models.DatastoreRepo) *cli.Command {
Name: "RegisterDatastore",
Prompt: &survey.Select{
Message: "Register datastore configs?",
Options: []string{"Yes", "No"},
Default: "No",
Options: []string{AnswerYes, AnswerNo},
Default: AnswerNo,
},
},
}
Expand All @@ -124,7 +124,7 @@ func configInitCommand(l log.Logger, dsRepo models.DatastoreRepo) *cli.Command {
return err
}
conf.Namespace.Job.Path = answers["JobPath"].(string)
if option, ok := answers["RegisterDatastore"]; ok && option.(survey.OptionAnswer).Value == "Yes" {
if option, ok := answers["RegisterDatastore"]; ok && option.(survey.OptionAnswer).Value == AnswerYes {
conf, err = datastoreConfigQuestions(conf, dsRepo)
if err != nil {
return err
Expand All @@ -147,8 +147,8 @@ func configInitCommand(l log.Logger, dsRepo models.DatastoreRepo) *cli.Command {

func projectConfigQuestions(conf config.Optimus) (config.Optimus, error) {
conf.Project.Config = map[string]string{}
registerMore := "Yes"
for registerMore == "Yes" {
registerMore := AnswerYes
for registerMore == AnswerNo {
configAnswers := map[string]interface{}{}
if err := survey.Ask([]*survey.Question{
{
Expand All @@ -171,8 +171,8 @@ func projectConfigQuestions(conf config.Optimus) (config.Optimus, error) {

if err := survey.AskOne(&survey.Select{
Message: "Add one more?",
Options: []string{"Yes", "No"},
Default: "Yes",
Options: []string{AnswerYes, AnswerNo},
Default: AnswerYes,
}, &registerMore); err != nil {
return conf, err
}
Expand All @@ -184,8 +184,8 @@ func projectConfigQuestions(conf config.Optimus) (config.Optimus, error) {

func namespaceConfigQuestions(conf config.Optimus) (config.Optimus, error) {
conf.Namespace.Config = map[string]string{}
registerMore := "Yes"
for registerMore == "Yes" {
registerMore := AnswerYes
for registerMore == AnswerYes {
configAnswers := map[string]interface{}{}
if err := survey.Ask([]*survey.Question{
{
Expand All @@ -208,8 +208,8 @@ func namespaceConfigQuestions(conf config.Optimus) (config.Optimus, error) {

if err := survey.AskOne(&survey.Select{
Message: "Add one more?",
Options: []string{"Yes", "No"},
Default: "Yes",
Options: []string{AnswerYes, AnswerNo},
Default: AnswerYes,
}, &registerMore); err != nil {
return conf, err
}
Expand Down
6 changes: 6 additions & 0 deletions cmd/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package cmd

const (
AnswerYes = "Yes"
AnswerNo = "No"
)
8 changes: 4 additions & 4 deletions cmd/replay_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ Date ranges are inclusive.
}

if !skipConfirm {
proceedWithReplay := "Yes"
proceedWithReplay := AnswerYes
if err := survey.AskOne(&survey.Select{
Message: "Proceed with replay?",
Options: []string{"Yes", "No"},
Default: "No",
Options: []string{AnswerYes, AnswerNo},
Default: AnswerNo,
}, &proceedWithReplay); err != nil {
return err
}
if proceedWithReplay == "No" {
if proceedWithReplay == AnswerNo {
l.Info("Aborting...")
return nil
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,17 @@ Use base64 flag if the value has been encoded.
err = registerSecret(l, conf.Host, registerSecretReq)
if err != nil {
if status.Code(err) == codes.AlreadyExists {
proceedWithUpdate := "Yes"
proceedWithUpdate := AnswerYes
if !skipConfirm {
if err := survey.AskOne(&survey.Select{
Message: "Secret already exists, proceed with update?",
Options: []string{"Yes", "No"},
Default: "No",
Options: []string{AnswerYes, AnswerNo},
Default: AnswerNo,
}, &proceedWithUpdate); err != nil {
return err
}
}
if proceedWithUpdate == "Yes" {
if proceedWithUpdate == AnswerYes {
updateSecretRequest := &pb.UpdateSecretRequest{
ProjectName: projectName,
SecretName: secretName,
Expand Down