Merge latest changes from develop (#2)

* Init commit

* Project refactoring

* Code refactoring, unit tests coverage

* Fix docker file. Packages update. Tests refactoring

* Added custom header for logging purposes

* Added graceful shodown

* Added devtools handler

* Added new routes. Code refactoring

* Added status handler

* README update

* Fixed README table

* README update

* Added defaultVersion support for browsers. Graceful shutdown prop update

* Fix typos in README

* Added config watcher, active session limits, status handler, logs handler. Fixed vnc handler error

* Added missed Total prop to status handler

* Forced to use default browser version in case empty browser version recieved

* Added healthz handler

* README update

README.md

@@ -14,6 +14,7 @@ Flags:
       --port string                          port for selenosis (default ":4444")
       --proxy-port string                    proxy continer port (default "4445")
       --browsers-config string               browsers config (default "config/browsers.yaml")
+      --browser-limit int                    active sessions max limit (default 10)
       --namespace string                     kubernetes namespace (default "default")
       --service-name string                  kubernetes service name for browsers (default "selenosis")
       --browser-wait-timeout duration        time in seconds that a browser will be ready (default 30s)
@@ -35,6 +36,8 @@ Flags:
 | WS/HTTP | /devtools/{sessionId}        |
 | HTTP    | /download/{sessionId}        |
 | HTTP    | /clipboard/{sessionId}       |
+| HTTP    | /status                      |
+| HTTP    | /healthz                     |
 <br/>
 
 ## Configuration
@@ -434,4 +437,7 @@ spec:
 Selenosis doesn't store any session info. All connections to the browsers are automatically assigned via headless service.
 
 ### Hot config reload
-Once you decide to update in browsers config
+Selenosis supports hot config reload, to do so update you configMap
+```bash
+kubectl edit configmap -n selenosis selenosis-config -o yaml
+```

cmd/selenosis/main.go

@@ -93,6 +93,9 @@ func command() *cobra.Command {
 			router.PathPrefix("/download/{sessionId}").HandlerFunc(app.HandleReverseProxy)
 			router.PathPrefix("/clipboard/{sessionId}").HandlerFunc(app.HandleReverseProxy)
 			router.PathPrefix("/status").HandlerFunc(app.HandleStatus)
+			router.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+			}).Methods(http.MethodGet)
 
 			srv := &http.Server{
 				Addr:    address,

config/config.go

@@ -72,11 +72,14 @@ func (cfg *BrowsersConfig) Find(name, version string) (*platform.BrowserSpec, er
 			if !ok {
 				return nil, fmt.Errorf("unknown browser version %s", version)
 			}
+			v.BrowserName = name
+			v.BrowserVersion = c.DefaultVersion
 			return v, nil
 		}
 		return nil, fmt.Errorf("unknown browser version %s", version)
 	}
-
+	v.BrowserName = name
+	v.BrowserVersion = version
 	return v, nil
 }
 

handlers.go

@@ -346,14 +346,15 @@ func (app *App) HandleStatus(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 
 	type Status struct {
-		Browsers map[string][]string `json:"config"`
-		Sessions []*platform.Service `json:"sessions"`
+		Total    int                 `json:"total"`
+		Browsers map[string][]string `json:"config,omitempty"`
+		Sessions []*platform.Service `json:"sessions,omitempty"`
 	}
 
 	type Response struct {
 		Status    int    `json:"status"`
-		Error     error  `json:"err"`
-		Selenosis Status `json:"selenosis"`
+		Error     string `json:"err,omitempty"`
+		Selenosis Status `json:"selenosis,omitempty"`
 	}
 
 	sessions, err := app.client.List()
@@ -362,27 +363,26 @@ func (app *App) HandleStatus(w http.ResponseWriter, r *http.Request) {
 		json.NewEncoder(w).Encode(
 			Response{
 				Status: http.StatusInternalServerError,
-				Error:  err,
+				Error:  fmt.Sprintf("%v", err),
 				Selenosis: Status{
+					Total:    app.sessionLimit,
 					Browsers: app.browsers.GetBrowserVersions(),
 				},
 			},
 		)
 		return
 	}
 
-	err = json.NewEncoder(w).Encode(
+	json.NewEncoder(w).Encode(
 		Response{
 			Status: http.StatusOK,
 			Selenosis: Status{
+				Total:    app.sessionLimit,
 				Browsers: app.browsers.GetBrowserVersions(),
 				Sessions: sessions,
 			},
 		},
 	)
-	if err != nil {
-		w.Write([]byte(fmt.Sprintf("marshal err: %v", err)))
-	}
 	return
 }
 

platform/kubernetes.go

@@ -110,8 +110,8 @@ func (cl *Client) Create(layout *ServiceSpec) (*Service, error) {
 
 	labels := map[string]string{
 		defaults.serviceType:    "browser",
-		defaults.browserName:    layout.RequestedCapabilities.BrowserName,
-		defaults.browserVersion: layout.RequestedCapabilities.BrowserVersion,
+		defaults.browserName:    layout.Template.BrowserName,
+		defaults.browserVersion: layout.Template.BrowserVersion,
 		defaults.testName:       layout.RequestedCapabilities.TestName,
 		defaults.session:        layout.SessionID,
 	}

platform/platform.go

@@ -27,10 +27,12 @@ type Spec struct {
 
 //BrowserSpec describes settings for Service
 type BrowserSpec struct {
-	Image string `yaml:"image" json:"image"`
-	Path  string `yaml:"path" json:"path"`
-	Meta  Meta   `yaml:"meta" json:"meta"`
-	Spec  Spec   `yaml:"spec" json:"spec"`
+	BrowserName    string `yaml:"-" json:"-"`
+	BrowserVersion string `yaml:"-" json:"-"`
+	Image          string `yaml:"image" json:"image"`
+	Path           string `yaml:"path" json:"path"`
+	Meta           Meta   `yaml:"meta" json:"meta"`
+	Spec           Spec   `yaml:"spec" json:"spec"`
 }
 
 //ServiceSpec describes data requred for creating service