Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolves #403 - Add support for --repeat and --ignore-errors #438

Merged
merged 1 commit into from
Jan 8, 2024
Merged

Resolves #403 - Add support for --repeat and --ignore-errors #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
93 changes: 53 additions & 40 deletions cmd/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ func NewCreateCommand(parentCmd *cobra.Command) func() {
var ifAliasExists = ""
var ifAliasDoesNotExist = ""
var skipAliases = false
var repeat uint32 = 1
var repeatDelay uint32 = 100
var ignoreErrors = false

resetFunc := func() {
autoFillOnCreate = false
Expand All @@ -60,6 +63,9 @@ func NewCreateCommand(parentCmd *cobra.Command) func() {
overrides.QueryParameters = nil
skipAliases = false
compactOutput = false
repeat = 1
repeatDelay = 100
ignoreErrors = false
}

for _, resource := range resources.GetPluralResources() {
Expand All @@ -78,71 +84,74 @@ func NewCreateCommand(parentCmd *cobra.Command) func() {
Example: GetCreateExample(resource),
Args: GetArgFunctionForCreate(resource),
RunE: func(cmd *cobra.Command, args []string) error {

if ifAliasExists != "" {
aliasId := aliases.ResolveAliasValuesOrReturnIdentity(resource.JsonApiType, resource.AlternateJsonApiTypesForAliases, ifAliasExists, "id")

if aliasId == ifAliasExists {
// If the aliasId is the same as requested, it means an alias did not exist.
log.Infof("Alias [%s] does not exist, not continuing run", ifAliasExists)
return nil
c := func(cmd *cobra.Command, args []string) error {
if ifAliasExists != "" {
aliasId := aliases.ResolveAliasValuesOrReturnIdentity(resource.JsonApiType, resource.AlternateJsonApiTypesForAliases, ifAliasExists, "id")

if aliasId == ifAliasExists {
// If the aliasId is the same as requested, it means an alias did not exist.
log.Infof("Alias [%s] does not exist, not continuing run", ifAliasExists)
return nil
}
}
}

if ifAliasDoesNotExist != "" {
aliasId := aliases.ResolveAliasValuesOrReturnIdentity(resource.JsonApiType, resource.AlternateJsonApiTypesForAliases, ifAliasDoesNotExist, "id")
if ifAliasDoesNotExist != "" {
aliasId := aliases.ResolveAliasValuesOrReturnIdentity(resource.JsonApiType, resource.AlternateJsonApiTypesForAliases, ifAliasDoesNotExist, "id")

if aliasId != ifAliasDoesNotExist {
// If the aliasId is different than the request then it does exist.
log.Infof("Alias [%s] does exist (value: %s), not continuing run", ifAliasDoesNotExist, aliasId)
return nil
if aliasId != ifAliasDoesNotExist {
// If the aliasId is different than the request then it does exist.
log.Infof("Alias [%s] does exist (value: %s), not continuing run", ifAliasDoesNotExist, aliasId)
return nil
}
}
}

body, err := createInternal(context.Background(), overrides, append([]string{resourceName}, args...), autoFillOnCreate, setAlias, skipAliases)

if err != nil {
return err
}

if outputJq != "" {
output, err := json.RunJQOnStringWithArray(outputJq, body)
body, err := createInternal(context.Background(), overrides, append([]string{resourceName}, args...), autoFillOnCreate, setAlias, skipAliases)

if err != nil {
return err
}

for _, outputLine := range output {
outputJson, err := gojson.Marshal(outputLine)
if outputJq != "" {
output, err := json.RunJQOnStringWithArray(outputJq, body)

if err != nil {
return err
}

err = json.PrintJson(string(outputJson))
for _, outputLine := range output {
outputJson, err := gojson.Marshal(outputLine)

if err != nil {
return err
if err != nil {
return err
}

err = json.PrintJson(string(outputJson))

if err != nil {
return err
}
}
}

return nil
}
return nil
}

if noBodyPrint {
return nil
} else {
if compactOutput {
body, err = json.Compact(body)
if noBodyPrint {
return nil
} else {
if compactOutput {
body, err = json.Compact(body)

if err != nil {
return err
if err != nil {
return err
}
}

return json.PrintJson(body)
}

return json.PrintJson(body)
}

return repeater(c, repeat, repeatDelay, cmd, args, ignoreErrors)
},

ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
Expand Down Expand Up @@ -218,11 +227,15 @@ func NewCreateCommand(parentCmd *cobra.Command) func() {
createCmd.PersistentFlags().StringSliceVarP(&overrides.QueryParameters, "query-parameters", "q", []string{}, "Pass in key=value an they will be added as query parameters")
createCmd.PersistentFlags().StringVarP(&outputJq, "output-jq", "", "", "A jq expression, if set we will restrict output to only this")
createCmd.PersistentFlags().BoolVarP(&compactOutput, "compact", "", false, "Hides some of the boiler plate keys and empty fields, etc...")
createCmd.PersistentFlags().BoolVarP(&ignoreErrors, "ignore-errors", "", false, "Don't return non zero on an error")
createCmd.PersistentFlags().StringVarP(&setAlias, "save-as-alias", "", "", "A name to save the created resource as")
createCmd.PersistentFlags().StringVarP(&ifAliasExists, "if-alias-exists", "", "", "If the alias exists we will run this command, otherwise exit with no error")
createCmd.PersistentFlags().StringVarP(&ifAliasDoesNotExist, "if-alias-does-not-exist", "", "", "If the alias does not exist we will run this command, otherwise exit with no error")
createCmd.PersistentFlags().BoolVarP(&skipAliases, "skip-alias-processing", "", false, "if set, we don't process the response for aliases")
createCmd.MarkFlagsMutuallyExclusive("if-alias-exists", "if-alias-does-not-exist")
createCmd.PersistentFlags().Uint32VarP(&repeat, "repeat", "", 1, "Number of times to repeat the command")
createCmd.PersistentFlags().Uint32VarP(&repeatDelay, "repeat-delay", "", 100, "Delay (in ms) between repeats")

_ = createCmd.RegisterFlagCompletionFunc("output-jq", jqCompletionFunc)

return resetFunc
Expand Down
64 changes: 43 additions & 21 deletions cmd/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,21 @@ func NewDeleteCommand(parentCmd *cobra.Command) func() {
var allow404 = false
var ifAliasExists = ""
var ifAliasDoesNotExist = ""
var repeat uint32 = 1
var repeatDelay uint32 = 100
var ignoreErrors = false
var noBodyPrint = false

resetFunc := func() {
overrides.QueryParameters = nil
overrides.OverrideUrlPath = ""
allow404 = false
ifAliasExists = ""
ifAliasDoesNotExist = ""
noBodyPrint = false
repeat = 1
repeatDelay = 100
ignoreErrors = false
}

for _, resource := range resources.GetPluralResources() {
Expand All @@ -65,37 +73,46 @@ func NewDeleteCommand(parentCmd *cobra.Command) func() {
Example: GetDeleteExample(resource),
Args: GetArgFunctionForDelete(resource),
RunE: func(cmd *cobra.Command, args []string) error {
c := func(cmd *cobra.Command, args []string) error {
if ifAliasExists != "" {
aliasId := aliases.ResolveAliasValuesOrReturnIdentity(resource.JsonApiType, resource.AlternateJsonApiTypesForAliases, ifAliasExists, "id")

if aliasId == ifAliasExists {
// If the aliasId is the same as requested, it means an alias did not exist.
log.Infof("Alias [%s] does not exist, not continuing run", ifAliasExists)
return nil
}
}

if ifAliasExists != "" {
aliasId := aliases.ResolveAliasValuesOrReturnIdentity(resource.JsonApiType, resource.AlternateJsonApiTypesForAliases, ifAliasExists, "id")
if ifAliasDoesNotExist != "" {
aliasId := aliases.ResolveAliasValuesOrReturnIdentity(resource.JsonApiType, resource.AlternateJsonApiTypesForAliases, ifAliasDoesNotExist, "id")

if aliasId == ifAliasExists {
// If the aliasId is the same as requested, it means an alias did not exist.
log.Infof("Alias [%s] does not exist, not continuing run", ifAliasExists)
return nil
if aliasId != ifAliasDoesNotExist {
// If the aliasId is different than the request then it does exist.
log.Infof("Alias [%s] does exist (value: %s), not continuing run", ifAliasDoesNotExist, aliasId)
return nil
}
}
}

if ifAliasDoesNotExist != "" {
aliasId := aliases.ResolveAliasValuesOrReturnIdentity(resource.JsonApiType, resource.AlternateJsonApiTypesForAliases, ifAliasDoesNotExist, "id")
body, err := deleteInternal(context.Background(), overrides, allow404, append([]string{resourceName}, args...))

if aliasId != ifAliasDoesNotExist {
// If the aliasId is different than the request then it does exist.
log.Infof("Alias [%s] does exist (value: %s), not continuing run", ifAliasDoesNotExist, aliasId)
return nil
if err != nil {
if body != "" {
if !noBodyPrint {
json.PrintJson(body)
}
}
return err
}
}

body, err := deleteInternal(context.Background(), overrides, allow404, append([]string{resourceName}, args...))

if err != nil {
if body != "" {
json.PrintJson(body)
if noBodyPrint {
return nil
} else {
return json.PrintJson(body)
}
return err
}

return json.PrintJson(body)
return repeater(c, repeat, repeatDelay, cmd, args, ignoreErrors)
},

ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
Expand Down Expand Up @@ -165,7 +182,12 @@ func NewDeleteCommand(parentCmd *cobra.Command) func() {
deleteCmd.PersistentFlags().BoolVar(&allow404, "allow-404", allow404, "If set 404's will not be treated as errors")
deleteCmd.PersistentFlags().StringVarP(&ifAliasExists, "if-alias-exists", "", "", "If the alias exists we will run this command, otherwise exit with no error")
deleteCmd.PersistentFlags().StringVarP(&ifAliasDoesNotExist, "if-alias-does-not-exist", "", "", "If the alias does not exist we will run this command, otherwise exit with no error")
deleteCmd.PersistentFlags().BoolVarP(&noBodyPrint, "silent", "s", false, "Don't print the body on success")
deleteCmd.MarkFlagsMutuallyExclusive("if-alias-exists", "if-alias-does-not-exist")
deleteCmd.PersistentFlags().Uint32VarP(&repeat, "repeat", "", 1, "Number of times to repeat the command")
deleteCmd.PersistentFlags().Uint32VarP(&repeatDelay, "repeat-delay", "", 100, "Delay (in ms) between repeats")
deleteCmd.PersistentFlags().BoolVarP(&ignoreErrors, "ignore-errors", "", false, "Don't return non zero on an error")

parentCmd.AddCommand(deleteCmd)

return resetFunc
Expand Down
Loading
Loading