Remove hardcoding into registry, correct extends logic.

builders/varnish-nginx.js

@@ -1,13 +1,13 @@
 'use strict';
 
 const _ = require('lodash');
-const landoNginx = require('./../../node_modules/@lando/nginx/builders/nginx.js');
+const landoNginx = require('./../node_modules/@lando/nginx/builders/nginx.js');
 
 // Builder
 module.exports = {
   name: 'varnish-nginx',
-  parent: 'nginx',
-  builder: (parent, config) => class VarnishNginx extends landoNginx(parent, config) {
+  parent: '_service',
+  builder: (parent, config) => class VarnishNginx extends landoNginx.builder(parent, landoNginx.config) {
     constructor(id, options = {}) {
       super(id, options, {services: _.set({}, options.name)});
     };

builders/varnish.js

@@ -23,36 +23,6 @@ const varnishSsl = options => ({
   ],
 });
 
-// Add hardcoded varnishServices to lando.factory.registry.
-const addDependencies = options => {
-  const lando = _.get(options, '_app._lando');
-  // Traverse registry and remove any services that we have locally
-  const varnishServices = ['nginx'];
-  _.remove(lando.factory.registry, service => {
-    return _.includes(varnishServices, service.name);
-  });
-
-  // Make an array of absolute paths to the plugins we need to add
-  const varnishServicesPath = varnishServices.map(service => {
-    return path.join(__dirname, `../node_modules/@lando/${service}`);
-  });
-
-  // Loop that array and add each plugin to the registry and move scripts if the folder exists.
-  varnishServicesPath.forEach(servicePath => {
-    // Add the plugin to the registry
-    lando.factory.add(path.join(servicePath, 'builders', `${servicePath.split('/').pop()}.js`));
-
-    // Move the script to the conDir and make executable.
-    if (fs.existsSync(path.join(servicePath, 'scripts'))) {
-      const confDir = path.join(lando.config.userConfRoot, 'scripts');
-      const dest = lando.utils.moveConfig(path.join(servicePath, 'scripts'), confDir);
-      lando.utils.makeExecutable(fs.readdirSync(dest), dest);
-      lando.log.debug('automoved scripts from %s to %s and set to mode 755',
-        path.join(servicePath, 'scripts'), confDir);
-    }
-  });
-};
-
 // Builder
 module.exports = {
   name: 'varnish',
@@ -76,7 +46,6 @@ module.exports = {
   builder: (parent, config) => class LandoVarnish extends parent {
     constructor(id, options = {}, factory) {
       options = _.merge({}, config, options);
-      addDependencies(options);
 
       // Arrayify the backend
       if (!_.isArray(options.backends)) options.backends = [options.backends];