medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: fieldalignment across code base to reduce memory usage

This commit is contained in:
jamesread 2026-07-28 22:26:51 +01:00
parent e6a232f21b
commit a1f03e7d33
16 changed files with 162 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
service/internal/acl/acl_test.go
View File

@ -9,10 +9,10 @@ import (
func Test_hasGroupsMatch(t *testing.T) { func Test_hasGroupsMatch(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
aclMatchUsergroups []string
usergroupLine string usergroupLine string
matches bool
sep string sep string
aclMatchUsergroups []string
matches bool
}{ }{
{ {
name: "No groups match", name: "No groups match",

2
service/internal/api/api.go
View File

@ -63,9 +63,9 @@ func (api *oliveTinAPI) copyOfStreamingClients() []*streamingClient {
type streamingClient struct { type streamingClient struct {
channel chan *apiv1.EventStreamResponse channel chan *apiv1.EventStreamResponse
AuthenticatedUser *authpublic.AuthenticatedUser AuthenticatedUser *authpublic.AuthenticatedUser
heartbeatStopOnce sync.Once
heartbeatStop chan struct{} heartbeatStop chan struct{}
heartbeatDone chan struct{} heartbeatDone chan struct{}
heartbeatStopOnce sync.Once
} }
func (c *streamingClient) stopHeartbeat() { func (c *streamingClient) stopHeartbeat() {

2
service/internal/api/apiActions.go
View File

@ -25,9 +25,9 @@ type DashboardRenderRequest struct {
AuthenticatedUser *authpublic.AuthenticatedUser AuthenticatedUser *authpublic.AuthenticatedUser
cfg *config.Config cfg *config.Config
ex *executor.Executor ex *executor.Executor
activeBindingStates map[string]bindingActiveState
EntityType string EntityType string
EntityKey string EntityKey string
activeBindingStates map[string]bindingActiveState
} }
func activeBindingID(entry *executor.InternalLogEntry) string { func activeBindingID(entry *executor.InternalLogEntry) string {

2
service/internal/api/api_test.go
View File

@ -226,9 +226,9 @@ func validateConsistency(t *testing.T, client apiv1connect.OliveTinApiServiceCli
func TestEvaluateEnabledExpression(t *testing.T) { func TestEvaluateEnabledExpression(t *testing.T) {
tests := []struct { tests := []struct {
entity *entities.Entity
name string name string
expression string expression string
entity *entities.Entity
expectedResult bool expectedResult bool
}{ }{
{ {

13
service/internal/auth/authpublic/authenticateduser.go
View File

@ -10,15 +10,12 @@ import (
// User represents a person. // User represents a person.
type AuthenticatedUser struct { type AuthenticatedUser struct {
Username string
UsergroupLine string
Provider string
SID string
Acls []string
EffectivePolicy *config.ConfigurationPolicy EffectivePolicy *config.ConfigurationPolicy
Username string
UsergroupLine string
Provider string
SID string
Acls []string
} }
func (u *AuthenticatedUser) IsGuest() bool { func (u *AuthenticatedUser) IsGuest() bool {

2
service/internal/auth/authpublic/authenticateduser_test.go
View File

@ -10,8 +10,8 @@ func Test_parseUsergroupLine(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
usergroupLine string usergroupLine string
expectedGroups []string
sep string sep string
expectedGroups []string
}{ }{
{ {
name: "Default separator (space)", name: "Default separator (space)",

4
service/internal/auth/otoauth2/restapi_auth_oauth2.go
View File

@ -22,9 +22,9 @@ import (
type OAuth2Handler struct { type OAuth2Handler struct {
cfg *config.Config cfg *config.Config
mu sync.RWMutex
registeredStates map[string]*oauth2State registeredStates map[string]*oauth2State
registeredProviders map[string]*oauth2.Config registeredProviders map[string]*oauth2.Config
mu sync.RWMutex
} }
func NewOAuth2Handler(cfg *config.Config) *OAuth2Handler { func NewOAuth2Handler(cfg *config.Config) *OAuth2Handler {
@ -58,11 +58,11 @@ func NewOAuth2Handler(cfg *config.Config) *OAuth2Handler {
} }
type oauth2State struct { type oauth2State struct {
createdAt time.Time
providerConfig *oauth2.Config providerConfig *oauth2.Config
providerName string providerName string
Username string Username string
Usergroup string Usergroup string
createdAt time.Time
} }
const ( const (

187
service/internal/config/config.go
View File

@ -13,34 +13,33 @@ const JustificationRequiredNoTemplate = " "
// Action represents the core functionality of OliveTin - commands that show up // Action represents the core functionality of OliveTin - commands that show up
// as buttons in the UI. // as buttons in the UI.
type Action struct { type Action struct {
ID string `koanf:"id"` SaveLogs SaveLogsConfig `koanf:"saveLogs"`
Title string `koanf:"title"`
Icon string `koanf:"icon"`
Shell string `koanf:"shell"` Shell string `koanf:"shell"`
Exec []string `koanf:"exec"` Icon string `koanf:"icon"`
ShellAfterCompleted string `koanf:"shellAfterCompleted"`
Timeout int `koanf:"timeout"`
Acls []string `koanf:"acls"`
Entity string `koanf:"entity"`
Hidden bool `koanf:"hidden"`
ExecOnStartup bool `koanf:"execOnStartup"`
ExecOnCron []string `koanf:"execOnCron"`
ExecOnFileCreatedInDir []string `koanf:"execOnFileCreatedInDir"`
ExecOnFileChangedInDir []string `koanf:"execOnFileChangedInDir"`
ExecOnCalendarFile string `koanf:"execOnCalendarFile"` ExecOnCalendarFile string `koanf:"execOnCalendarFile"`
SourceFile string `koanf:"-"`
ShellAfterCompleted string `koanf:"shellAfterCompleted"`
Justification string `koanf:"justification"`
EnabledExpression string `koanf:"enabledExpression"`
Entity string `koanf:"entity"`
Title string `koanf:"title"`
PopupOnStart string `koanf:"popupOnStart"`
OnClick string `koanf:"onclick"`
ID string `koanf:"id"`
MaxRate []RateSpec `koanf:"maxRate"`
Acls []string `koanf:"acls"`
ExecOnWebhook []WebhookConfig `koanf:"execOnWebhook"` ExecOnWebhook []WebhookConfig `koanf:"execOnWebhook"`
Triggers []string `koanf:"triggers"` Triggers []string `koanf:"triggers"`
MaxConcurrent int `koanf:"maxConcurrent"` Exec []string `koanf:"exec"`
MaxRate []RateSpec `koanf:"maxRate"` ExecOnFileCreatedInDir []string `koanf:"execOnFileCreatedInDir"`
Arguments []ActionArgument `koanf:"arguments"` Arguments []ActionArgument `koanf:"arguments"`
OnClick string `koanf:"onclick"` ExecOnCron []string `koanf:"execOnCron"`
PopupOnStart string `koanf:"popupOnStart"`
SaveLogs SaveLogsConfig `koanf:"saveLogs"`
EnabledExpression string `koanf:"enabledExpression"`
Groups []string `koanf:"groups"` Groups []string `koanf:"groups"`
Justification string `koanf:"justification"` ExecOnFileChangedInDir []string `koanf:"execOnFileChangedInDir"`
// SourceFile is set by OliveTin when loading config (not user YAML). Timeout int `koanf:"timeout"`
SourceFile string `koanf:"-"` MaxConcurrent int `koanf:"maxConcurrent"`
Hidden bool `koanf:"hidden"`
ExecOnStartup bool `koanf:"execOnStartup"`
} }
func (action *Action) RequiresJustification() bool { func (action *Action) RequiresJustification() bool {
@ -61,23 +60,23 @@ func (action *Action) JustificationTemplateText() string {
// ActionGroup defines shared limits and metadata for a set of actions. // ActionGroup defines shared limits and metadata for a set of actions.
type ActionGroup struct { type ActionGroup struct {
Icon string `koanf:"icon"`
MaxConcurrent int `koanf:"maxConcurrent"` MaxConcurrent int `koanf:"maxConcurrent"`
QueueSize int `koanf:"queueSize"` QueueSize int `koanf:"queueSize"`
Icon string `koanf:"icon"`
} }
// ActionArgument objects appear on Actions. // ActionArgument objects appear on Actions.
type ActionArgument struct { type ActionArgument struct {
Suggestions map[string]string `koanf:"suggestions"`
Name string `koanf:"name"` Name string `koanf:"name"`
Title string `koanf:"title"` Title string `koanf:"title"`
Description string `koanf:"description"` Description string `koanf:"description"`
Type string `koanf:"type"` Type string `koanf:"type"`
Default string `koanf:"default"` Default string `koanf:"default"`
Choices []ActionArgumentChoice `koanf:"choices"`
Entity string `koanf:"entity"` Entity string `koanf:"entity"`
RejectNull bool `koanf:"rejectNull"`
Suggestions map[string]string `koanf:"suggestions"`
SuggestionsBrowserKey string `koanf:"suggestionsBrowserKey"` SuggestionsBrowserKey string `koanf:"suggestionsBrowserKey"`
Choices []ActionArgumentChoice `koanf:"choices"`
RejectNull bool `koanf:"rejectNull"`
} }
// ActionArgumentChoice represents a predefined choice for an argument. // ActionArgumentChoice represents a predefined choice for an argument.
@ -88,8 +87,8 @@ type ActionArgumentChoice struct {
// RateSpec allows you to set a max frequency for an action. // RateSpec allows you to set a max frequency for an action.
type RateSpec struct { type RateSpec struct {
Limit int `koanf:"limit"`
Duration string `koanf:"duration"` Duration string `koanf:"duration"`
Limit int `koanf:"limit"`
} }
// WebhookConfig defines configuration for generic webhook triggers. // WebhookConfig defines configuration for generic webhook triggers.
@ -111,9 +110,8 @@ type EntityFile struct {
File string `koanf:"file"` File string `koanf:"file"`
Name string `koanf:"name"` Name string `koanf:"name"`
Icon string `koanf:"icon"` Icon string `koanf:"icon"`
SourceFile string `koanf:"-"`
Properties []EntityProperty `koanf:"properties"` Properties []EntityProperty `koanf:"properties"`
// SourceFile is set by OliveTin when loading config (not user YAML).
SourceFile string `koanf:"-"`
} }
// EntityProperty defines a column shown when listing entity instances in the UI. // EntityProperty defines a column shown when listing entity instances in the UI.
@ -133,11 +131,11 @@ type PermissionsList struct {
// AccessControlList defines what permissions apply to a user or user group. // AccessControlList defines what permissions apply to a user or user group.
type AccessControlList struct { type AccessControlList struct {
Name string `koanf:"name"` Name string `koanf:"name"`
AddToEveryAction bool `koanf:"addToEveryAction"`
MatchUsergroups []string `koanf:"matchUsergroups"` MatchUsergroups []string `koanf:"matchUsergroups"`
MatchUsernames []string `koanf:"matchUsernames"` MatchUsernames []string `koanf:"matchUsernames"`
Permissions PermissionsList `koanf:"permissions"` Permissions PermissionsList `koanf:"permissions"`
Policy ConfigurationPolicy `koanf:"policy"` Policy ConfigurationPolicy `koanf:"policy"`
AddToEveryAction bool `koanf:"addToEveryAction"`
} }
// ConfigurationPolicy defines global settings which are overridden with an ACL. // ConfigurationPolicy defines global settings which are overridden with an ACL.
@ -154,88 +152,87 @@ type PrometheusConfig struct {
// SecurityConfig allows users to fine tune the security related HTTP headers and cookie options. // SecurityConfig allows users to fine tune the security related HTTP headers and cookie options.
type SecurityConfig struct { type SecurityConfig struct {
HeaderContentSecurityPolicy bool `koanf:"headerContentSecurityPolicy"`
ContentSecurityPolicy string `koanf:"contentSecurityPolicy"` ContentSecurityPolicy string `koanf:"contentSecurityPolicy"`
XFrameOptions string `koanf:"xFrameOptions"`
HeaderContentSecurityPolicy bool `koanf:"headerContentSecurityPolicy"`
HeaderXContentTypeOptions bool `koanf:"headerXContentTypeOptions"` HeaderXContentTypeOptions bool `koanf:"headerXContentTypeOptions"`
HeaderXFrameOptions bool `koanf:"headerXFrameOptions"` HeaderXFrameOptions bool `koanf:"headerXFrameOptions"`
XFrameOptions string `koanf:"xFrameOptions"`
ForceSecureCookies bool `koanf:"forceSecureCookies"` ForceSecureCookies bool `koanf:"forceSecureCookies"`
} }
// Config is the global config used through the whole app. // Config is the global config used through the whole app.
type Config struct { type Config struct {
UseSingleHTTPFrontend bool `koanf:"useSingleHTTPFrontend"` ActionGroups map[string]*ActionGroup `koanf:"actionGroups"`
ThemeName string `koanf:"themeName"` AuthOAuth2Providers map[string]*OAuth2Provider `koanf:"authOAuth2Providers"`
ThemeCacheDisabled bool `koanf:"themeCacheDisabled"` SaveLogs SaveLogsConfig `koanf:"saveLogs"`
ListenAddressSingleHTTPFrontend string `koanf:"listenAddressSingleHTTPFrontend"` DefaultIconForBack string `koanf:"defaultIconForBack"`
ListenAddressWebUI string `koanf:"listenAddressWebUI"` AuthOAuth2RedirectURL string `koanf:"authOAuth2RedirectUrl"`
ListenAddressRestActions string `koanf:"listenAddressRestActions"` ListenAddressRestActions string `koanf:"listenAddressRestActions"`
ListenAddressPrometheus string `koanf:"listenAddressPrometheus"` ListenAddressPrometheus string `koanf:"listenAddressPrometheus"`
ExternalRestAddress string `koanf:"externalRestAddress"` ExternalRestAddress string `koanf:"externalRestAddress"`
LogLevel string `koanf:"logLevel"` LogLevel string `koanf:"logLevel"`
LogDebugOptions LogDebugOptions `koanf:"logDebugOptions"` ThemeName string `koanf:"themeName"`
LogHistoryPageSize int64 `koanf:"logHistoryPageSize"` ServiceLogs ServiceLogsConfig `koanf:"serviceLogs"`
ActionGroups map[string]*ActionGroup `koanf:"actionGroups"` ListenAddressSingleHTTPFrontend string `koanf:"listenAddressSingleHTTPFrontend"`
Actions []*Action `koanf:"actions"` AuthJwtHmacSecret string `koanf:"authJwtHmacSecret"`
Entities []*EntityFile `koanf:"entities"` AuthJwtCertsURL string `koanf:"authJwtCertsUrl"`
Dashboards []*DashboardComponent `koanf:"dashboards"` DefaultIconForActions string `koanf:"defaultIconForActions"`
CheckForUpdates bool `koanf:"checkForUpdates"` Include string `koanf:"include"`
PageTitle string `koanf:"pageTitle"` PageTitle string `koanf:"pageTitle"`
ShowFooter bool `koanf:"showFooter"` BannerCSS string `koanf:"bannerCss"`
ShowNavigation bool `koanf:"showNavigation"` BannerMessage string `koanf:"bannerMessage"`
ShowNewVersions bool `koanf:"showNewVersions"` DefaultPopupOnStart string `koanf:"defaultPopupOnStart"`
ShowNavigateOnStartIcons bool `koanf:"showNavigateOnStartIcons"` ServiceHostMode string `koanf:"serviceHostMode"`
EnableCustomJs bool `koanf:"enableCustomJs"` DefaultOnClick string `koanf:"defaultOnClick"`
AuthJwtCookieName string `koanf:"authJwtCookieName"` AuthJwtCookieName string `koanf:"authJwtCookieName"`
AuthJwtHeader string `koanf:"authJwtHeader"` AuthJwtHeader string `koanf:"authJwtHeader"`
AuthJwtAud string `koanf:"authJwtAud"` AuthJwtAud string `koanf:"authJwtAud"`
AuthJwtDomain string `koanf:"authJwtDomain"` ListenAddressWebUI string `koanf:"listenAddressWebUI"`
AuthJwtCertsURL string `koanf:"authJwtCertsUrl"` SectionNavigationStyle string `koanf:"sectionNavigationStyle"`
AuthJwtHmacSecret string `koanf:"authJwtHmacSecret"` // mutually exclusive with pub key config fields DefaultIconForDirectories string `koanf:"defaultIconForDirectories"`
AuthJwtClaimUsername string `koanf:"authJwtClaimUsername"` AuthJwtClaimUsername string `koanf:"authJwtClaimUsername"`
AuthJwtClaimUserGroup string `koanf:"authJwtClaimUserGroup"` AuthJwtClaimUserGroup string `koanf:"authJwtClaimUserGroup"`
AuthJwtPubKeyPath string `koanf:"authJwtPubKeyPath"` // will read pub key from file on disk AuthJwtPubKeyPath string `koanf:"authJwtPubKeyPath"`
AuthHttpHeaderUsername string `koanf:"authHttpHeaderUsername"` AuthHttpHeaderUsername string `koanf:"authHttpHeaderUsername"`
AuthHttpHeaderUserGroup string `koanf:"authHttpHeaderUserGroup"` AuthHttpHeaderUserGroup string `koanf:"authHttpHeaderUserGroup"`
AuthHttpHeaderUserGroupSep string `koanf:"authHttpHeaderUserGroupSep"` AuthHttpHeaderUserGroupSep string `koanf:"authHttpHeaderUserGroupSep"`
AuthLocalUsers AuthLocalUsersConfig `koanf:"authLocalUsers"`
AuthLoginUrl string `koanf:"authLoginUrl"`
AuthRequireGuestsToLogin bool `koanf:"authRequireGuestsToLogin"`
AuthOAuth2RedirectURL string `koanf:"authOAuth2RedirectUrl"`
AuthOAuth2Providers map[string]*OAuth2Provider `koanf:"authOAuth2Providers"`
DefaultPermissions PermissionsList `koanf:"defaultPermissions"`
DefaultPolicy ConfigurationPolicy `koanf:"defaultPolicy"`
AccessControlLists []*AccessControlList `koanf:"accessControlLists"`
WebUIDir string `koanf:"webUIDir"` WebUIDir string `koanf:"webUIDir"`
CronSupportForSeconds bool `koanf:"cronSupportForSeconds"` AuthLoginUrl string `koanf:"authLoginUrl"`
SectionNavigationStyle string `koanf:"sectionNavigationStyle"` AuthJwtDomain string `koanf:"authJwtDomain"`
DefaultOnClick string `koanf:"defaultOnClick"`
DefaultPopupOnStart string `koanf:"defaultPopupOnStart"`
InsecureAllowDumpOAuth2UserData bool `koanf:"insecureAllowDumpOAuth2UserData"`
InsecureAllowDumpVars bool `koanf:"insecureAllowDumpVars"`
InsecureAllowDumpServerDiagnostics bool `koanf:"insecureAllowDumpServerDiagnostics"`
InsecureAllowDumpActionMap bool `koanf:"insecureAllowDumpActionMap"`
InsecureAllowDumpJwtClaims bool `koanf:"insecureAllowDumpJwtClaims"`
Prometheus PrometheusConfig `koanf:"prometheus"`
Security SecurityConfig `koanf:"security"` Security SecurityConfig `koanf:"security"`
SaveLogs SaveLogsConfig `koanf:"saveLogs"` Actions []*Action `koanf:"actions"`
ServiceLogs ServiceLogsConfig `koanf:"serviceLogs"` AccessControlLists []*AccessControlList `koanf:"accessControlLists"`
DefaultIconForActions string `koanf:"defaultIconForActions"`
DefaultIconForDirectories string `koanf:"defaultIconForDirectories"`
DefaultIconForBack string `koanf:"defaultIconForBack"`
AdditionalNavigationLinks []*NavigationLink `koanf:"additionalNavigationLinks"`
ServiceHostMode string `koanf:"serviceHostMode"`
StyleMods []string `koanf:"styleMods"` StyleMods []string `koanf:"styleMods"`
BannerMessage string `koanf:"bannerMessage"` AdditionalNavigationLinks []*NavigationLink `koanf:"additionalNavigationLinks"`
BannerCSS string `koanf:"bannerCss"` Entities []*EntityFile `koanf:"entities"`
Include string `koanf:"include"` Dashboards []*DashboardComponent `koanf:"dashboards"`
sourceFiles []string
sourceFiles []string AuthLocalUsers AuthLocalUsersConfig `koanf:"authLocalUsers"`
LogHistoryPageSize int64 `koanf:"logHistoryPageSize"`
LogDebugOptions LogDebugOptions `koanf:"logDebugOptions"`
DefaultPermissions PermissionsList `koanf:"defaultPermissions"`
DefaultPolicy ConfigurationPolicy `koanf:"defaultPolicy"`
Prometheus PrometheusConfig `koanf:"prometheus"`
CheckForUpdates bool `koanf:"checkForUpdates"`
InsecureAllowDumpJwtClaims bool `koanf:"insecureAllowDumpJwtClaims"`
InsecureAllowDumpActionMap bool `koanf:"insecureAllowDumpActionMap"`
InsecureAllowDumpServerDiagnostics bool `koanf:"insecureAllowDumpServerDiagnostics"`
InsecureAllowDumpVars bool `koanf:"insecureAllowDumpVars"`
InsecureAllowDumpOAuth2UserData bool `koanf:"insecureAllowDumpOAuth2UserData"`
CronSupportForSeconds bool `koanf:"cronSupportForSeconds"`
AuthRequireGuestsToLogin bool `koanf:"authRequireGuestsToLogin"`
EnableCustomJs bool `koanf:"enableCustomJs"`
ShowNavigateOnStartIcons bool `koanf:"showNavigateOnStartIcons"`
ShowNewVersions bool `koanf:"showNewVersions"`
ShowNavigation bool `koanf:"showNavigation"`
ShowFooter bool `koanf:"showFooter"`
UseSingleHTTPFrontend bool `koanf:"useSingleHTTPFrontend"`
ThemeCacheDisabled bool `koanf:"themeCacheDisabled"`
} }
type AuthLocalUsersConfig struct { type AuthLocalUsersConfig struct {
Enabled bool `koanf:"enabled"`
Users []*LocalUser `koanf:"users"` Users []*LocalUser `koanf:"users"`
Enabled bool `koanf:"enabled"`
} }
type LocalUser struct { type LocalUser struct {
@ -246,21 +243,21 @@ type LocalUser struct {
} }
type OAuth2Provider struct { type OAuth2Provider struct {
Name string `koanf:"name"` AuthUrl string `koanf:"authUrl"`
Title string `koanf:"title"` UserGroupField string `koanf:"userGroupField"`
ClientID string `koanf:"clientId"` ClientID string `koanf:"clientId"`
ClientSecret string `koanf:"clientSecret"` ClientSecret string `koanf:"clientSecret"`
Icon string `koanf:"icon"` Icon string `koanf:"icon"`
Scopes []string `koanf:"scopes"`
AuthUrl string `koanf:"authUrl"`
TokenUrl string `koanf:"tokenUrl"`
WhoamiUrl string `koanf:"whoamiUrl"`
UsernameField string `koanf:"usernameField"`
UserGroupField string `koanf:"userGroupField"`
InsecureSkipVerify bool `koanf:"insecureSkipVerify"`
CallbackTimeout int `koanf:"callbackTimeout"`
CertBundlePath string `koanf:"certBundlePath"`
AddToUsergroup string `koanf:"addToUsergroup"` AddToUsergroup string `koanf:"addToUsergroup"`
Title string `koanf:"title"`
WhoamiUrl string `koanf:"whoamiUrl"`
Name string `koanf:"name"`
UsernameField string `koanf:"usernameField"`
TokenUrl string `koanf:"tokenUrl"`
CertBundlePath string `koanf:"certBundlePath"`
Scopes []string `koanf:"scopes"`
CallbackTimeout int `koanf:"callbackTimeout"`
InsecureSkipVerify bool `koanf:"insecureSkipVerify"`
} }
type NavigationLink struct { type NavigationLink struct {

8
service/internal/executor/arguments_test.go
View File

@ -981,12 +981,12 @@ func TestTypecheckActionArgumentHtmlWithoutName(t *testing.T) {
func TestParseCommandForReplacements(t *testing.T) { func TestParseCommandForReplacements(t *testing.T) {
tests := []struct { tests := []struct {
values map[string]string
name string name string
shellCommand string shellCommand string
values map[string]string
expectedOutput string expectedOutput string
expectError bool
errorContains string errorContains string
expectError bool
}{ }{
{ {
name: "Simple replacement", name: "Simple replacement",
@ -1052,10 +1052,10 @@ func TestParseCommandForReplacements(t *testing.T) {
func TestArgumentChoicesValidation(t *testing.T) { func TestArgumentChoicesValidation(t *testing.T) {
tests := []struct { tests := []struct {
name string
req *ExecutionRequest req *ExecutionRequest
expectError bool name string
description string description string
expectError bool
}{ }{
{ {
name: "Valid choice", name: "Valid choice",

91
service/internal/executor/executor.go
View File

@ -40,53 +40,46 @@ func isValidTrackingID(id string) bool {
} }
type ActionBinding struct { type ActionBinding struct {
ID string
Action *config.Action Action *config.Action
Entity *entities.Entity Entity *entities.Entity
ConfigOrder int ID string
OnDashboards []DashboardNavigationTarget OnDashboards []DashboardNavigationTarget
ConfigOrder int
} }
// Executor represents a helper class for executing commands. It's main method // Executor represents a helper class for executing commands. It's main method
// is ExecRequest // is ExecRequest
type Executor struct { type Executor struct {
logs map[string]*InternalLogEntry logs map[string]*InternalLogEntry
logsTrackingIdsByDate []string
LogsByBindingId map[string][]*InternalLogEntry LogsByBindingId map[string][]*InternalLogEntry
logmutex sync.RWMutex
MapActionBindings map[string]*ActionBinding MapActionBindings map[string]*ActionBinding
Cfg *config.Config
logsTrackingIdsByDate []string
listeners []listener
chainOfCommand []executorStepFunc
groupQueue []*queuedExecution
logmutex sync.RWMutex
MapActionBindingsLock sync.RWMutex MapActionBindingsLock sync.RWMutex
listenersMu sync.RWMutex
Cfg *config.Config groupQueueMu sync.Mutex
listeners []listener
listenersMu sync.RWMutex
chainOfCommand []executorStepFunc
groupQueue []*queuedExecution
groupQueueMu sync.Mutex
} }
// ExecutionRequest is a request to execute an action. It's passed to an // ExecutionRequest is a request to execute an action. It's passed to an
// Executor. They're created from the api. // Executor. They're created from the api.
type ExecutionRequest struct { type ExecutionRequest struct {
Binding *ActionBinding Arguments map[string]string
Arguments map[string]string Binding *ActionBinding
TrackingID string Cfg *config.Config
Tags []string AuthenticatedUser *authpublic.AuthenticatedUser
Cfg *config.Config executor *Executor
AuthenticatedUser *authpublic.AuthenticatedUser
TriggerDepth int
Justification string
logEntry *InternalLogEntry logEntry *InternalLogEntry
finalParsedCommand string finalParsedCommand string
TrackingID string
Justification string
Tags []string
execArgs []string execArgs []string
TriggerDepth int
useDirectExec bool useDirectExec bool
executor *Executor
skipRequestRegistration bool skipRequestRegistration bool
} }
@ -104,12 +97,12 @@ func (req *ExecutionRequest) mutateLogEntry(mutator func(*InternalLogEntry)) {
// LogEntrySnapshot is a copy of selected log entry fields for race-safe reads. // LogEntrySnapshot is a copy of selected log entry fields for race-safe reads.
type LogEntrySnapshot struct { type LogEntrySnapshot struct {
Output string
ExitCode int32
Queued bool Queued bool
Blocked bool Blocked bool
ExecutionStarted bool ExecutionStarted bool
ExecutionFinished bool ExecutionFinished bool
ExitCode int32
Output string
} }
// SnapshotLog returns a copy of selected log entry fields under read lock. // SnapshotLog returns a copy of selected log entry fields under read lock.
@ -136,34 +129,28 @@ func (e *Executor) SnapshotLog(trackingID string) (LogEntrySnapshot, bool) {
// state of execution (even if the command is not executed). It's designed to be // state of execution (even if the command is not executed). It's designed to be
// easily serializable. // easily serializable.
type InternalLogEntry struct { type InternalLogEntry struct {
Binding *ActionBinding
DatetimeStarted time.Time DatetimeStarted time.Time
DatetimeFinished time.Time DatetimeFinished time.Time
Output string Binding *ActionBinding
TimedOut bool
Blocked bool
Queued bool
QueuedForGroup string
ExitCode int32
Tags []string
ExecutionStarted bool
ExecutionFinished bool
ExecutionTrackingID string
Process *os.Process Process *os.Process
Arguments map[string]string
ExecutionTrackingID string
Justification string
QueuedForGroup string
ActionIcon string
ActionTitle string
ActionConfigTitle string
Output string
Username string Username string
Index int64
EntityPrefix string EntityPrefix string
ActionConfigTitle string // This is the title of the action as defined in the config, not the final parsed title. Tags []string
Index int64
/* ExitCode int32
The following 3 properties are obviously on Action normally, but it's useful Blocked bool
that logs are lightweight (so we don't need to have an action associated to ExecutionFinished bool
logs, etc. Therefore, we duplicate those values here. ExecutionStarted bool
*/ Queued bool
ActionTitle string TimedOut bool
ActionIcon string
Justification string
Arguments map[string]string
} }
// .Binding can be nil, so we need to handle that. // .Binding can be nil, so we need to handle that.
@ -1098,8 +1085,8 @@ func appendErrorToStderr(req *ExecutionRequest, err error) {
type OutputStreamer struct { type OutputStreamer struct {
Req *ExecutionRequest Req *ExecutionRequest
mu sync.Mutex
output bytes.Buffer output bytes.Buffer
mu sync.Mutex
} }
func (ost *OutputStreamer) Write(o []byte) (n int, err error) { func (ost *OutputStreamer) Write(o []byte) (n int, err error) {

6
service/internal/filehelper/file_change_notify.go
View File

@ -39,12 +39,12 @@ type WatchMeta struct {
} }
type watchContext struct { type watchContext struct {
filename string
filedir string
callback func(filename string) callback func(filename string)
interestedEvent fsnotify.Op
event *fsnotify.Event event *fsnotify.Event
meta WatchMeta meta WatchMeta
filename string
filedir string
interestedEvent fsnotify.Op
} }
func WatchDirectoryCreate(fullpath string, callback func(filename string), meta WatchMeta) { func WatchDirectoryCreate(fullpath string, callback func(filename string), meta WatchMeta) {

2
service/internal/installationinfo/runtimeinfo.go
View File

@ -16,7 +16,6 @@ type RuntimeInfo struct {
OS string OS string
OSReleasePrettyName string OSReleasePrettyName string
Arch string Arch string
InContainer bool
LastBrowserUserAgent string LastBrowserUserAgent string
User string User string
Uid string Uid string
@ -25,6 +24,7 @@ type RuntimeInfo struct {
AvailableVersion string AvailableVersion string
WebuiDirectory string WebuiDirectory string
ThemesDirectory string ThemesDirectory string
InContainer bool
} }
var Runtime = &RuntimeInfo{ var Runtime = &RuntimeInfo{

4
service/internal/installationinfo/server_diagnostics.go
View File

@ -13,8 +13,6 @@ var (
) )
type serverDiagnosticsConfig struct { type serverDiagnosticsConfig struct {
CountOfActions int
CountOfDashboards int
LogLevel string LogLevel string
ListenAddressSingleHTTPFrontend string ListenAddressSingleHTTPFrontend string
ListenAddressWebUI string ListenAddressWebUI string
@ -23,6 +21,8 @@ type serverDiagnosticsConfig struct {
TimeNow string TimeNow string
ConfigDirectory string ConfigDirectory string
WebuiDirectory string WebuiDirectory string
CountOfActions int
CountOfDashboards int
} }
func configToServerDiagnostics(cfg *config.Config) *serverDiagnosticsConfig { func configToServerDiagnostics(cfg *config.Config) *serverDiagnosticsConfig {

4
service/internal/logfilter/record.go
View File

@ -5,12 +5,12 @@ type Record struct {
Status string Status string
Action string Action string
User string User string
Output string
Tags []string Tags []string
ExitCode int32
Blocked bool Blocked bool
TimedOut bool TimedOut bool
Running bool Running bool
ExitCode int32
Output string
} }
// StatusLabel matches the status text shown in the web UI. // StatusLabel matches the status text shown in the web UI.

4
service/internal/updatecheck/updateCheck.go
View File

@ -13,9 +13,9 @@ import (
) )
type versionMapType struct { type versionMapType struct {
ApiVersion int
Latest string
History map[string]string History map[string]string
Latest string
ApiVersion int
} }
// StartUpdateChecker will start a job that runs periodically, checking // StartUpdateChecker will start a job that runs periodically, checking

8
service/scripts/find-flakey-tests-inf/main.go
View File

@ -42,20 +42,20 @@ type runSummary struct {
} }
type jsonlRecord struct { type jsonlRecord struct {
Run int `json:"run"`
Timestamp string `json:"timestamp"` Timestamp string `json:"timestamp"`
FailureDetails []testFailure `json:"failureDetails"`
Run int `json:"run"`
ExitCode int `json:"exitCode"` ExitCode int `json:"exitCode"`
DurationMs int64 `json:"durationMs"` DurationMs int64 `json:"durationMs"`
Passes int `json:"passes"` Passes int `json:"passes"`
Failures int `json:"failures"` Failures int `json:"failures"`
Skipped int `json:"skipped"` Skipped int `json:"skipped"`
FailureDetails []testFailure `json:"failureDetails"`
} }
type testRunState struct { type testRunState struct {
summary runSummary
failures []testFailure
failureOutput map[string]*strings.Builder failureOutput map[string]*strings.Builder
failures []testFailure
summary runSummary
} }
func initLog() { func initLog() {