merge develop

1 files changed, 193 insertions, 1 deletions

diff --git a/internal/config/client.go b/internal/config/client.go
index 1515aae..86f97f0 100644
--- a/internal/config/client.go
+++ b/internal/config/client.go
@@ -1,11 +1,203 @@
 package config
 
+import "github.com/mimecast/dtail/internal/color"
+
+type remoteTermColors struct {
+	DelimiterAttr color.Attribute
+	DelimiterBg   color.BgColor
+	DelimiterFg   color.FgColor
+	RemoteAttr    color.Attribute
+	RemoteBg      color.BgColor
+	RemoteFg      color.FgColor
+	CountAttr     color.Attribute
+	CountBg       color.BgColor
+	CountFg       color.FgColor
+	HostnameAttr  color.Attribute
+	HostnameBg    color.BgColor
+	HostnameFg    color.FgColor
+	IDAttr        color.Attribute
+	IDBg          color.BgColor
+	IDFg          color.FgColor
+	StatsOkAttr   color.Attribute
+	StatsOkBg     color.BgColor
+	StatsOkFg     color.FgColor
+	StatsWarnAttr color.Attribute
+	StatsWarnBg   color.BgColor
+	StatsWarnFg   color.FgColor
+	TextAttr      color.Attribute
+	TextBg        color.BgColor
+	TextFg        color.FgColor
+}
+
+type clientTermColors struct {
+	DelimiterAttr color.Attribute
+	DelimiterBg   color.BgColor
+	DelimiterFg   color.FgColor
+	ClientAttr    color.Attribute
+	ClientBg      color.BgColor
+	ClientFg      color.FgColor
+	HostnameAttr  color.Attribute
+	HostnameBg    color.BgColor
+	HostnameFg    color.FgColor
+	TextAttr      color.Attribute
+	TextBg        color.BgColor
+	TextFg        color.FgColor
+}
+
+type serverTermColors struct {
+	DelimiterAttr color.Attribute
+	DelimiterBg   color.BgColor
+	DelimiterFg   color.FgColor
+	ServerAttr    color.Attribute
+	ServerBg      color.BgColor
+	ServerFg      color.FgColor
+	HostnameAttr  color.Attribute
+	HostnameBg    color.BgColor
+	HostnameFg    color.FgColor
+	TextAttr      color.Attribute
+	TextBg        color.BgColor
+	TextFg        color.FgColor
+}
+
+type commonTermColors struct {
+	SeverityErrorAttr color.Attribute
+	SeverityErrorBg   color.BgColor
+	SeverityErrorFg   color.FgColor
+	SeverityFatalAttr color.Attribute
+	SeverityFatalBg   color.BgColor
+	SeverityFatalFg   color.FgColor
+	SeverityWarnAttr  color.Attribute
+	SeverityWarnBg    color.BgColor
+	SeverityWarnFg    color.FgColor
+}
+
+type maprTableTermColors struct {
+	DataAttr            color.Attribute
+	DataBg              color.BgColor
+	DataFg              color.FgColor
+	DelimiterAttr       color.Attribute
+	DelimiterBg         color.BgColor
+	DelimiterFg         color.FgColor
+	HeaderAttr          color.Attribute
+	HeaderBg            color.BgColor
+	HeaderDelimiterAttr color.Attribute
+	HeaderDelimiterBg   color.BgColor
+	HeaderDelimiterFg   color.FgColor
+	HeaderFg            color.FgColor
+	HeaderGroupKeyAttr  color.Attribute
+	HeaderSortKeyAttr   color.Attribute
+	RawQueryAttr        color.Attribute
+	RawQueryBg          color.BgColor
+	RawQueryFg          color.FgColor
+}
+
+type termColors struct {
+	Remote    remoteTermColors
+	Client    clientTermColors
+	Server    serverTermColors
+	Common    commonTermColors
+	MaprTable maprTableTermColors
+}
+
 // ClientConfig represents a DTail client configuration (empty as of now as there
 // are no available config options yet, but that may changes in the future).
 type ClientConfig struct {
+	TermColorsEnable bool       `json:",omitempty"`
+	TermColors       termColors `json:",omitempty"`
+	// When unit testing in Jenkins you don't want to touch files in ~jenkins
+	// during integration tests really.
+	SSHDontAddHostsToKnownHostsFile bool `json:",omitempty"`
 }
 
 // Create a new default client configuration.
 func newDefaultClientConfig() *ClientConfig {
-	return &ClientConfig{}
+	return &ClientConfig{
+		TermColorsEnable: true,
+		TermColors: termColors{
+			Remote: remoteTermColors{
+				DelimiterAttr: color.AttrDim,
+				DelimiterBg:   color.BgBlue,
+				DelimiterFg:   color.FgCyan,
+				RemoteAttr:    color.AttrDim,
+				RemoteBg:      color.BgBlue,
+				RemoteFg:      color.FgWhite,
+				CountAttr:     color.AttrDim,
+				CountBg:       color.BgBlue,
+				CountFg:       color.FgWhite,
+				HostnameAttr:  color.AttrBold,
+				HostnameBg:    color.BgBlue,
+				HostnameFg:    color.FgWhite,
+				IDAttr:        color.AttrDim,
+				IDBg:          color.BgBlue,
+				IDFg:          color.FgWhite,
+				StatsOkAttr:   color.AttrNone,
+				StatsOkBg:     color.BgGreen,
+				StatsOkFg:     color.FgBlack,
+				StatsWarnAttr: color.AttrNone,
+				StatsWarnBg:   color.BgRed,
+				StatsWarnFg:   color.FgWhite,
+				TextAttr:      color.AttrNone,
+				TextBg:        color.BgBlack,
+				TextFg:        color.FgWhite,
+			},
+			Client: clientTermColors{
+				DelimiterAttr: color.AttrDim,
+				DelimiterBg:   color.BgYellow,
+				DelimiterFg:   color.FgBlack,
+				ClientAttr:    color.AttrDim,
+				ClientBg:      color.BgYellow,
+				ClientFg:      color.FgBlack,
+				HostnameAttr:  color.AttrDim,
+				HostnameBg:    color.BgYellow,
+				HostnameFg:    color.FgBlack,
+				TextAttr:      color.AttrNone,
+				TextBg:        color.BgBlack,
+				TextFg:        color.FgWhite,
+			},
+			Server: serverTermColors{
+				DelimiterAttr: color.AttrDim,
+				DelimiterBg:   color.BgCyan,
+				DelimiterFg:   color.FgBlack,
+				ServerAttr:    color.AttrDim,
+				ServerBg:      color.BgCyan,
+				ServerFg:      color.FgBlack,
+				HostnameAttr:  color.AttrBold,
+				HostnameBg:    color.BgCyan,
+				HostnameFg:    color.FgBlack,
+				TextAttr:      color.AttrNone,
+				TextBg:        color.BgBlack,
+				TextFg:        color.FgWhite,
+			},
+			Common: commonTermColors{
+				SeverityErrorAttr: color.AttrBold,
+				SeverityErrorBg:   color.BgRed,
+				SeverityErrorFg:   color.FgWhite,
+				SeverityFatalAttr: color.AttrBold,
+				SeverityFatalBg:   color.BgMagenta,
+				SeverityFatalFg:   color.FgWhite,
+				SeverityWarnAttr:  color.AttrBold,
+				SeverityWarnBg:    color.BgBlack,
+				SeverityWarnFg:    color.FgWhite,
+			},
+			MaprTable: maprTableTermColors{
+				DataAttr:            color.AttrNone,
+				DataBg:              color.BgBlue,
+				DataFg:              color.FgWhite,
+				DelimiterAttr:       color.AttrDim,
+				DelimiterBg:         color.BgBlue,
+				DelimiterFg:         color.FgWhite,
+				HeaderAttr:          color.AttrBold,
+				HeaderBg:            color.BgBlue,
+				HeaderFg:            color.FgWhite,
+				HeaderDelimiterAttr: color.AttrDim,
+				HeaderDelimiterBg:   color.BgBlue,
+				HeaderDelimiterFg:   color.FgWhite,
+				HeaderSortKeyAttr:   color.AttrUnderline,
+				HeaderGroupKeyAttr:  color.AttrReverse,
+				RawQueryAttr:        color.AttrDim,
+				RawQueryBg:          color.BgBlack,
+				RawQueryFg:          color.FgCyan,
+			},
+		},
+	}
 }