feat(cloud): do not allow optional for notEmpty=true

camunda · Feb 14, 2022 · 085d043 · 085d043
1 parent 78e9a3f
commit 085d043
Show file tree

Hide file tree

Showing 4 changed files with 154 additions and 0 deletions.
diff --git a/resources/cloud.json b/resources/cloud.json
@@ -280,6 +280,33 @@
                     }
                   }
                 }
+              },
+              {
+                "if": {
+                  "properties": {
+                    "optional": {
+                      "const": true
+                    }
+                  },
+                  "required": [
+                    "optional"
+                  ]
+                },
+                "then": {
+                  "properties": {
+                    "constraints": {
+                      "properties": {
+                        "notEmpty": {
+                          "const": false,
+                          "errorMessage": "optional is not allowed for truthy \"notEmpty\" constraint"
+                        }
+                      },
+                      "required": [
+                        "notEmpty"
+                      ]
+                    }
+                  }
+                }
               }
             ],
             "properties": {

diff --git a/src/defs/cloud-properties.json b/src/defs/cloud-properties.json
@@ -117,6 +117,33 @@
             }
           }
         }
+      },
+      {
+        "if": {
+          "properties": {
+            "optional": {
+              "const": true
+            }
+          },
+          "required": [
+            "optional"
+          ]
+        },
+        "then": {
+          "properties": {
+            "constraints": {
+              "properties": {
+                "notEmpty": {
+                  "const": false,
+                  "errorMessage": "optional is not allowed for truthy \"notEmpty\" constraint"
+                }
+              },
+              "required": [
+                "notEmpty"
+              ]
+            }
+          }
+        }
       }
     ],
     "properties": {

diff --git a/test/fixtures/cloud-optional-invalid-not-empty.js b/test/fixtures/cloud-optional-invalid-not-empty.js
@@ -0,0 +1,97 @@
+export const template = {
+  'name': 'REST Connector',
+  'id': 'io.camunda.connectors.RestConnector-s1',
+  'description': 'A generic REST service.',
+  'appliesTo': [
+    'bpmn:ServiceTask'
+  ],
+  'properties': [
+    {
+      'label': 'Request Body',
+      'type': 'String',
+      'optional': true,
+      'binding': {
+        'type': 'zeebe:input',
+        'name': 'body'
+      },
+      'constraints': {
+        'notEmpty': false
+      }
+    },
+    {
+      'label': 'Result Variable',
+      'type': 'String',
+      'optional': true,
+      'binding': {
+        'type': 'zeebe:input',
+        'name': 'key'
+      },
+      'constraints': {
+        'notEmpty': true
+      }
+    },
+    {
+      'label': 'foo',
+      'type': 'String',
+      'optional': true,
+      'binding': {
+        'type': 'zeebe:input',
+        'name': 'body'
+      }
+    },
+    {
+      'label': 'bar',
+      'type': 'String',
+      'optional': false,
+      'binding': {
+        'type': 'zeebe:input',
+        'name': 'body'
+      },
+      'constraints': {
+        'notEmpty': true
+      }
+    }
+  ]
+};
+
+export const errors = [
+  {
+    keyword: 'errorMessage',
+    dataPath: '/properties/1/constraints/notEmpty',
+    schemaPath: '#/definitions/properties/allOf/1/items/allOf/3/then/properties/constraints/properties/notEmpty/errorMessage',
+    params: {
+      errors: [
+        {
+          keyword: 'const',
+          dataPath: '/properties/1/constraints/notEmpty',
+          schemaPath: '#/definitions/properties/allOf/1/items/allOf/3/then/properties/constraints/properties/notEmpty/const',
+          params: { allowedValue: false },
+          message: 'should be equal to constant',
+          emUsed: true
+        }
+      ]
+    },
+    message: 'optional is not allowed for truthy "notEmpty" constraint'
+  },
+  {
+    keyword: 'if',
+    dataPath: '/properties/1',
+    schemaPath: '#/definitions/properties/allOf/1/items/allOf/3/if',
+    params: { failingKeyword: 'then' },
+    message: 'should match "then" schema'
+  },
+  {
+    keyword: 'type',
+    dataPath: '',
+    schemaPath: '#/oneOf/1/type',
+    params: { type: 'array' },
+    message: 'should be array'
+  },
+  {
+    keyword: 'oneOf',
+    dataPath: '',
+    schemaPath: '#/oneOf',
+    params: { passingSchemas: null },
+    message: 'should match exactly one schema in oneOf'
+  }
+];
diff --git a/test/spec/cloud.validationSpec.js b/test/spec/cloud.validationSpec.js
@@ -137,6 +137,9 @@ describe('validation - cloud', function() {
     testTemplate('cloud-optional-invalid-type');
 
 
+    testTemplate('cloud-optional-invalid-not-empty');
+
+
     describe('property type - binding type', function() {
 
       testTemplate('invalid-property-type');