This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit ef0d94562aa08cd0094d21fdc722af899612653d Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Nov 15 17:58:14 2023 +0100 Remove tectonic.ui related metadata - Fixed validation Signed-off-by: Andrea Cosentino <[email protected]> --- script/validator/validator.go | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/script/validator/validator.go b/script/validator/validator.go index 2531fe20..cf62cf5f 100644 --- a/script/validator/validator.go +++ b/script/validator/validator.go @@ -17,7 +17,6 @@ import ( "github.com/bbalet/stopwords" perrors "github.com/pkg/errors" yamlv3 "gopkg.in/yaml.v3" - "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -141,28 +140,12 @@ func verifyDescriptors(kamelets []KameletInfo) (errors []error) { errors = append(errors, fmt.Errorf("kamelet %q does not contain the JSON schema definition", kamelet.Name)) continue } - for k, p := range kamelet.Spec.Definition.Properties { - pwdDescriptor := "urn:alm:descriptor:com.tectonic.ui:password" - if hasXDescriptor(p, pwdDescriptor) && p.Format != "password" { - errors = append(errors, fmt.Errorf("property %q in kamelet %q has password descriptor %q but its format is not \"password\"", k, kamelet.Name, pwdDescriptor)) - } else if !hasXDescriptor(p, pwdDescriptor) && p.Format == "password" { - errors = append(errors, fmt.Errorf("property %q in kamelet %q has \"password\" format but misses descriptor %q (for better compatibility with tectonic UIs)", k, kamelet.Name, pwdDescriptor)) - } - } for k, p := range kamelet.Spec.Definition.Properties { credDescriptor := "urn:camel:group:credentials" if p.Format == "password" && !hasXDescriptor(p, credDescriptor) { errors = append(errors, fmt.Errorf("property %q in kamelet %q has \"password\" format but misses descriptor %q", k, kamelet.Name, credDescriptor)) } } - for k, p := range kamelet.Spec.Definition.Properties { - checkboxDescriptor := "urn:alm:descriptor:com.tectonic.ui:checkbox" - if hasXDescriptor(p, checkboxDescriptor) && p.Type != "boolean" { - errors = append(errors, fmt.Errorf("property %q in kamelet %q has checkbox descriptor %q but its type is not \"boolean\"", k, kamelet.Name, checkboxDescriptor)) - } else if !hasXDescriptor(p, checkboxDescriptor) && p.Type == "boolean" { - errors = append(errors, fmt.Errorf("property %q in kamelet %q has \"boolean\" type but misses descriptor %q (for better compatibility with tectonic UIs)", k, kamelet.Name, checkboxDescriptor)) - } - } } return errors } @@ -221,10 +204,6 @@ func verifyInvalidContent(kamelets []KameletInfo) (errors []error) { errors = append(errors, perrors.Wrapf(err, "cannot unmarshal kamelet file %q", kamelet.Name)) continue } - - if !equality.Semantic.DeepDerivative(unstrFile, unstr) { - errors = append(errors, fmt.Errorf("kamelet %q contains invalid content that is not supported by the Kamelet schema", kamelet.Name)) - } } return errors } @@ -399,7 +378,7 @@ func listKamelets(dir string) []KameletInfo { func verifyUsedParams(kamelets []KameletInfo) (errors []error) { for _, k := range kamelets { - if k.FileName != "../../kamelets/azure-storage-blob-source.kamelet.yaml" && k.FileName != "../../kamelets/aws-s3-cdc-source.kamelet.yaml" && k.FileName != "../../kamelets/set-kafka-key-action.kamelet.yaml" && k.FileName != "../../kamelets/azure-storage-blob-cdc-source.kamelet.yaml" && k.FileName != "../../kamelets/google-storage-cdc-source.kamelet.yaml" && k.FileName != "../../kamelets/elasticsearch-search-source.kamelet.yaml" && k.FileName != "../../kamelets/opensearch-search-source.k [...] + if k.FileName != "../../kamelets/azure-storage-blob-source.kamelet.yaml" && k.FileName != "../../kamelets/aws-s3-cdc-source.kamelet.yaml" && k.FileName != "../../kamelets/set-kafka-key-action.kamelet.yaml" && k.FileName != "../../kamelets/azure-storage-blob-cdc-source.kamelet.yaml" && k.FileName != "../../kamelets/google-storage-cdc-source.kamelet.yaml" && k.FileName != "../../kamelets/elasticsearch-search-source.kamelet.yaml" && k.FileName != "../../kamelets/opensearch-search-source.k [...] used := getUsedParams(k.Kamelet) declared := getDeclaredParams(k.Kamelet) for p := range used {
