snapshot of https://github.com/cortezaproject/corteza.git (2024.9.x, 2026-09-18; blobs > 131072B omitted)
Some checks failed
SonarQube / SonarQube (push) Failing after 5m28s
E2e test on main branch push / server and client test (map[name:admin port:8080]) (push) Failing after 3m33s
Server and lib tests / Library test (js) (push) Failing after 1m36s
Server and lib tests / Library test (vue) (push) Successful in 2m24s
Server and lib tests / Web client test (admin) (push) Successful in 2m52s
Server and lib tests / Web client test (compose) (push) Successful in 3m23s
Server and lib tests / Web client test (discovery) (push) Successful in 2m49s
Server and lib tests / Web client test (one) (push) Successful in 2m52s
Server and lib tests / Web client test (privacy) (push) Successful in 2m44s
Server and lib tests / Web client test (reporter) (push) Successful in 2m56s
Server and lib tests / Web client test (workflow) (push) Successful in 3m0s
Server and lib tests / Server tests (push) Failing after 4m55s
E2e test on main branch push / notify-failure (push) Failing after 9s
Server and lib tests / Send matrix testing notification (push) Successful in 2s
Mark stale issues and pull requests / stale (push) Successful in 40s
Some checks failed
SonarQube / SonarQube (push) Failing after 5m28s
E2e test on main branch push / server and client test (map[name:admin port:8080]) (push) Failing after 3m33s
Server and lib tests / Library test (js) (push) Failing after 1m36s
Server and lib tests / Library test (vue) (push) Successful in 2m24s
Server and lib tests / Web client test (admin) (push) Successful in 2m52s
Server and lib tests / Web client test (compose) (push) Successful in 3m23s
Server and lib tests / Web client test (discovery) (push) Successful in 2m49s
Server and lib tests / Web client test (one) (push) Successful in 2m52s
Server and lib tests / Web client test (privacy) (push) Successful in 2m44s
Server and lib tests / Web client test (reporter) (push) Successful in 2m56s
Server and lib tests / Web client test (workflow) (push) Successful in 3m0s
Server and lib tests / Server tests (push) Failing after 4m55s
E2e test on main branch push / notify-failure (push) Failing after 9s
Server and lib tests / Send matrix testing notification (push) Successful in 2s
Mark stale issues and pull requests / stale (push) Successful in 40s
This commit is contained in:
90
server/pkg/envoy/store/application.go
Normal file
90
server/pkg/envoy/store/application.go
Normal file
@@ -0,0 +1,90 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/cortezaproject/corteza/server/pkg/envoy/resource"
|
||||
"github.com/cortezaproject/corteza/server/store"
|
||||
"github.com/cortezaproject/corteza/server/system/types"
|
||||
)
|
||||
|
||||
type (
|
||||
application struct {
|
||||
cfg *EncoderConfig
|
||||
|
||||
res *resource.Application
|
||||
app *types.Application
|
||||
|
||||
ux *userIndex
|
||||
}
|
||||
)
|
||||
|
||||
// mergeApplications merges b into a, prioritising a
|
||||
func mergeApplications(a, b *types.Application) *types.Application {
|
||||
c := *a
|
||||
|
||||
if c.Name == "" {
|
||||
c.Name = b.Name
|
||||
}
|
||||
c.OwnerID = b.OwnerID
|
||||
|
||||
if c.CreatedAt.IsZero() {
|
||||
c.CreatedAt = b.CreatedAt
|
||||
}
|
||||
if c.UpdatedAt == nil {
|
||||
c.UpdatedAt = b.UpdatedAt
|
||||
}
|
||||
if c.DeletedAt == nil {
|
||||
c.DeletedAt = b.DeletedAt
|
||||
}
|
||||
|
||||
// I'll just compare the entire struct for now
|
||||
if c.Unify == nil || *c.Unify == (types.ApplicationUnify{}) {
|
||||
c.Unify = b.Unify
|
||||
}
|
||||
|
||||
return &c
|
||||
}
|
||||
|
||||
// findApplication looks for the app in the resources & the store
|
||||
//
|
||||
// Provided resources are prioritized.
|
||||
func findApplication(ctx context.Context, s store.Storer, rr resource.InterfaceSet, ii resource.Identifiers) (ap *types.Application, err error) {
|
||||
ap = resource.FindApplication(rr, ii)
|
||||
if ap != nil {
|
||||
return ap, nil
|
||||
}
|
||||
|
||||
return findApplicationStore(ctx, s, makeGenericFilter(ii))
|
||||
}
|
||||
|
||||
// findApplicationStore looks for the app in the store
|
||||
func findApplicationStore(ctx context.Context, s store.Storer, gf genericFilter) (ap *types.Application, err error) {
|
||||
if gf.id > 0 {
|
||||
ap, err = store.LookupApplicationByID(ctx, s, gf.id)
|
||||
if err != nil && err != store.ErrNotFound {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if ap != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
for _, i := range gf.identifiers {
|
||||
var aa types.ApplicationSet
|
||||
aa, _, err = store.SearchApplications(ctx, s, types.ApplicationFilter{Name: i})
|
||||
if err != nil && err != store.ErrNotFound {
|
||||
return nil, err
|
||||
}
|
||||
if len(aa) > 1 {
|
||||
return nil, resourceErrIdentifierNotUnique(i)
|
||||
}
|
||||
if len(aa) == 1 {
|
||||
ap = aa[0]
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
return nil, nil
|
||||
}
|
||||
Reference in New Issue
Block a user