From 6f5fd20a2c1735312b837b87c8e6a98645dc9b38 Mon Sep 17 00:00:00 2001 From: jamesread Date: Tue, 5 Apr 2022 11:28:35 +0100 Subject: [PATCH] fmt: gofmt cleanup --- internal/config/config.go | 10 +++++----- internal/executor/executor.go | 4 ++-- internal/httpservers/webuiServer.go | 3 +-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/internal/config/config.go b/internal/config/config.go index 7ae231b..32ee9f9 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -13,7 +13,7 @@ type Action struct { Arguments []ActionArgument } -// ActionArgument objects appear on Actions. +// ActionArgument objects appear on Actions. type ActionArgument struct { Name string Title string @@ -69,8 +69,8 @@ type Config struct { Actions []Action `mapstructure:"actions"` Entities []Entity `mapstructure:"entities"` CheckForUpdates bool - ShowFooter bool - ShowNavigation bool + ShowFooter bool + ShowNavigation bool ShowNewVersions bool Usergroups []UserGroup DefaultPermissions DefaultPermissions @@ -80,9 +80,9 @@ type Config struct { func DefaultConfig() *Config { config := Config{} config.UseSingleHTTPFrontend = true - config.ShowFooter = true + config.ShowFooter = true config.ShowNavigation = true - config.ShowNewVersions = true + config.ShowNewVersions = true config.ListenAddressSingleHTTPFrontend = "0.0.0.0:1337" config.ListenAddressRestActions = "localhost:1338" config.ListenAddressGrpcActions = "localhost:1339" diff --git a/internal/executor/executor.go b/internal/executor/executor.go index d1cfc25..7ddf928 100644 --- a/internal/executor/executor.go +++ b/internal/executor/executor.go @@ -6,13 +6,13 @@ import ( config "github.com/jamesread/OliveTin/internal/config" log "github.com/sirupsen/logrus" + "bytes" "context" "errors" "os/exec" "regexp" "strings" "time" - "bytes" ) var ( @@ -199,7 +199,7 @@ func (e stepExec) Exec(req *ExecutionRequest) bool { cmd.Stderr = &stderr runerr := cmd.Run() - + req.logEntry.ExitCode = int32(cmd.ProcessState.ExitCode()) req.logEntry.Stdout = stdout.String() req.logEntry.Stderr = stderr.String() diff --git a/internal/httpservers/webuiServer.go b/internal/httpservers/webuiServer.go index 38c230d..d801399 100644 --- a/internal/httpservers/webuiServer.go +++ b/internal/httpservers/webuiServer.go @@ -14,7 +14,7 @@ import ( type webUISettings struct { Rest string ThemeName string - ShowFooter bool + ShowFooter bool ShowNavigation bool ShowNewVersions bool AvailableVersion string @@ -52,7 +52,6 @@ func generateWebUISettings(w http.ResponseWriter, r *http.Request) { ShowNewVersions: cfg.ShowNewVersions, AvailableVersion: updatecheck.AvailableVersion, CurrentVersion: updatecheck.CurrentVersion, - }) _, err := w.Write([]byte(jsonRet))