#17 Support the build step's metadata annotations:

* Add the ability to specify "dangling" metadata annotations * Change the tevale eval field to "evaluation"
codefresh-io · Dec 14, 2016 · d5b70ac · d5b70ac
1 parent 5c247b8
commit d5b70ac
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/schema/1.0/steps/build.js b/schema/1.0/steps/build.js
@@ -23,24 +23,24 @@ class Build extends BaseSchema {
 
     getSchema() {
         let buildProperties = {
-            type:                Joi.string().valid(Build.getType()),
+            type:              Joi.string().valid(Build.getType()),
             working_directory: Joi.string(),
-            dockerfile:          Joi.alternatives()
-                                     .try(Joi.string(), Joi.object({ content: Joi.string() })),
+            dockerfile:        Joi.alternatives()
+                                   .try(Joi.string(), Joi.object({ content: Joi.string() })),
             image_name:        Joi.string().required(),
             build_arguments:   Joi.array().items(Joi.string()),
-            tag:                 Joi.string(),
-            metadata: Joi.object({
+            tag:               Joi.string(),
+            metadata:          Joi.object({
                 set: Joi.array().items(
-                    Joi.object().pattern(/^[A-Za-z09_]+$/, Joi.alternatives().try(
-                        [
-                            Joi.string(),
-                            Joi.boolean(),
-                            Joi.number(),
-                            Joi.object({ eval: Joi.string().required() })
-                        ]
-                    )).required()
-                )
+                    Joi.alternatives().try(
+                        Joi.object().pattern(/^[A-Za-z09_]+$/, Joi.alternatives().try(
+                            [
+                                Joi.string(),
+                                Joi.boolean(),
+                                Joi.number(),
+                                Joi.object({ evaluate: Joi.string().required() })
+                            ]
+                        )), Joi.string()))
             })
 
         };

diff --git a/tests/unit/validator.unit.js b/tests/unit/validator.unit.js
@@ -512,7 +512,7 @@ describe('Validate Codefresh YAML', () => {
                             }
                         }
                     }
-                }, '"eval" is required', done);
+                }, '"evaluate" is required', done);
             });
         });
 
@@ -591,14 +591,14 @@ describe('Validate Codefresh YAML', () => {
                     version: '1.0',
                     steps:   {
                         jim: {
-                            'type':       'push',
-                            'provider': 'ecr',
-                            'candidate':  'wowwww',
-                            'registry': 'reg',
-                            'tag': 'tg',
-                            'accessKeyId': 'kid',
+                            'type':            'push',
+                            'provider':        'ecr',
+                            'candidate':       'wowwww',
+                            'registry':        'reg',
+                            'tag':             'tg',
+                            'accessKeyId':     'kid',
                             'secretAccessKey': 'sac',
-                            'region': 'rg'
+                            'region':          'rg'
                         }
                     }
                 });
@@ -839,7 +839,8 @@ describe('Validate Codefresh YAML', () => {
                                 { 'qa': 'pending' },
                                 { 'healthy': true },
                                 { 'quality': 67 },
-                                { 'is_tested': { eval: '${{unit_test_step.status}} === success' } }
+                                { 'is_tested': { evaluate: '${{unit_test_step.status}} === success' } },
+                                'dangling'
                             ]
                         }
                     },