- Added upstream objects

- Renamed host templates to nginx templates
- Generate upstream templates
- Better nginx error reporting when reloading
- Use tparse for golang test reporting
This commit is contained in:
Jamie Curnow
2023-01-04 15:36:56 +10:00
parent b3ae2f4dbb
commit 5e5f0de0e2
82 changed files with 2209 additions and 294 deletions

View File

@ -127,7 +127,7 @@ func List(pageInfo model.PageInfo, filters []model.Filter) (ListResponse, error)
}
// Get rows
var items []Model
items := make([]Model, 0)
query, params = entity.ListQueryBuilder(exampleModel, tableName, &pageInfo, defaultSort, filters, getFilterMapFunctions(), false)
err := db.Select(&items, query, params...)
if err != nil {

View File

@ -267,9 +267,14 @@ func (m *Model) Request() error {
// GetTemplate will convert the Model to a Template
func (m *Model) GetTemplate() Template {
if m.ID == 0 {
// No or empty certificate object, happens when the host has no cert
return Template{}
}
domainNames, _ := m.DomainNames.AsStringArray()
t := Template{
return Template{
ID: m.ID,
CreatedOn: m.CreatedOn.Time.String(),
ModifiedOn: m.ModifiedOn.Time.String(),
@ -288,8 +293,6 @@ func (m *Model) GetTemplate() Template {
IsProvided: m.ID > 0 && m.Status == StatusProvided,
Folder: m.GetFolder(),
}
return t
}
// GetFolder returns the folder where these certs should exist