sparkles: Web UI schema validations (#934)

* Allow validator to receive a config-schema

It will try to process a URL first, otherwise a file and if the file
is not present it will try to read the source as a cloud-config

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>

* Validate cloud-config on WebUI

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>

---------

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
This commit is contained in:
Mauro Morales
2023-02-22 08:54:45 +01:00
committed by Itxaka
parent 461516fec5
commit 0cf3da5e06
3 changed files with 42 additions and 7 deletions

View File

@@ -23,11 +23,11 @@ func JSONSchema(version string) (string, error) {
}
// Validate ensures that a given schema is Valid according to the Root Schema from the agent.
func Validate(file string) error {
func Validate(source string) error {
var yaml string
if strings.HasPrefix(file, "http") {
resp, err := http.Get(file)
if strings.HasPrefix(source, "http") {
resp, err := http.Get(source)
if err != nil {
return err
}
@@ -38,12 +38,17 @@ func Validate(file string) error {
//Convert the body to type string
yaml = string(body)
} else {
dat, err := os.ReadFile(file)
dat, err := os.ReadFile(source)
if err != nil {
if strings.Contains(err.Error(), "no such file or directory") {
yaml = source
} else {
return err
}
} else {
yaml = string(dat)
}
}
config, err := schema.NewConfigFromYAML(yaml, schema.RootSchema{})
if err != nil {

View File

@@ -69,7 +69,22 @@
try {
// Parse the YAML
const yaml = YAML.parse(this.content);
const formData = new FormData()
formData.append('cloud-config', this.content)
const settings = {
method: 'POST',
body: formData,
};
fetch(`/validate`, settings)
.then((response) => response.text())
.then((text) => {
if (text === '') {
this.valid = true
} else {
this.error = text
this.valid = false
}
})
} catch(error) {
this.error = error
this.valid = false

View File

@@ -161,6 +161,21 @@ func Start(ctx context.Context) error {
ec.GET("/*", echo.WrapHandler(http.StripPrefix("/", assetHandler)))
ec.POST("/validate", func(c echo.Context) error {
formData := new(FormData)
if err := c.Bind(formData); err != nil {
return err
}
cloudConfig := formData.CloudConfig
err := agent.Validate(cloudConfig)
if err != nil {
return c.String(http.StatusOK, err.Error())
}
return c.String(http.StatusOK, "")
})
ec.POST("/install", func(c echo.Context) error {
s.Lock()