feat(3068): pull latest config-parser and validator (#3100)

Author: klu909

package.json

@@ -102,7 +102,7 @@
     "screwdriver-build-bookend": "^4.0.0",
     "screwdriver-cache-bookend": "^3.0.0",
     "screwdriver-command-validator": "^3.0.0",
-    "screwdriver-config-parser": "^9.0.0",
+    "screwdriver-config-parser": "^10.0.0",
     "screwdriver-coverage-bookend": "^2.0.0",
     "screwdriver-coverage-sonar": "^4.1.1",
     "screwdriver-data-schema": "^23.2.0",
@@ -123,7 +123,7 @@
     "screwdriver-scm-github": "^12.6.0",
     "screwdriver-scm-gitlab": "^3.1.0",
     "screwdriver-scm-router": "^7.1.0",
-    "screwdriver-template-validator": "^7.0.0",
+    "screwdriver-template-validator": "^8.0.0",
     "screwdriver-workflow-parser": "^4.1.1",
     "sqlite3": "^5.1.4",
     "stream": "0.0.2",

plugins/validator.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const parser = require('screwdriver-config-parser');
+const parser = require('screwdriver-config-parser').parsePipelineYaml;
 const schema = require('screwdriver-data-schema');
 const validatorSchema = schema.api.validator;
 

test/plugins/data/pipeline-template-create.input.json

@@ -1,3 +1,3 @@
 {
-    "yaml": "{ \"namespace\": \"template_namespace\", \"name\": \"template_name\", \"version\": \"1.2\", \"description\": \"template description\", \"maintainer\": \"name@domain.org\", \"config\": { \"jobs\": { \"main\": { \"steps\": [ { \"init\": \"npm install\" }, { \"test\": \"npm test\" } ] } } } }"
+    "yaml": "{ \"namespace\": \"template_namespace\", \"name\": \"template_name\", \"version\": \"1.2\", \"description\": \"template description\", \"maintainer\": \"name@domain.org\", \"config\": { \"jobs\": { \"main\": { \"image\": \"node:20\", \"steps\": [ { \"init\": \"npm install\" }, { \"test\": \"npm test\" } ] } } } }"
   }

test/plugins/data/pipeline-template-validator.input.json

@@ -1,3 +1,3 @@
 {
-  "yaml": "{ \"namespace\": \"template_namespace\", \"name\": \"template_name\", \"version\": \"1.2.3\", \"description\": \"template description\", \"maintainer\": \"name@domain.org\", \"config\": { \"jobs\": { \"main\": { \"steps\": [ { \"init\": \"npm install\" }, { \"test\": \"npm test\" } ] } } } }"
+  "yaml": "{ \"namespace\": \"template_namespace\", \"name\": \"template_name\", \"version\": \"1.2.3\", \"description\": \"template description\", \"maintainer\": \"name@domain.org\", \"config\": { \"jobs\": { \"main\": { \"image\": \"node:20\", \"steps\": [ { \"init\": \"npm install\" }, { \"test\": \"npm test\" } ] } } } }"
 }

test/plugins/pipelines.templates.test.js

@@ -265,8 +265,17 @@ describe('pipeline plugin test', () => {
                 description: 'template description',
                 maintainer: 'name@domain.org',
                 config: {
-                    jobs: { main: { steps: [{ init: 'npm install' }, { test: 'npm test' }] } },
-                    shared: {},
+                    jobs: {
+                        main: {
+                            steps: [{ init: 'npm install' }, { test: 'npm test' }],
+                            annotations: {},
+                            environment: {},
+                            settings: {},
+                            image: 'node:20',
+                            secrets: [],
+                            sourcePaths: []
+                        }
+                    },
                     parameters: {}
                 },
                 pipelineId: 123
@@ -389,8 +398,17 @@ describe('pipeline plugin test', () => {
                             description: 'template description',
                             maintainer: 'name@domain.org',
                             config: {
-                                jobs: { main: { steps: [{ init: 'npm install' }, { test: 'npm test' }] } },
-                                shared: {},
+                                jobs: {
+                                    main: {
+                                        steps: [{ init: 'npm install' }, { test: 'npm test' }],
+                                        annotations: {},
+                                        environment: {},
+                                        settings: {},
+                                        image: 'node:20',
+                                        secrets: [],
+                                        sourcePaths: []
+                                    }
+                                },
                                 parameters: {}
                             }
                         }

test/plugins/trigger.test.helper.js

@@ -2,7 +2,7 @@
 
 /* eslint max-classes-per-file: off */
 
-const configParser = require('screwdriver-config-parser');
+const configParser = require('screwdriver-config-parser').parsePipelineYaml;
 const fs = require('fs');
 const { Server } = require('@hapi/hapi');
 const sinon = require('sinon');