Cleanup

- allow checks to be read from STDIN
- reduce log level to debug for a lot of logs

Author: prskr

assets/examples/checks.txt

@@ -0,0 +1,4 @@
+http.GET("https://stackoverflow.com/index.html") => Status(200) -> Header("Content-Type", "text/html") -> Contains(`<title>INetSim default HTML page</title>`)
+http.GET("https://google.com/favicon.ico") => Status(200) -> SHA256("cb3f33cb0c7bae881d13be647cb928aa7fec9e9fcd6ec758751374bf7436d41a")
+http.POST("https://api.icndb.com/jokes/new", `{"joke":"asdf","categories":[]}`) => Status(204)
+http.PUT("https://api.icndb.com/jokes/37", `{"joke":"asdf","categories":[]}`) => Status(204)

cmd/imctl/check.go

@@ -1,10 +1,12 @@
 package main
 
 import (
+	"bufio"
 	"bytes"
 	"context"
 	"crypto/tls"
 	"crypto/x509"
+	"errors"
 	"fmt"
 	"io"
 	"net"
@@ -30,13 +32,32 @@ var (
 	runCheckCmd = &cobra.Command{
 		Use:     "run",
 		Short:   "Run a check script",
-		Args:    cobra.ExactArgs(1),
+		Args:    cobra.MaximumNArgs(1),
 		Aliases: []string{"exec"},
 		RunE: func(_ *cobra.Command, args []string) error {
-			if len(args) != 1 {
+			if len(args) > 1 {
 				return fmt.Errorf("expected 1 argument, got %d", len(args))
 			}
-			return runCheck(args[0])
+
+			switch len(args) {
+			case 0:
+				var stdinReader = bufio.NewReader(os.Stdin)
+				var script = make([]string, 0)
+				for {
+					if line, err := stdinReader.ReadString('\n'); err != nil {
+						if errors.Is(err, io.EOF) {
+							return runCheck(script)
+						}
+						return err
+					} else {
+						script = append(script, line)
+					}
+				}
+			case 1:
+				return runCheck(args)
+			default:
+				return errors.New("missing script")
+			}
 		},
 		SilenceUsage: true,
 	}
@@ -62,7 +83,7 @@ func init() {
 	checkCmd.AddCommand(runCheckCmd)
 }
 
-func runCheck(script string) error {
+func runCheck(script []string) error {
 	var healthCfg = health.Config{
 		Client: health.HTTPClientConfig{
 			HTTP: health.Server{
@@ -101,19 +122,23 @@ func runCheck(script string) error {
 	}
 
 	var client = health.HTTPClient(healthCfg, tlsConfig)
+	var check = new(rules.Check)
 
-	check := new(rules.Check)
-	if err := rules.Parse(script, check); err != nil {
-		return err
-	}
+	for idx := range script {
+		rawRule := script[idx]
+		if err := rules.Parse(rawRule, check); err != nil {
+			return err
+		}
 
-	if compiledCheck, err := health.NewHTTPRuleCheck("CLI", client, cliApp.Logger().Named("check"), check); err != nil {
-		return err
-	} else {
-		ctx, cancel := context.WithTimeout(cliApp.Context(), runCheckArgs.Timeout)
-		defer cancel()
-		if err := compiledCheck.Status(ctx); err != nil {
+		if compiledCheck, err := health.NewHTTPRuleCheck("CLI", client, cliApp.Logger().Named("check"), check); err != nil {
 			return err
+		} else {
+			ctx, cancel := context.WithTimeout(cliApp.Context(), runCheckArgs.Timeout)
+			err := compiledCheck.Status(ctx)
+			cancel()
+			if err != nil {
+				return err
+			}
 		}
 	}
 	cliApp.Logger().Info("Successfully executed")

cmd/inetmock/serve.go

@@ -42,6 +42,8 @@ func startINetMock(_ *cobra.Command, _ []string) error {
 	var err error
 	appLogger := serverApp.Logger()
 
+	appLogger.Info("Starting the server")
+
 	if err = cfg.Data.setup(); err != nil {
 		appLogger.Error("Failed to setup data directories", zap.Error(err))
 		return err

internal/app/app.go

@@ -80,6 +80,7 @@ func (a *app) RootCommand() *cobra.Command {
 }
 
 func (a *app) Shutdown() {
+	a.logger.Info("Shutdown initiated")
 	a.cancel()
 }
 

internal/endpoint/handler/dns/mock/handler.go

@@ -40,8 +40,8 @@ func (d *dnsHandler) Start(ctx context.Context, lifecycle endpoint.Lifecycle) er
 	}
 
 	for _, rule := range options.Rules {
-		d.logger.Info(
-			"register DNS rule",
+		d.logger.Debug(
+			"Register DNS rule",
 			zap.String("pattern", rule.pattern.String()),
 			zap.String("response", rule.response.String()),
 		)

internal/endpoint/handler/http/mock/router.go

@@ -37,7 +37,7 @@ type Router struct {
 }
 
 func (r *Router) RegisterRule(rawRule string) error {
-	r.Logger.Info("Adding routing rule", zap.String("rawRule", rawRule))
+	r.Logger.Debug("Adding routing rule", zap.String("rawRule", rawRule))
 	var rule = new(rules.Routing)
 	if err := rules.Parse(rawRule, rule); err != nil {
 		return err
@@ -54,7 +54,7 @@ func (r *Router) RegisterRule(rawRule string) error {
 		return err
 	}
 
-	r.Logger.Info("Configure successfully parsed routing rule")
+	r.Logger.Debug("Configure successfully parsed routing rule")
 
 	r.handlers = append(r.handlers, ConditionalHandler{
 		Handler: handler,

internal/endpoint/handler/http/mock/router_behavior.go

@@ -74,7 +74,7 @@ func FileHandler(logger logging.Logger, fakeFileFS fs.FS, args ...rules.Param) (
 			_ = file.Close()
 		}()
 
-		logger.Info("Returning file response")
+		logger.Debug("Returning file response")
 		//nolint:gosec
 		http.ServeContent(writer, request, path.Base(request.RequestURI), time.Now().Add(-(time.Duration(rand.Int()) * time.Millisecond)), rs)
 	}), nil
@@ -97,7 +97,7 @@ func StatusHandler(logger logging.Logger, _ fs.FS, args ...rules.Param) (http.Ha
 	)
 
 	return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-		logger.Info("Returning status code")
+		logger.Debug("Returning status code")
 		writer.WriteHeader(statusCodeToReturn)
 	}), nil
 }

internal/endpoint/orchestrator.go

@@ -71,15 +71,15 @@ func (e *orchestrator) StartEndpoints(ctx context.Context) chan error {
 		endpointLogger := e.logger.With(
 			zap.String("epListener", epListener.name),
 		)
-		endpointLogger.Info("Starting epListener")
+		endpointLogger.Debug("Starting endpoint listener")
 		lifecycle := NewEndpointLifecycle(
 			epListener.name,
 			epListener.uplink,
 			epListener.Options,
 		)
 
 		if err := epListener.Start(ctx, e.logger.With(zap.String("epListener", epListener.name)), lifecycle); err == nil {
-			endpointLogger.Info("successfully started epListener")
+			endpointLogger.Debug("Successfully started epListener")
 		} else {
 			endpointLogger.Error("error occurred during epListener startup - will be skipped for now")
 		}

pkg/health/http/check_initiator.go

@@ -106,7 +106,7 @@ func RequestInitiatorForMethod(method string) func(logger logging.Logger, params
 			zap.String("uri", uri),
 		)
 
-		logger.Info("Setup health initiator")
+		logger.Debug("Setup health initiator")
 
 		return &simpleRequest{
 			logger:     logger,