feat(ingress): create an Ingress if there is one in the .nodeshift directory (#244)

* feat: create an Ingress if there is one in the .nodeshift directory

There is no enrichment happening here, for the moment you need to create the full Ingress yaml.

fixes #238

Author: lholmquist

lib/apply-resources.js

@@ -22,6 +22,7 @@ const services = require('./services');
 const routes = require('./routes');
 const deploymentConfig = require('./deployment-config').deploy;
 const secrets = require('./secrets');
+const ingress = require('./ingress');
 
 module.exports = (config, resourceList) => {
   const mappedResources = resourceList.map((r) => {
@@ -34,6 +35,8 @@ module.exports = (config, resourceList) => {
         return deploymentConfig(config, r);
       case 'Secret':
         return secrets(config, r);
+      case 'Ingress':
+        return ingress(config, r);
       default:
         return Promise.resolve(r);
     }

lib/goals/undeploy.js

@@ -66,6 +66,9 @@ module.exports = async function (config) {
       case 'Secret':
         response.secret = await config.openshiftRestClient.secrets.remove(item.metadata.name, removeOptions);
         break;
+      case 'Ingress':
+        response.ingress = await config.openshiftRestClient.ingress.remove(item.metadata.name, removeOptions);
+        break;
       default:
         logger.error(`${item.kind} is not recognized`);
     }

lib/ingress.js

@@ -0,0 +1,34 @@
+/*
+ *
+ *  Copyright 2016-2017 Red Hat, Inc, and individual contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+'use strict';
+
+const log = require('./common-log')();
+
+module.exports = async function getIngress (config, ingressResource) {
+  // First check to see if we already have a route created
+  let ingress = await config.openshiftRestClient.ingress.find(ingressResource.metadata.name);
+  if (ingress.code === 404) {
+    // There isn't a ingress yet, so we need to create one
+    log.info(`creating new ingress ${ingressResource.metadata.name}`);
+    ingress = await config.openshiftRestClient.ingress.create(ingressResource);
+  } else {
+    log.info(`using existing ingress ${ingress.metadata.name}`);
+  }
+  return ingress;
+};

lib/resource-loader.js

@@ -34,7 +34,8 @@ const kindMappings = {
   svc: 'Service',
   service: 'Service',
   secret: 'Secret',
-  deployment: 'Deployment'
+  deployment: 'Deployment',
+  ingress: 'Ingress'
 };
 
 function loadYaml (fileLocation) {

test/apply-resources-test.js

@@ -20,6 +20,7 @@ test('apply resource test', (t) => {
     { kind: 'Route' },
     { kind: 'DeploymentConfig' },
     { kind: 'Secret' },
+    { kind: 'Ingress' },
     { kind: 'other' }
   ];
 
@@ -31,7 +32,8 @@ test('apply resource test', (t) => {
     './deployment-config': {
       deploy: mockedPromiseResolve
     },
-    './secrets': mockedPromiseResolve
+    './secrets': mockedPromiseResolve,
+    './ingress': mockedPromiseResolve
   });
   const ar = applyResources({}, resourceList).then(() => {
     t.end();

test/goals/undeploy-test.js

@@ -61,6 +61,10 @@ test('return list items', (t) => {
       {
         kind: 'DeploymentConfig',
         metadata: metadata
+      },
+      {
+        kind: 'Ingress',
+        metadata: metadata
       }
     ]
   };
@@ -80,6 +84,12 @@ test('return list items', (t) => {
           return Promise.resolve();
         }
       },
+      ingress: {
+        remove: (name) => {
+          t.equal(name, metadata.name, 'name should be equal');
+          return Promise.resolve();
+        }
+      },
       secrets: {
         remove: (name) => {
           t.equal(name, metadata.name, 'name should be equal');

test/ingress-test.js

@@ -0,0 +1,79 @@
+'use strict';
+
+const test = require('tape');
+
+test('test ingress, already created', (t) => {
+  const ingress = require('../lib/ingress');
+  const resource = {
+    apiVersion: 'v1',
+    kind: 'Service',
+    metadata: {
+      name: 'my route'
+    },
+    spec: {
+      host: '192.168.1.1'
+    }
+  };
+
+  const config = {
+    projectName: 'test-project',
+    context: {
+      namespace: 'namespace'
+    },
+    projectVersion: '1.0.0',
+    openshiftRestClient: {
+      ingress:
+      {
+        find: (name) => {
+          if (name !== resource.metadata.name) {
+            t.fail('name argument does not match the resource.metadata.name');
+          }
+          return { code: 200, metadata: { name: 'ingress' } };
+        }
+      }
+    }
+  };
+
+  const p = ingress(config, resource).then((service) => {
+    t.equal(service.code, 200, 'ingress response code should be 200');
+    t.end();
+  });
+
+  t.equal(p instanceof Promise, true, 'should return a Promise');
+});
+
+test('test ingress, not created', (t) => {
+  const ingress = require('../lib/ingress');
+  const resource = {
+    apiVersion: 'extensions/v1beta1',
+    kind: 'Ingress',
+    metadata: {
+      name: 'nodejs-istio-circuit-breaker-gateway'
+    }
+  };
+
+  const config = {
+    projectName: 'test-project',
+    context: {
+      namespace: 'namespace'
+    },
+    projectVersion: '1.0.0',
+    openshiftRestClient: {
+      ingress:
+      {
+        find: (name) => {
+          return { code: 404 };
+        },
+        create: ingress => ingress
+      }
+    }
+  };
+
+  const p = ingress(config, resource).then((ingress) => {
+    t.equal(ingress.kind, 'Ingress', 'is a Ingress Kind');
+    t.equal(ingress.metadata.name, 'nodejs-istio-circuit-breaker-gateway', 'metadata.name should be nodejs-istio-circuit-breaker-gateway');
+    t.end();
+  });
+
+  t.equal(p instanceof Promise, true, 'should return a Promise');
+});