- Added upstream objects

- Renamed host templates to nginx templates
- Generate upstream templates
- Better nginx error reporting when reloading
- Use tparse for golang test reporting

backend/internal/entity/upstream/filters.go

@@ -0,0 +1,25 @@
+package upstream
+
+import (
+	"npm/internal/entity"
+)
+
+var filterMapFunctions = make(map[string]entity.FilterMapFunction)
+
+// getFilterMapFunctions is a map of functions that should be executed
+// during the filtering process, if a field is defined here then the value in
+// the filter will be given to the defined function and it will return a new
+// value for use in the sql query.
+func getFilterMapFunctions() map[string]entity.FilterMapFunction {
+	// if len(filterMapFunctions) == 0 {
+	// TODO: See internal/model/file_item.go:620 for an example
+	// }
+
+	return filterMapFunctions
+}
+
+// GetFilterSchema returns filter schema
+func GetFilterSchema() string {
+	var m Model
+	return entity.GetFilterSchema(m)
+}

backend/internal/entity/upstream/methods.go

@@ -0,0 +1,162 @@
+package upstream
+
+import (
+	"database/sql"
+	goerrors "errors"
+	"fmt"
+
+	"npm/internal/database"
+	"npm/internal/entity"
+	"npm/internal/errors"
+	"npm/internal/logger"
+	"npm/internal/model"
+)
+
+// GetByID finds a Upstream by ID
+func GetByID(id int) (Model, error) {
+	var m Model
+	err := m.LoadByID(id)
+	return m, err
+}
+
+// create will create a Upstream from this model
+func create(u *Model) (int, error) {
+	if u.ID != 0 {
+		return 0, goerrors.New("Cannot create upstream when model already has an ID")
+	}
+
+	u.Touch(true)
+
+	db := database.GetInstance()
+	// nolint: gosec
+	result, err := db.NamedExec(`INSERT INTO `+fmt.Sprintf("`%s`", tableName)+` (
+		created_on,
+		modified_on,
+		user_id,
+		name,
+		nginx_template_id,
+		ip_hash,
+		ntlm,
+		keepalive,
+		keepalive_requests,
+		keepalive_time,
+		keepalive_timeout,
+		advanced_config,
+		status,
+		error_message,
+		is_deleted
+	) VALUES (
+		:created_on,
+		:modified_on,
+		:user_id,
+		:name,
+		:nginx_template_id,
+		:ip_hash,
+		:ntlm,
+		:keepalive,
+		:keepalive_requests,
+		:keepalive_time,
+		:keepalive_timeout,
+		:advanced_config,
+		:status,
+		:error_message,
+		:is_deleted
+	)`, u)
+
+	if err != nil {
+		return 0, err
+	}
+
+	last, lastErr := result.LastInsertId()
+	if lastErr != nil {
+		return 0, lastErr
+	}
+
+	logger.Debug("Created Upstream: %+v", u)
+
+	return int(last), nil
+}
+
+// update will Update a Upstream from this model
+func update(u *Model) error {
+	if u.ID == 0 {
+		return goerrors.New("Cannot update upstream when model doesn't have an ID")
+	}
+
+	u.Touch(false)
+
+	db := database.GetInstance()
+	// nolint: gosec
+	_, err := db.NamedExec(`UPDATE `+fmt.Sprintf("`%s`", tableName)+` SET
+		created_on = :created_on,
+		modified_on = :modified_on,
+		user_id = :user_id,
+		name = :name,
+		nginx_template_id = :nginx_template_id,
+		ip_hash = :ip_hash,
+		ntlm = :ntlm,
+		keepalive = :keepalive,
+		keepalive_requests = :keepalive_requests,
+		keepalive_time = :keepalive_time,
+		advanced_config = :advanced_config,
+		status = :status,
+		error_message = :error_message,
+		is_deleted = :is_deleted
+	WHERE id = :id`, u)
+
+	logger.Debug("Updated Upstream: %+v", u)
+
+	return err
+}
+
+// List will return a list of Upstreams
+func List(pageInfo model.PageInfo, filters []model.Filter, expand []string) (ListResponse, error) {
+	var result ListResponse
+	var exampleModel Model
+
+	defaultSort := model.Sort{
+		Field:     "name",
+		Direction: "ASC",
+	}
+
+	db := database.GetInstance()
+	if db == nil {
+		return result, errors.ErrDatabaseUnavailable
+	}
+
+	// Get count of items in this search
+	query, params := entity.ListQueryBuilder(exampleModel, tableName, &pageInfo, defaultSort, filters, getFilterMapFunctions(), true)
+	countRow := db.QueryRowx(query, params...)
+	var totalRows int
+	queryErr := countRow.Scan(&totalRows)
+	if queryErr != nil && queryErr != sql.ErrNoRows {
+		logger.Debug("%s -- %+v", query, params)
+		return result, queryErr
+	}
+
+	// Get rows
+	items := make([]Model, 0)
+	query, params = entity.ListQueryBuilder(exampleModel, tableName, &pageInfo, defaultSort, filters, getFilterMapFunctions(), false)
+	err := db.Select(&items, query, params...)
+	if err != nil {
+		logger.Debug("%s -- %+v", query, params)
+		return result, err
+	}
+
+	// Expand to get servers, at a minimum
+	for idx := range items {
+		// nolint: errcheck, gosec
+		items[idx].Expand(expand)
+	}
+
+	result = ListResponse{
+		Items:  items,
+		Total:  totalRows,
+		Limit:  pageInfo.Limit,
+		Offset: pageInfo.Offset,
+		Sort:   pageInfo.Sort,
+		Filter: filters,
+	}
+
+	return result, nil
+}

backend/internal/entity/upstream/model.go

@@ -0,0 +1,127 @@
+package upstream
+
+import (
+	"fmt"
+	"time"
+
+	"npm/internal/database"
+	"npm/internal/entity/nginxtemplate"
+	"npm/internal/entity/upstreamserver"
+	"npm/internal/status"
+	"npm/internal/types"
+	"npm/internal/util"
+)
+
+const (
+	tableName = "upstream"
+)
+
+// Model is the Upstream model
+// See: http://nginx.org/en/docs/http/ngx_http_upstream_module.html#upstream
+type Model struct {
+	ID                int          `json:"id" db:"id" filter:"id,integer"`
+	CreatedOn         types.DBDate `json:"created_on" db:"created_on" filter:"created_on,integer"`
+	ModifiedOn        types.DBDate `json:"modified_on" db:"modified_on" filter:"modified_on,integer"`
+	UserID            int          `json:"user_id" db:"user_id" filter:"user_id,integer"`
+	Name              string       `json:"name" db:"name" filter:"name,string"`
+	NginxTemplateID   int          `json:"nginx_template_id" db:"nginx_template_id" filter:"nginx_template_id,integer"`
+	IPHash            bool         `json:"ip_hash" db:"ip_hash" filter:"ip_hash,boolean"`
+	NTLM              bool         `json:"ntlm" db:"ntlm" filter:"ntlm,boolean"`
+	Keepalive         int          `json:"keepalive" db:"keepalive" filter:"keepalive,integer"`
+	KeepaliveRequests int          `json:"keepalive_requests" db:"keepalive_requests" filter:"keepalive_requests,integer"`
+	KeepaliveTime     string       `json:"keepalive_time" db:"keepalive_time" filter:"keepalive_time,string"`
+	KeepaliveTimeout  string       `json:"keepalive_timeout" db:"keepalive_timeout" filter:"keepalive_timeout,string"`
+	AdvancedConfig    string       `json:"advanced_config" db:"advanced_config" filter:"advanced_config,string"`
+	Status            string       `json:"status" db:"status" filter:"status,string"`
+	ErrorMessage      string       `json:"error_message" db:"error_message" filter:"error_message,string"`
+	IsDeleted         bool         `json:"is_deleted,omitempty" db:"is_deleted"`
+	// Expansions
+	Servers       []upstreamserver.Model `json:"servers"`
+	NginxTemplate *nginxtemplate.Model   `json:"nginx_template,omitempty"`
+}
+
+func (m *Model) getByQuery(query string, params []interface{}) error {
+	return database.GetByQuery(m, query, params)
+}
+
+// LoadByID will load from an ID
+func (m *Model) LoadByID(id int) error {
+	query := fmt.Sprintf("SELECT * FROM `%s` WHERE id = ? AND is_deleted = ? LIMIT 1", tableName)
+	params := []interface{}{id, 0}
+	err := m.getByQuery(query, params)
+	if err == nil {
+		err = m.Expand(nil)
+	}
+	return err
+}
+
+// Touch will update model's timestamp(s)
+func (m *Model) Touch(created bool) {
+	var d types.DBDate
+	d.Time = time.Now()
+	if created {
+		m.CreatedOn = d
+	}
+	m.ModifiedOn = d
+}
+
+// Save will save this model to the DB
+func (m *Model) Save(skipConfiguration bool) error {
+	var err error
+
+	if m.UserID == 0 {
+		return fmt.Errorf("User ID must be specified")
+	}
+
+	if !skipConfiguration {
+		// Set this upstream as requiring reconfiguration
+		m.Status = status.StatusReady
+	}
+
+	if m.ID == 0 {
+		m.ID, err = create(m)
+	} else {
+		err = update(m)
+	}
+
+	// Save Servers
+	if err == nil {
+		for idx := range m.Servers {
+			// Continue if previous iteration didn't cause an error
+			if err == nil {
+				m.Servers[idx].UpstreamID = m.ID
+				err = m.Servers[idx].Save()
+			}
+		}
+	}
+
+	return err
+}
+
+// Delete will mark a upstream as deleted
+func (m *Model) Delete() bool {
+	m.Touch(false)
+	m.IsDeleted = true
+	if err := m.Save(false); err != nil {
+		return false
+	}
+	return true
+}
+
+// Expand will fill in more properties
+func (m *Model) Expand(items []string) error {
+	var err error
+
+	// Always expand servers, if not done already
+	if len(m.Servers) == 0 {
+		m.Servers, err = upstreamserver.GetByUpstreamID(m.ID)
+	}
+
+	if util.SliceContainsItem(items, "nginxtemplate") && m.NginxTemplateID > 0 {
+		var templ nginxtemplate.Model
+		templ, err = nginxtemplate.GetByID(m.NginxTemplateID)
+		m.NginxTemplate = &templ
+	}
+
+	return err
+}

backend/internal/entity/upstream/structs.go

@@ -0,0 +1,15 @@
+package upstream
+
+import (
+	"npm/internal/model"
+)
+
+// ListResponse is the JSON response for this list
+type ListResponse struct {
+	Total  int            `json:"total"`
+	Offset int            `json:"offset"`
+	Limit  int            `json:"limit"`
+	Sort   []model.Sort   `json:"sort"`
+	Filter []model.Filter `json:"filter,omitempty"`
+	Items  []Model        `json:"items,omitempty"`
+}