feat(app,manifest): validation + extendable metadatas
All checks were successful
arcad/edge/pipeline/head This commit looks good
All checks were successful
arcad/edge/pipeline/head This commit looks good
This commit is contained in:
parent
34c6a089b5
commit
8ca31d05c0
11
cmd/cli/command/app/common.go
Normal file
11
cmd/cli/command/app/common.go
Normal file
@ -0,0 +1,11 @@
|
||||
package app
|
||||
|
||||
import (
|
||||
"forge.cadoles.com/arcad/edge/pkg/app"
|
||||
"forge.cadoles.com/arcad/edge/pkg/app/metadata"
|
||||
)
|
||||
|
||||
var manifestMetadataValidators = []app.MetadataValidator{
|
||||
metadata.WithMinimumRoleValidator("visitor", "user", "superuser", "admin", "superadmin"),
|
||||
metadata.WithNamedPathsValidator(metadata.NamedPathAdmin, metadata.NamedPathIcon),
|
||||
}
|
@ -52,6 +52,10 @@ func PackageCommand() *cli.Command {
|
||||
return errors.Wrap(err, "could not load app manifest")
|
||||
}
|
||||
|
||||
if valid, err := manifest.Validate(manifestMetadataValidators...); !valid {
|
||||
return errors.Wrap(err, "invalid app manifest")
|
||||
}
|
||||
|
||||
if err := os.MkdirAll(outputDir, 0o755); err != nil {
|
||||
return errors.Wrapf(err, "could not create directory ''%s'", outputDir)
|
||||
}
|
||||
|
@ -110,6 +110,10 @@ func RunCommand() *cli.Command {
|
||||
return errors.Wrap(err, "could not load manifest from app bundle")
|
||||
}
|
||||
|
||||
if valid, err := manifest.Validate(manifestMetadataValidators...); !valid {
|
||||
return errors.Wrap(err, "invalid app manifest")
|
||||
}
|
||||
|
||||
storageFile := injectAppID(ctx.String("storage-file"), manifest.ID)
|
||||
|
||||
if err := ensureDir(storageFile); err != nil {
|
||||
|
@ -6,6 +6,7 @@ Une **Edge App** est une application capable de s'exécuter dans un environnemen
|
||||
|
||||
### Référence
|
||||
|
||||
- [Fichier `manifest.yml`](./apps/manifest.md)
|
||||
- [API Client](./apps/client-api/README.md)
|
||||
- [API Serveur](./apps/server-api/README.md)
|
||||
|
||||
|
36
doc/apps/manifest.md
Normal file
36
doc/apps/manifest.md
Normal file
@ -0,0 +1,36 @@
|
||||
# Le fichier `manifest.yml`
|
||||
|
||||
Le fichier `manifest.yml` à la racine du bundle de votre application contient des informations décrivant celles ci. Vous trouverez ci dessous un exemple commenté.
|
||||
|
||||
```yaml
|
||||
# REQUIS - L'identifiant de votre application. Il doit être globalement unique.
|
||||
# Un identifiant du type nom de domaine inversé est en général conseillé (ex: tld.mycompany.myapp)
|
||||
id: tld.mycompany.myapp
|
||||
|
||||
# REQUIS - Le numéro de version de votre application
|
||||
# Celui ci devrait respecter le format "semver 2" (voir https://semver.org/)
|
||||
version: 0.0.0
|
||||
|
||||
# REQUIS - Le titre de votre application.
|
||||
title: My App
|
||||
|
||||
# OPTIONNEL - Les mots-clés associés à votre applications.
|
||||
tags: ["chat"]
|
||||
|
||||
# OPTIONNEL - La description de votre application.
|
||||
# Vous pouvez utiliser la syntaxe Markdown pour la mettre en forme.
|
||||
description: |>
|
||||
A simple demo application
|
||||
|
||||
# OPTIONNEL - Métadonnées associées à l'application
|
||||
metadata:
|
||||
# OPTIONNEL - Liste des chemins permettant d'accéder à certains URLs identifiées (page d'administration, icône si existante, etc)
|
||||
paths:
|
||||
# Si défini, chemin vers la page d'administration de l'application
|
||||
admin: /admin
|
||||
# Si défini, chemin vers l'icône associée à l'application
|
||||
icon: /my-app-icon.png
|
||||
|
||||
# OPTIONNEL - Role minimum requis pour pouvoir accéder à l'application
|
||||
minimumRole: visitor
|
||||
```
|
@ -22,23 +22,7 @@ my-app
|
||||
|
||||
Ce fichier est le manifeste de votre application. Il permet au serveur d'identifier celle ci et de récupérer des informations la concernant.
|
||||
|
||||
```yaml
|
||||
---
|
||||
# L'identifiant de votre application. Il doit être globalement unique.
|
||||
# Un identifiant du type nom de domaine inversé est en général conseillé (ex: tld.mycompany.myapp)
|
||||
id: tld.mycompany.myapp
|
||||
|
||||
# Le titre de votre application.
|
||||
title: My App
|
||||
|
||||
# Les mots-clés associés à votre applications.
|
||||
tags: ["chat"]
|
||||
|
||||
# La description de votre application.
|
||||
# Vous pouvez utiliser la syntaxe Markdown pour la mettre en forme.
|
||||
description: |>
|
||||
A simple demo application
|
||||
```
|
||||
[Voir le fichier `manifest.yml` d'exemple](./manifest.md)
|
||||
|
||||
## 4. Créer la page d'accueil
|
||||
|
||||
|
@ -1,39 +0,0 @@
|
||||
package app
|
||||
|
||||
import (
|
||||
"forge.cadoles.com/arcad/edge/pkg/bundle"
|
||||
"github.com/pkg/errors"
|
||||
"gopkg.in/yaml.v2"
|
||||
)
|
||||
|
||||
type ID string
|
||||
|
||||
type Manifest struct {
|
||||
ID ID `yaml:"id" json:"id"`
|
||||
Version string `yaml:"version" json:"version"`
|
||||
Title string `yaml:"title" json:"title"`
|
||||
Description string `yaml:"description" json:"description"`
|
||||
Tags []string `yaml:"tags" json:"tags"`
|
||||
}
|
||||
|
||||
func LoadManifest(b bundle.Bundle) (*Manifest, error) {
|
||||
reader, _, err := b.File("manifest.yml")
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "could not read manifest.yml")
|
||||
}
|
||||
|
||||
defer func() {
|
||||
if err := reader.Close(); err != nil {
|
||||
panic(errors.WithStack(err))
|
||||
}
|
||||
}()
|
||||
|
||||
manifest := &Manifest{}
|
||||
|
||||
decoder := yaml.NewDecoder(reader)
|
||||
if err := decoder.Decode(manifest); err != nil {
|
||||
return nil, errors.Wrap(err, "could not decode manifest.yml")
|
||||
}
|
||||
|
||||
return manifest, nil
|
||||
}
|
85
pkg/app/manifest.go
Normal file
85
pkg/app/manifest.go
Normal file
@ -0,0 +1,85 @@
|
||||
package app
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"forge.cadoles.com/arcad/edge/pkg/bundle"
|
||||
"github.com/pkg/errors"
|
||||
"golang.org/x/mod/semver"
|
||||
"gopkg.in/yaml.v2"
|
||||
)
|
||||
|
||||
type ID string
|
||||
|
||||
type Manifest struct {
|
||||
ID ID `yaml:"id" json:"id"`
|
||||
Version string `yaml:"version" json:"version"`
|
||||
Title string `yaml:"title" json:"title"`
|
||||
Description string `yaml:"description" json:"description"`
|
||||
Tags []string `yaml:"tags" json:"tags"`
|
||||
Metadata map[string]any `yaml:"metadata" json:"metadata"`
|
||||
}
|
||||
|
||||
type MetadataValidator func(map[string]any) (bool, error)
|
||||
|
||||
func (m *Manifest) Validate(validators ...MetadataValidator) (bool, error) {
|
||||
if m.ID == "" {
|
||||
return false, errors.New("'id' property should not be empty")
|
||||
}
|
||||
|
||||
if m.Version == "" {
|
||||
return false, errors.New("'version' property should not be empty")
|
||||
}
|
||||
|
||||
version := m.Version
|
||||
if !strings.HasPrefix(version, "v") {
|
||||
version = "v" + version
|
||||
}
|
||||
|
||||
if !semver.IsValid(version) {
|
||||
return false, errors.Errorf("version '%s' does not respect semver format", m.Version)
|
||||
}
|
||||
|
||||
if m.Title == "" {
|
||||
return false, errors.New("'title' property should not be empty")
|
||||
}
|
||||
|
||||
if m.Tags != nil {
|
||||
for _, t := range m.Tags {
|
||||
if strings.ContainsAny(t, " \t\n\r") {
|
||||
return false, errors.Errorf("tag '%s' should not contain any space or new line", t)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for _, v := range validators {
|
||||
valid, err := v(m.Metadata)
|
||||
if !valid || err != nil {
|
||||
return valid, errors.WithStack(err)
|
||||
}
|
||||
}
|
||||
|
||||
return true, nil
|
||||
}
|
||||
|
||||
func LoadManifest(b bundle.Bundle) (*Manifest, error) {
|
||||
reader, _, err := b.File("manifest.yml")
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "could not read manifest.yml")
|
||||
}
|
||||
|
||||
defer func() {
|
||||
if err := reader.Close(); err != nil {
|
||||
panic(errors.WithStack(err))
|
||||
}
|
||||
}()
|
||||
|
||||
manifest := &Manifest{}
|
||||
|
||||
decoder := yaml.NewDecoder(reader)
|
||||
if err := decoder.Decode(manifest); err != nil {
|
||||
return nil, errors.Wrap(err, "could not decode manifest.yml")
|
||||
}
|
||||
|
||||
return manifest, nil
|
||||
}
|
28
pkg/app/metadata/minimum_role.go
Normal file
28
pkg/app/metadata/minimum_role.go
Normal file
@ -0,0 +1,28 @@
|
||||
package metadata
|
||||
|
||||
import (
|
||||
"forge.cadoles.com/arcad/edge/pkg/app"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
func WithMinimumRoleValidator(roles ...string) app.MetadataValidator {
|
||||
return func(metadata map[string]any) (bool, error) {
|
||||
rawMinimumRole, exists := metadata["minimumRole"]
|
||||
if !exists {
|
||||
return true, nil
|
||||
}
|
||||
|
||||
minimumRole, ok := rawMinimumRole.(string)
|
||||
if !ok {
|
||||
return false, errors.Errorf("metadata['minimumRole']: unexpected value type '%T'", rawMinimumRole)
|
||||
}
|
||||
|
||||
for _, r := range roles {
|
||||
if minimumRole == r {
|
||||
return true, nil
|
||||
}
|
||||
}
|
||||
|
||||
return false, errors.Errorf("metadata['minimumRole']: unexpected role '%s'", minimumRole)
|
||||
}
|
||||
}
|
56
pkg/app/metadata/named_path.go
Normal file
56
pkg/app/metadata/named_path.go
Normal file
@ -0,0 +1,56 @@
|
||||
package metadata
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"forge.cadoles.com/arcad/edge/pkg/app"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type NamedPath string
|
||||
|
||||
const (
|
||||
NamedPathAdmin NamedPath = "admin"
|
||||
NamedPathIcon NamedPath = "icon"
|
||||
)
|
||||
|
||||
func WithNamedPathsValidator(names ...NamedPath) app.MetadataValidator {
|
||||
set := map[NamedPath]struct{}{}
|
||||
for _, n := range names {
|
||||
set[n] = struct{}{}
|
||||
}
|
||||
|
||||
return func(metadata map[string]any) (bool, error) {
|
||||
rawPaths, exists := metadata["paths"]
|
||||
if !exists {
|
||||
return true, nil
|
||||
}
|
||||
|
||||
paths, ok := rawPaths.(map[any]any)
|
||||
if !ok {
|
||||
return false, errors.Errorf("metadata['paths']: unexpected named path value type '%T'", rawPaths)
|
||||
}
|
||||
|
||||
for n, p := range paths {
|
||||
name, ok := n.(string)
|
||||
if !ok {
|
||||
return false, errors.Errorf("metadata['paths']: unexpected named path type '%T'", n)
|
||||
}
|
||||
|
||||
if _, exists := set[NamedPath(name)]; !exists {
|
||||
return false, errors.Errorf("metadata['paths']: unexpected named path '%s'", name)
|
||||
}
|
||||
|
||||
path, ok := p.(string)
|
||||
if !ok {
|
||||
return false, errors.Errorf("metadata['paths']['%s']: unexpected named path value type '%T'", name, path)
|
||||
}
|
||||
|
||||
if !strings.HasPrefix(path, "/") {
|
||||
return false, errors.Errorf("metadata['paths']['%s']: named path value should start with a '/'", name)
|
||||
}
|
||||
}
|
||||
|
||||
return true, nil
|
||||
}
|
||||
}
|
7
pkg/app/metadata/testdata/manifests/invalid-minimum-role.yml
vendored
Normal file
7
pkg/app/metadata/testdata/manifests/invalid-minimum-role.yml
vendored
Normal file
@ -0,0 +1,7 @@
|
||||
id: foo.arcad.app
|
||||
version: v0.0.0
|
||||
title: Foo
|
||||
description: A test app
|
||||
tags: ["test"]
|
||||
metadata:
|
||||
minimumRole: foo
|
10
pkg/app/metadata/testdata/manifests/invalid-paths.yml
vendored
Normal file
10
pkg/app/metadata/testdata/manifests/invalid-paths.yml
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
id: foo.arcad.app
|
||||
version: v0.0.0
|
||||
title: Foo
|
||||
description: A test app
|
||||
tags: ["test"]
|
||||
metadata:
|
||||
paths:
|
||||
invalid: /admin
|
||||
icon: /my-app-icon.png
|
||||
minimumRole: visitor
|
10
pkg/app/metadata/testdata/manifests/valid.yml
vendored
Normal file
10
pkg/app/metadata/testdata/manifests/valid.yml
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
id: foo.arcad.app
|
||||
version: v0.0.0
|
||||
title: Foo
|
||||
description: A test app
|
||||
tags: ["test"]
|
||||
metadata:
|
||||
paths:
|
||||
admin: /admin
|
||||
icon: /my-app-icon.png
|
||||
minimumRole: visitor
|
74
pkg/app/metadata/validator_test.go
Normal file
74
pkg/app/metadata/validator_test.go
Normal file
@ -0,0 +1,74 @@
|
||||
package metadata
|
||||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"forge.cadoles.com/arcad/edge/pkg/app"
|
||||
"github.com/pkg/errors"
|
||||
"gopkg.in/yaml.v2"
|
||||
)
|
||||
|
||||
type validatorTestCase struct {
|
||||
File string
|
||||
ExpectValid bool
|
||||
ExpectError bool
|
||||
}
|
||||
|
||||
var validatorTestCases = []validatorTestCase{
|
||||
{
|
||||
File: "valid.yml",
|
||||
ExpectValid: true,
|
||||
},
|
||||
{
|
||||
File: "invalid-paths.yml",
|
||||
ExpectValid: false,
|
||||
ExpectError: true,
|
||||
},
|
||||
{
|
||||
File: "invalid-minimum-role.yml",
|
||||
ExpectValid: false,
|
||||
ExpectError: true,
|
||||
},
|
||||
}
|
||||
|
||||
var validators = []app.MetadataValidator{
|
||||
WithMinimumRoleValidator("visitor", "user", "superuser", "admin", "superadmin"),
|
||||
WithNamedPathsValidator(NamedPathAdmin, NamedPathIcon),
|
||||
}
|
||||
|
||||
func TestManifestValidate(t *testing.T) {
|
||||
for _, tc := range validatorTestCases {
|
||||
func(tc *validatorTestCase) {
|
||||
t.Run(tc.File, func(t *testing.T) {
|
||||
data, err := ioutil.ReadFile(filepath.Join("testdata/manifests", tc.File))
|
||||
if err != nil {
|
||||
t.Fatalf("%+v", errors.WithStack(err))
|
||||
}
|
||||
|
||||
var manifest app.Manifest
|
||||
|
||||
if err := yaml.Unmarshal(data, &manifest); err != nil {
|
||||
t.Fatalf("%+v", errors.WithStack(err))
|
||||
}
|
||||
|
||||
valid, err := manifest.Validate(validators...)
|
||||
|
||||
t.Logf("[RESULT] valid:%v, err:%v", valid, err)
|
||||
|
||||
if e, g := tc.ExpectValid, valid; e != g {
|
||||
t.Errorf("valid: expected '%v', got '%v'", e, g)
|
||||
}
|
||||
|
||||
if tc.ExpectError && err == nil {
|
||||
t.Error("err should not be nil")
|
||||
}
|
||||
|
||||
if !tc.ExpectError && err != nil {
|
||||
t.Errorf("err: expected nil, got '%+v'", err)
|
||||
}
|
||||
})
|
||||
}(&tc)
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user