Move coalesce and validate (#2828)

Ref #2698

core/base-service/validate.js

@@ -2,7 +2,7 @@
 
 const emojic = require('emojic')
 const Joi = require('joi')
-const trace = require('../services/trace')
+const trace = require('../../services/trace')
 
 function validate(
   {

core/base-service/validate.spec.js

@@ -3,8 +3,8 @@
 const Joi = require('joi')
 const { expect } = require('chai')
 const sinon = require('sinon')
-const trace = require('../services/trace')
-const { InvalidParameter } = require('../services/errors')
+const trace = require('../../services/trace')
+const { InvalidParameter } = require('../../services/errors')
 const validate = require('./validate')
 
 describe('validate', function() {

lib/logos.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { toSvgColor } = require('../gh-badges/lib/color')
-const coalesce = require('./coalesce')
+const coalesce = require('../core/base-service/coalesce')
 const { svg2base64 } = require('./svg-helpers')
 
 const logos = require('./load-logos')()

services/base.js

@@ -11,8 +11,8 @@ const {
   InvalidParameter,
   Deprecated,
 } = require('./errors')
-const coalesce = require('../lib/coalesce')
-const validate = require('../lib/validate')
+const coalesce = require('../core/base-service/coalesce')
+const validate = require('../core/base-service/validate')
 const { checkErrorResponse } = require('../lib/error-helper')
 const { toArray } = require('../lib/badge-data')
 const { svg2base64 } = require('../lib/svg-helpers')

services/cache-headers.js

@@ -2,7 +2,7 @@
 
 const assert = require('assert')
 const Joi = require('joi')
-const coalesce = require('../lib/coalesce')
+const coalesce = require('../core/base-service/coalesce')
 
 const serverStartTimeGMTString = new Date().toGMTString()
 const serverStartTimestamp = Date.now()

services/dynamic-common.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const validate = require('../lib/validate')
+const validate = require('../core/base-service/validate')
 const { toArray } = require('../lib/badge-data')
 const { InvalidResponse } = require('./errors')