--http-probe-fail-on-status-4xx flag to fail http probes for 4xx response status

Signed-off-by: Kyle Quest <kcq.public@gmail.com>

Author: kcq

pkg/app/master/command/build/prompt.go

@@ -64,6 +64,7 @@ var CommandFlagSuggestions = &command.FlagSuggestions{
 		{Text: command.FullFlagName(command.FlagHTTPProbeExitOnFailure), Description: command.FlagHTTPProbeExitOnFailureUsage},
 		{Text: command.FullFlagName(command.FlagHTTPProbeExitOnFailureCount), Description: command.FlagHTTPProbeExitOnFailureCountUsage},
 		{Text: command.FullFlagName(command.FlagHTTPProbeFailOnStatus5xx), Description: command.FlagHTTPProbeFailOnStatus5xxUsage},
+		{Text: command.FullFlagName(command.FlagHTTPProbeFailOnStatus4xx), Description: command.FlagHTTPProbeFailOnStatus4xxUsage},
 		{Text: command.FullFlagName(command.FlagHTTPProbeConcurrency), Description: command.FlagHTTPProbeConcurrencyUsage},
 		{Text: command.FullFlagName(command.FlagHTTPProbeCrawl), Description: command.FlagHTTPProbeCrawlUsage},
 		{Text: command.FullFlagName(command.FlagHTTPCrawlMaxDepth), Description: command.FlagHTTPCrawlMaxDepthUsage},
@@ -197,6 +198,7 @@ var CommandFlagSuggestions = &command.FlagSuggestions{
 		command.FullFlagName(command.FlagHTTPProbeFull):                  command.CompleteTBool,
 		command.FullFlagName(command.FlagHTTPProbeExitOnFailure):         command.CompleteTBool,
 		command.FullFlagName(command.FlagHTTPProbeFailOnStatus5xx):       command.CompleteBool,
+		command.FullFlagName(command.FlagHTTPProbeFailOnStatus4xx):       command.CompleteBool,
 		command.FullFlagName(command.FlagHTTPProbeCrawl):                 command.CompleteTBool,
 		command.FullFlagName(command.FlagHTTPProbeAPISpecFile):           command.CompleteFile,
 		command.FullFlagName(command.FlagHostExecFile):                   command.CompleteFile,

pkg/app/master/command/cliflags.go

@@ -135,6 +135,7 @@ const (
 	FlagHTTPProbeExitOnFailure      = "http-probe-exit-on-failure"
 	FlagHTTPProbeExitOnFailureCount = "http-probe-exit-on-failure-count"
 	FlagHTTPProbeFailOnStatus5xx    = "http-probe-fail-on-status-5xx"
+	FlagHTTPProbeFailOnStatus4xx    = "http-probe-fail-on-status-4xx"
 	FlagHTTPProbeConcurrency        = "http-probe-concurrency"
 	FlagHTTPProbeCrawl              = "http-probe-crawl"
 	FlagHTTPCrawlMaxDepth           = "http-crawl-max-depth"
@@ -255,6 +256,7 @@ const (
 	FlagHTTPProbeExitOnFailureUsage      = "Exit when all HTTP probe commands fail"
 	FlagHTTPProbeExitOnFailureCountUsage = "Exit when selected number of probe call failures happens"
 	FlagHTTPProbeFailOnStatus5xxUsage    = "Treat 5xx HTTP status codes as errors during HTTP probing"
+	FlagHTTPProbeFailOnStatus4xxUsage    = "Treat 4xx HTTP status codes as errors during HTTP probing"
 	FlagHTTPProbeConcurrencyUsage        = "Max number of concurrent requests executing HTTP probes"
 	FlagHTTPProbeCrawlUsage              = "Enable crawling for the default HTTP probe command"
 	FlagHTTPCrawlMaxDepthUsage           = "Max depth to use for the HTTP probe crawler"
@@ -758,6 +760,11 @@ var CommonFlags = map[string]cli.Flag{
 		Usage:   FlagHTTPProbeFailOnStatus5xxUsage,
 		EnvVars: []string{"DSLIM_HTTP_PROBE_FAIL_ON_5XX"},
 	},
+	FlagHTTPProbeFailOnStatus4xx: &cli.BoolFlag{
+		Name:    FlagHTTPProbeFailOnStatus4xx,
+		Usage:   FlagHTTPProbeFailOnStatus4xxUsage,
+		EnvVars: []string{"DSLIM_HTTP_PROBE_FAIL_ON_4XX"},
+	},
 	FlagHTTPProbeConcurrency: &cli.IntFlag{
 		Name:    FlagHTTPProbeConcurrency,
 		Value:   5,
@@ -1056,6 +1063,7 @@ func HTTPProbeFlags() []cli.Flag {
 		Cflag(FlagHTTPProbeExitOnFailure),
 		Cflag(FlagHTTPProbeExitOnFailureCount),
 		Cflag(FlagHTTPProbeFailOnStatus5xx),
+		Cflag(FlagHTTPProbeFailOnStatus4xx),
 	}, HTTPProbeFlagsBasic()...)
 }
 

pkg/app/master/command/clifvgetter.go

@@ -80,6 +80,7 @@ func GetHTTPProbeOptions(xc *app.ExecutionContext, ctx *cli.Context, doProbe boo
 		opts.ExitOnFailure = ctx.Bool(FlagHTTPProbeExitOnFailure)
 		opts.ExitOnFailureCount = ctx.Int(FlagHTTPProbeExitOnFailureCount)
 		opts.FailOnStatus5xx = ctx.Bool(FlagHTTPProbeFailOnStatus5xx)
+		opts.FailOnStatus4xx = ctx.Bool(FlagHTTPProbeFailOnStatus4xx)
 	}
 
 	cmds, err := GetHTTPProbes(ctx)

pkg/app/master/command/profile/prompt.go

@@ -38,6 +38,7 @@ var CommandFlagSuggestions = &command.FlagSuggestions{
 		{Text: command.FullFlagName(command.FlagHTTPProbeExitOnFailure), Description: command.FlagHTTPProbeExitOnFailureUsage},
 		{Text: command.FullFlagName(command.FlagHTTPProbeExitOnFailureCount), Description: command.FlagHTTPProbeExitOnFailureCountUsage},
 		{Text: command.FullFlagName(command.FlagHTTPProbeFailOnStatus5xx), Description: command.FlagHTTPProbeFailOnStatus5xxUsage},
+		{Text: command.FullFlagName(command.FlagHTTPProbeFailOnStatus4xx), Description: command.FlagHTTPProbeFailOnStatus4xxUsage},
 		{Text: command.FullFlagName(command.FlagHTTPProbeConcurrency), Description: command.FlagHTTPProbeConcurrencyUsage},
 		{Text: command.FullFlagName(command.FlagHTTPProbeCrawl), Description: command.FlagHTTPProbeCrawlUsage},
 		{Text: command.FullFlagName(command.FlagHTTPCrawlMaxDepth), Description: command.FlagHTTPCrawlMaxDepthUsage},
@@ -91,6 +92,7 @@ var CommandFlagSuggestions = &command.FlagSuggestions{
 		command.FullFlagName(command.FlagHTTPProbeFull):            command.CompleteTBool,
 		command.FullFlagName(command.FlagHTTPProbeExitOnFailure):   command.CompleteTBool,
 		command.FullFlagName(command.FlagHTTPProbeFailOnStatus5xx): command.CompleteBool,
+		command.FullFlagName(command.FlagHTTPProbeFailOnStatus4xx): command.CompleteBool,
 		command.FullFlagName(command.FlagHTTPProbeCrawl):           command.CompleteTBool,
 		command.FullFlagName(command.FlagHTTPProbeAPISpecFile):     command.CompleteFile,
 		command.FullFlagName(command.FlagHTTPProbeRetryOff):        command.CompleteBool,

pkg/app/master/config/http_probe.go

@@ -84,6 +84,7 @@ type HTTPProbeOptions struct {
 	ExitOnFailure      bool
 	ExitOnFailureCount int
 	FailOnStatus5xx    bool
+	FailOnStatus4xx    bool
 
 	ClientTimeout      int
 	CrawlClientTimeout int

pkg/app/master/probe/http/custom_probe.go

@@ -43,6 +43,7 @@ const (
 
 var (
 	ErrFailOnStatus5xx = errors.New("failed on status code 5xx")
+	ErrFailOnStatus4xx = errors.New("failed on status code 4xx")
 )
 
 type ovars = app.OutVars
@@ -934,6 +935,19 @@ func (p *CustomProbe) call(
 						})
 				}
 			}
+			if p.opts.FailOnStatus4xx &&
+				res.StatusCode >= 400 &&
+				res.StatusCode < 500 {
+				err = ErrFailOnStatus4xx
+				if p.printState {
+					p.xc.Out.Info("http.probe.call.status.error",
+						ovars{
+							"status":   statusCode,
+							"method":   cmd.Method,
+							"endpoint": addr,
+						})
+				}
+			}
 		} else {
 			callErrorStr = err.Error()
 		}

pkg/app/master/probe/http/swagger.go

@@ -652,6 +652,18 @@ func (p *CustomProbe) apiSpecEndpointCall(
 							"endpoint": endpoint,
 						})
 				}
+			} else if p.opts.FailOnStatus4xx &&
+				res.StatusCode >= 400 &&
+				res.StatusCode < 500 {
+				err = ErrFailOnStatus4xx
+				if p.printState {
+					p.xc.Out.Info("http.probe.api-spec.probe.endpoint.call.status.error.4xx",
+						ovars{
+							"status":   statusCode,
+							"method":   method,
+							"endpoint": endpoint,
+						})
+				}
 			} else if res.StatusCode == http.StatusInternalServerError {
 				if p.printState {
 					p.xc.Out.Info("http.probe.api-spec.probe.endpoint.call.status.500.try.again.with.different.data",