generator-jhipster 7.1.0 → 7.4.0

package/generators/openshift/files.js

@@ -16,6 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
+const databaseTypes = require('../../jdl/jhipster/database-types');
+const { PROMETHEUS } = require('../../jdl/jhipster/monitoring-types');
+const { CONSUL, EUREKA } = require('../../jdl/jhipster/service-discovery-types');
+
+const NO_DATABASE = databaseTypes.NO;
+
 module.exports = {
   writeFiles,
 };
@@ -28,13 +35,13 @@ function writeFiles() {
         this.app = this.appConfigs[i];
         this.template('deployment.yml.ejs', `${this.directoryPath}/ocp/${appName}/${appName}-deployment.yml`);
 
-        if (this.app.prodDatabaseType !== 'no') {
+        if (this.app.prodDatabaseType !== NO_DATABASE) {
           this.template(
             `db/${this.app.prodDatabaseType}.yml.ejs`,
             `${this.directoryPath}/ocp/${appName}/${appName}-${this.app.prodDatabaseType}.yml`
           );
         }
-        if (this.app.searchEngine === 'elasticsearch') {
+        if (this.app.searchEngine === ELASTICSEARCH) {
           this.template('db/elasticsearch.yml.ejs', `${this.directoryPath}/ocp/${appName}/${appName}-elasticsearch.yml`);
         }
       }
@@ -47,17 +54,17 @@ function writeFiles() {
 
     writeRegistryFiles() {
       this.template('scc/scc-config.yml.ejs', `${this.directoryPath}/ocp/registry/scc-config.yml`);
-      if (this.serviceDiscoveryType === 'eureka') {
+      if (this.serviceDiscoveryType === EUREKA) {
         this.template('registry/jhipster-registry.yml.ejs', `${this.directoryPath}/ocp/registry/jhipster-registry.yml`);
         this.template('registry/application-configmap.yml.ejs', `${this.directoryPath}/ocp/registry/application-configmap.yml`);
-      } else if (this.serviceDiscoveryType === 'consul') {
+      } else if (this.serviceDiscoveryType === CONSUL) {
         this.template('registry/consul.yml.ejs', `${this.directoryPath}/ocp/registry/consul.yml`);
         this.template('registry/application-configmap.yml.ejs', `${this.directoryPath}/ocp/registry/application-configmap.yml`);
       }
     },
 
     writePrometheusFiles() {
-      if (this.monitoring !== 'prometheus') return;
+      if (this.monitoring !== PROMETHEUS) return;
 
       const appsToMonitor = [];
       for (let i = 0; i < this.appConfigs.length; i++) {

package/generators/openshift/generator.spec.mjs

@@ -0,0 +1,44 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * 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
+ *
+ *      https://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.
+ */
+import expect from 'expect';
+import lodash from 'lodash';
+import { basename, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import Generator from './index.js';
+
+const { snakeCase } = lodash;
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = basename(__dirname);
+
+describe(`JHipster ${generator} generator`, () => {
+  it('generator-list constant matches folder name', async () => {
+    await expect((await import('../generator-list.js')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
+  });
+  it('should be exported at package.json', async () => {
+    await expect((await import(`generator-jhipster/esm/generators/${generator}`)).default).toBe(Generator);
+  });
+  it('should support features parameter', () => {
+    const instance = new Generator([], { help: true }, { bar: true });
+    expect(instance.features.bar).toBe(true);
+  });
+});

package/generators/openshift/index.js

@@ -19,14 +19,34 @@
 const chalk = require('chalk');
 const shelljs = require('shelljs');
 const prompts = require('./prompts');
+const { GENERATOR_OPENSHIFT } = require('../generator-list');
+const { KAFKA } = require('../../jdl/jhipster/message-broker-types');
+const { PROMETHEUS } = require('../../jdl/jhipster/monitoring-types');
+const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
+const { GATEWAY, MONOLITH } = require('../../jdl/jhipster/application-types');
+const { EUREKA } = require('../../jdl/jhipster/service-discovery-types');
+const serviceDiscoveryTypes = require('../../jdl/jhipster/service-discovery-types');
+const { StorageTypes } = require('../../jdl/jhipster/openshift-platform-types');
+const databaseTypes = require('../../jdl/jhipster/database-types');
 const writeFiles = require('./files').writeFiles;
 const BaseDockerGenerator = require('../generator-base-docker');
 const { loadFromYoRc, checkImages, generateJwtSecret, configureImageNames, setAppsFolderPaths } = require('../docker-base');
 const { setupKubernetesConstants } = require('../kubernetes-base');
 const statistics = require('../statistics');
 
+const NO_DATABASE = databaseTypes.NO;
+const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
+const { EPHEMERAL, PERSISTENT } = StorageTypes;
+
+/* eslint-disable consistent-return */
 module.exports = class extends BaseDockerGenerator {
-  get initializing() {
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_OPENSHIFT);
+    }
+  }
+
+  _initializing() {
     return {
       sayHello() {
         this.log(chalk.white(`${chalk.bold('⭕')} [*BETA*] Welcome to the JHipster OpenShift Generator ${chalk.bold('⭕')}`));
@@ -39,7 +59,7 @@ module.exports = class extends BaseDockerGenerator {
         );
       },
 
-      ...super.initializing,
+      ...super._initializing(),
 
       checkOpenShift() {
         if (this.skipChecks) return;
@@ -68,7 +88,12 @@ module.exports = class extends BaseDockerGenerator {
     };
   }
 
-  get prompting() {
+  get initializing() {
+    if (this.delegateToBlueprint) return {};
+    return this._initializing();
+  }
+
+  _prompting() {
     return {
       askForApplicationType: prompts.askForApplicationType,
       askForPath: prompts.askForPath,
@@ -83,10 +108,15 @@ module.exports = class extends BaseDockerGenerator {
     };
   }
 
-  get configuring() {
+  get prompting() {
+    if (this.delegateToBlueprint) return {};
+    return this._prompting();
+  }
+
+  _configuring() {
     return {
       insight() {
-        statistics.sendSubGenEvent('generator', 'openshift');
+        statistics.sendSubGenEvent('generator', GENERATOR_OPENSHIFT);
       },
 
       checkImages,
@@ -101,7 +131,7 @@ module.exports = class extends BaseDockerGenerator {
 
       setPostPromptProp() {
         this.appConfigs.some(element => {
-          if (element.messageBroker === 'kafka') {
+          if (element.messageBroker === KAFKA) {
             this.useKafka = true;
             return true;
           }
@@ -127,73 +157,115 @@ module.exports = class extends BaseDockerGenerator {
     };
   }
 
-  get writing() {
-    return writeFiles();
+  get configuring() {
+    if (this.delegateToBlueprint) return {};
+    return this._configuring();
   }
 
-  end() {
-    if (this.hasWarning) {
-      this.log(`\n${chalk.yellow.bold('WARNING!')} OpenShift configuration generated, but no Jib cache found`);
-      this.log('If you forgot to generate the Docker image for this application, please run:');
-      this.log(this.warningMessage);
-    } else {
-      this.log(`\n${chalk.bold.green('OpenShift configuration successfully generated!')}`);
-    }
+  _loading() {
+    return {
+      loadSharedConfig() {
+        this.appConfigs.forEach(element => {
+          this.loadServerConfig(element, element);
+          this.loadDerivedAppConfig(element);
+        });
+        this.loadDeploymentConfig(this);
+        this._loadDerivedOpenshiftConfig(this);
+      },
+    };
+  }
 
-    this.log(
-      `${chalk.yellow.bold(
-        'WARNING!'
-      )} You will need to push your image to a registry. If you have not done so, use the following commands to tag and push the images:`
-    );
-    for (let i = 0; i < this.appsFolders.length; i++) {
-      const originalImageName = this.appConfigs[i].baseName.toLowerCase();
-      const targetImageName = this.appConfigs[i].targetImageName;
-      if (originalImageName !== targetImageName) {
-        this.log(`  ${chalk.cyan(`docker image tag ${originalImageName} ${targetImageName}`)}`);
-      }
-      this.log(`  ${chalk.cyan(`${this.dockerPushCommand} ${targetImageName}`)}`);
-    }
+  get loading() {
+    if (this.delegateToBlueprint) return {};
+    return this._loading();
+  }
 
-    this.log('\nYou can deploy all your apps by running: ');
-    this.log(`  ${chalk.cyan(`${this.directoryPath}ocp/ocp-apply.sh`)}`);
-    this.log('OR');
-    this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/registry/scc-config.yml | oc apply -f -`)}`);
-    if (this.monitoring === 'prometheus') {
-      this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/monitoring/jhipster-metrics.yml | oc apply -f -`)}`);
-    }
-    if (this.useKafka === true) {
-      this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/messagebroker/kafka.yml | oc apply -f -`)}`);
-    }
-    for (let i = 0, regIndex = 0; i < this.appsFolders.length; i++) {
-      const app = this.appConfigs[i];
-      const appName = app.baseName.toLowerCase();
-      if (app.searchEngine === 'elasticsearch') {
-        this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/${appName}/${appName}-elasticsearch.yml | oc apply -f -`)}`);
-      }
-      if (app.serviceDiscoveryType !== false && regIndex++ === 0) {
-        this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/registry/application-configmap.yml | oc apply -f -`)}`);
-        if (app.serviceDiscoveryType === 'eureka') {
-          this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/registry/jhipster-registry.yml | oc apply -f -`)}`);
+  _writing() {
+    return writeFiles();
+  }
+
+  get writing() {
+    if (this.delegateToBlueprint) return {};
+    return this._writing();
+  }
+
+  _end() {
+    return {
+      displayOpenshiftDeploymentProcedure() {
+        if (this.hasWarning) {
+          this.log(`\n${chalk.yellow.bold('WARNING!')} OpenShift configuration generated, but no Jib cache found`);
+          this.log('If you forgot to generate the Docker image for this application, please run:');
+          this.log(this.warningMessage);
         } else {
-          this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/registry/consul.yml | oc apply -f -`)}`);
+          this.log(`\n${chalk.bold.green('OpenShift configuration successfully generated!')}`);
         }
-      }
-      if (app.prodDatabaseType !== 'no') {
+
         this.log(
-          `  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/${appName}/${appName}-${app.prodDatabaseType}.yml | oc apply -f -`)}`
+          `${chalk.yellow.bold(
+            'WARNING!'
+          )} You will need to push your image to a registry. If you have not done so, use the following commands to tag and push the images:`
         );
-      }
-      this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/${appName}/${appName}-deployment.yml | oc apply -f -`)}`);
-    }
+        for (let i = 0; i < this.appsFolders.length; i++) {
+          const originalImageName = this.appConfigs[i].baseName.toLowerCase();
+          const targetImageName = this.appConfigs[i].targetImageName;
+          if (originalImageName !== targetImageName) {
+            this.log(`  ${chalk.cyan(`docker image tag ${originalImageName} ${targetImageName}`)}`);
+          }
+          this.log(`  ${chalk.cyan(`${this.dockerPushCommand} ${targetImageName}`)}`);
+        }
 
-    if (this.gatewayNb + this.monolithicNb >= 1) {
-      this.log("\nUse these commands to find your application's IP addresses:");
-      for (let i = 0; i < this.appsFolders.length; i++) {
-        if (this.appConfigs[i].applicationType === 'gateway' || this.appConfigs[i].applicationType === 'monolith') {
-          this.log(`  ${chalk.cyan(`oc get svc ${this.appConfigs[i].baseName}`)}`);
+        this.log('\nYou can deploy all your apps by running: ');
+        this.log(`  ${chalk.cyan(`${this.directoryPath}ocp/ocp-apply.sh`)}`);
+        this.log('OR');
+        this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/registry/scc-config.yml | oc apply -f -`)}`);
+        if (this.monitoring === PROMETHEUS) {
+          this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/monitoring/jhipster-metrics.yml | oc apply -f -`)}`);
         }
-      }
-      this.log();
-    }
+        if (this.useKafka) {
+          this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/messagebroker/kafka.yml | oc apply -f -`)}`);
+        }
+        for (let i = 0, regIndex = 0; i < this.appsFolders.length; i++) {
+          const app = this.appConfigs[i];
+          const appName = app.baseName.toLowerCase();
+          if (app.searchEngine === ELASTICSEARCH) {
+            this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/${appName}/${appName}-elasticsearch.yml | oc apply -f -`)}`);
+          }
+          if (app.serviceDiscoveryType !== NO_SERVICE_DISCOVERY && regIndex++ === 0) {
+            this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/registry/application-configmap.yml | oc apply -f -`)}`);
+            if (app.serviceDiscoveryType === EUREKA) {
+              this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/registry/jhipster-registry.yml | oc apply -f -`)}`);
+            } else {
+              this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/registry/consul.yml | oc apply -f -`)}`);
+            }
+          }
+          if (app.prodDatabaseType !== NO_DATABASE) {
+            this.log(
+              `  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/${appName}/${appName}-${app.prodDatabaseType}.yml | oc apply -f -`)}`
+            );
+          }
+          this.log(`  ${chalk.cyan(`oc process -f ${this.directoryPath}ocp/${appName}/${appName}-deployment.yml | oc apply -f -`)}`);
+        }
+
+        if (this.gatewayNb + this.monolithicNb >= 1) {
+          this.log("\nUse these commands to find your application's IP addresses:");
+          for (let i = 0; i < this.appsFolders.length; i++) {
+            if (this.appConfigs[i].applicationType === GATEWAY || this.appConfigs[i].applicationType === MONOLITH) {
+              this.log(`  ${chalk.cyan(`oc get svc ${this.appConfigs[i].baseName}`)}`);
+            }
+          }
+          this.log();
+        }
+      },
+    };
+  }
+
+  end() {
+    if (this.delegateToBlueprint) return {};
+    return this._end();
+  }
+
+  _loadDerivedOpenshiftConfig(dest = this) {
+    dest.storageTypeEphemeral = dest.storageType === EPHEMERAL;
+    dest.storageTypePersistent = dest.storageType === PERSISTENT;
   }
 };

package/generators/openshift/prompts.js

@@ -17,6 +17,14 @@
  * limitations under the License.
  */
 const dockerPrompts = require('../docker-prompts');
+const databaseTypes = require('../../jdl/jhipster/database-types');
+const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
+const { PROMETHEUS } = require('../../jdl/jhipster/monitoring-types');
+const { StorageTypes } = require('../../jdl/jhipster/openshift-platform-types');
+
+const { EPHEMERAL, PERSISTENT } = StorageTypes;
+
+const NO_DATABASE = databaseTypes.NO;
 
 module.exports = {
   askForOpenShiftNamespace,
@@ -45,7 +53,7 @@ async function askForStorageType() {
 
   let storageEnabled = false;
   this.appConfigs.some((appConfig, index) => {
-    if (appConfig.prodDatabaseType !== 'no' || appConfig.searchEngine === 'elasticsearch' || appConfig.monitoring === 'prometheus') {
+    if (appConfig.prodDatabaseType !== NO_DATABASE || appConfig.searchEngine === ELASTICSEARCH || appConfig.monitoring === PROMETHEUS) {
       storageEnabled = true;
       return storageEnabled;
     }
@@ -64,15 +72,15 @@ async function askForStorageType() {
       message: 'Which *type* of database storage would you like to use?',
       choices: [
         {
-          value: 'persistent',
+          value: PERSISTENT,
           name: 'Persistent Storage',
         },
         {
-          value: 'ephemeral',
+          value: EPHEMERAL,
           name: 'Ephemeral Storage',
         },
       ],
-      default: 'ephemeral',
+      default: EPHEMERAL,
     },
   ];
 

package/generators/openshift/templates/apply.sh.ejs

@@ -21,22 +21,22 @@
 # in proper order. 'oc process' processes the template as resources which is again piped to
 # 'oc apply' to create those resources in OpenShift namespace
 oc process -f <%- directoryPath %>ocp/registry/scc-config.yml | oc apply -f -
-<%_ if (serviceDiscoveryType === 'eureka') { _%>
+<%_ if (serviceDiscoveryEureka) { _%>
 oc process -f <%- directoryPath %>ocp/registry/application-configmap.yml | oc apply -f -
 oc process -f <%- directoryPath %>ocp/registry/jhipster-registry.yml | oc apply -f -
-<%_ } _%> <%_ if (serviceDiscoveryType === 'consul') {  _%>
+<%_ } _%> <%_ if (serviceDiscoveryConsul) {  _%>
 oc process -f <%- directoryPath %>ocp/registry/application-configmap.yml | oc apply -f -
 oc process -f <%- directoryPath %>ocp/registry/consul.yml | oc apply -f -
-<%_ } _%> <%_ if (useKafka === true) { _%>
+<%_ } _%> <%_ if (useKafka) { _%>
 oc process -f <%- directoryPath %>ocp/messagebroker/kafka.yml | oc apply -f -
-<%_ } _%> <%_ if (monitoring === 'prometheus') { _%>
+<%_ } _%> <%_ if (monitoringPrometheus) { _%>
 oc process -f <%- directoryPath %>ocp/monitoring/jhipster-metrics.yml | oc apply -f -
 <%_ } _%> <%_ for (var i = 0; i < appConfigs.length; i++) {
 const appName = appConfigs[i].baseName.toLowerCase();
 app = appConfigs[i];
-if (app.prodDatabaseType !== 'no') { _%>
+if (!app.databaseTypeNo) { _%>
 oc process -f <%- directoryPath %>ocp/<%- appName %>/<%- appName %>-<%- app.prodDatabaseType %>.yml | oc apply -f -
-<%_ } _%> <%_ if (app.searchEngine === 'elasticsearch') { _%>
+<%_ } _%> <%_ if (app.searchEngineElasticsearch) { _%>
 oc process -f <%- directoryPath %>ocp/<%- appName %>/<%- appName %>-elasticsearch.yml | oc apply -f -
 <%_ } _%>
 oc process -f <%- directoryPath %>ocp/<%- appName %>/<%- appName %>-deployment.yml | oc apply -f -

package/generators/openshift/templates/db/cassandra.yml.ejs

@@ -31,13 +31,12 @@ metadata:
   namespace: <%= openshiftNamespace %>
   annotations:
     description: This template defines objects that are required to spin up a cassandra pod
-    tags: db, <%= app.baseName.toLowerCase() %>-cassandra<% if (storageType === 'persistent') { %> ,persistent <% } %> <% if (storageType === 'ephemeral') { %> ,ephemeral <% } %>
+    tags: db, <%= app.baseName.toLowerCase() %>-cassandra<% if (storageTypePersistent) { %> ,persistent <% } %> <% if (storageTypeEphemeral) { %> ,ephemeral <% } %>
     openshift.io/display-name: <%= app.baseName.toLowerCase() %>-cassandra-template
     openshift.io/long-description: >-
-        This template provides objects that are required to spin up a cassandra pod.<% if (storageType ==
-        'persistent') { %>The database is stored on persistent storage, so any restart of the service will not cause any impact to the data.
+        This template provides objects that are required to spin up a cassandra pod.<% if (storageTypePersistent) { %>The database is stored on persistent storage, so any restart of the service will not cause any impact to the data.
         Please make sure you have provisioned PVs (Persistent Volumes) before using this template. <% } %>
-        <% if (storageType === 'ephemeral') { %>The database is not stored on persistent storage, so any restart of the service will result in all data being lost.<% } %>
+        <% if (storageTypeEphemeral) { %>The database is not stored on persistent storage, so any restart of the service will result in all data being lost.<% } %>
     openshift.io/provider-display-name: JHipster-OpenShift
 labels:
   app: <%= app.baseName.toLowerCase() %>-cassandra
@@ -62,7 +61,7 @@ parameters:
     required: true
     displayName: "*** PLEASE DO NOT CHANGE THIS ***"
 objects:
-<%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
   -
     apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
     kind: PersistentVolumeClaim
@@ -120,13 +119,13 @@ objects:
         spec:
           volumes:
           - name: ${APPLICATION_NAME}-data
-            <%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
             persistentVolumeClaim:
               claimName: ${APPLICATION_NAME}
-            <%_ } _%>
-            <%_ if (storageType === 'ephemeral') { _%>
+<%_ } _%>
+<%_ if (storageTypeEphemeral) { _%>
             emptyDir: {}
-            <%_ } _%>
+<%_ } _%>
           containers:
           - name: ${APPLICATION_NAME}
             image: <%= DOCKER_CASSANDRA %>

package/generators/openshift/templates/db/couchbase.yml.ejs

@@ -32,13 +32,12 @@ metadata:
   namespace: <%= openshiftNamespace %>
   annotations:
     description: This template defines objects that are required to spin up a couchbase pod
-    tags: db, <%= app.baseName.toLowerCase() %>-couchbase<% if (storageType === 'persistent') { %> ,persistent <% } %> <% if (storageType === 'ephemeral') { %> ,ephemeral <% } %>
+    tags: db, <%= app.baseName.toLowerCase() %>-couchbase<% if (storageTypePersistent) { %> ,persistent <% } %> <% if (storageTypeEphemeral) { %> ,ephemeral <% } %>
     openshift.io/display-name: <%= app.baseName.toLowerCase() %>-couchbase-template
     openshift.io/long-description: >-
-        This template provides objects that are required to spin up a couchbase pod.<% if (storageType ==
-        'persistent') { %>The database is stored on persistent storage, so any restart of the service will not cause any impact to the data.
+        This template provides objects that are required to spin up a couchbase pod.<% if (storageTypePersistent) { %>The database is stored on persistent storage, so any restart of the service will not cause any impact to the data.
         Please make sure you have provisioned PVs (Persistent Volumes) before using this template. <% } %>
-        <% if (storageType === 'ephemeral') { %>The database is not stored on persistent storage, so any restart of the service will result in all data being lost.<% } %>
+        <% if (storageTypeEphemeral) { %>The database is not stored on persistent storage, so any restart of the service will result in all data being lost.<% } %>
     openshift.io/provider-display-name: JHipster-OpenShift
 labels:
   app: <%= app.baseName.toLowerCase() %>-couchbase
@@ -91,7 +90,7 @@ objects:
     stringData:
       database-admin-user: "${COUCHBASE_ADMIN_USER}"
       database-admin-password: "${COUCHBASE_ADMIN_PASSWORD}"
-<%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
   -
     apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
     kind: PersistentVolumeClaim
@@ -168,13 +167,13 @@ objects:
         spec:
           volumes:
           - name: ${APPLICATION_NAME}-data
-            <%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
             persistentVolumeClaim:
               claimName: ${APPLICATION_NAME}
-            <%_ } _%>
-            <%_ if (storageType === 'ephemeral') { _%>
+<%_ } _%>
+<%_ if (storageTypeEphemeral) { _%>
             emptyDir: {}
-            <%_ } _%>
+<%_ } _%>
           containers:
           - name: ${APPLICATION_NAME}
             image: <%= DOCKER_COUCHBASE %>

package/generators/openshift/templates/db/elasticsearch.yml.ejs

@@ -29,13 +29,12 @@ metadata:
   namespace: <%= openshiftNamespace %>
   annotations:
     description: This template defines objects that are required to spin up an elasticsearch pod
-    tags: elasticsearch, <%= app.baseName.toLowerCase() %>-elasticsearch<% if (storageType === 'persistent') { %> ,persistent <% } %> <% if (storageType === 'ephemeral') { %> ,ephemeral <% } %>
+    tags: elasticsearch, <%= app.baseName.toLowerCase() %>-elasticsearch<% if (storageTypePersistent) { %> ,persistent <% } %> <% if (storageTypeEphemeral) { %> ,ephemeral <% } %>
     openshift.io/display-name: <%= app.baseName.toLowerCase() %>-elasticsearch-template
     openshift.io/long-description:  >-
-        This template provides objects that are required to spin up an elasticsearch pod.<% if (storageType ==
-        'persistent') { %>The database is stored on persistent storage, so any restart of the service will not cause any impact to the data.
+        This template provides objects that are required to spin up an elasticsearch pod.<% if (storageTypePersistent) { %>The database is stored on persistent storage, so any restart of the service will not cause any impact to the data.
         Please make sure you have provisioned PVs (Persistent Volumes) before using this template. <% } %>
-        <% if (storageType === 'ephemeral') { %>The database is not stored on persistent storage, so any restart of the service will result in all data being lost.<% } %>
+        <% if (storageTypeEphemeral) { %>The database is not stored on persistent storage, so any restart of the service will result in all data being lost.<% } %>
     openshift.io/provider-display-name: JHipster-OpenShift
 labels:
   app: <%= app.baseName.toLowerCase() %>-elasticsearch
@@ -54,7 +53,7 @@ parameters:
     value: 1Gi
     required: true
 objects:
-<%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
   -
     apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
     kind: PersistentVolumeClaim
@@ -98,13 +97,13 @@ objects:
         spec:
           volumes:
           - name: ${APPLICATION_NAME}-data
-            <%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
             persistentVolumeClaim:
               claimName: ${APPLICATION_NAME}
-            <%_ } _%>
-            <%_ if (storageType === 'ephemeral') { _%>
+<%_ } _%>
+<%_ if (storageTypeEphemeral) { _%>
             emptyDir: {}
-            <%_ } _%>
+<%_ } _%>
           containers:
           - name: ${APPLICATION_NAME}
             image: <%= DOCKER_ELASTICSEARCH %>

package/generators/openshift/templates/db/mariadb.yml.ejs

@@ -29,13 +29,12 @@ metadata:
   namespace: <%= openshiftNamespace %>
   annotations:
     description: This template defines objects that are required to spin up a mariadb pod
-    tags: db, <%= app.baseName.toLowerCase() %>-mariadb<% if (storageType === 'persistent') { %> ,persistent <% } %> <% if (storageType === 'ephemeral') { %> ,ephemeral <% } %>
+    tags: db, <%= app.baseName.toLowerCase() %>-mariadb<% if (storageTypePersistent) { %> ,persistent <% } %> <% if (storageTypeEphemeral) { %> ,ephemeral <% } %>
     openshift.io/display-name: <%= app.baseName.toLowerCase() %>-mariadb-template
     openshift.io/long-description: >-
-        This template provides objects that are required to spin up a mariadb pod.<% if (storageType ==
-        'persistent') { %>The database is stored on persistent storage, so any restart of the service will not cause any impact to the data.
+        This template provides objects that are required to spin up a mariadb pod.<% if (storageTypePersistent) { %>The database is stored on persistent storage, so any restart of the service will not cause any impact to the data.
         Please make sure you have provisioned PVs (Persistent Volumes) before using this template. <% } %>
-        <% if (storageType === 'ephemeral') { %>The database is not stored on persistent storage, so any restart of the service will result in all data being lost.<% } %>
+        <% if (storageTypeEphemeral) { %>The database is not stored on persistent storage, so any restart of the service will result in all data being lost.<% } %>
     openshift.io/provider-display-name: JHipster-OpenShift
 labels:
   app: <%= app.baseName.toLowerCase() %>-mariadb
@@ -96,7 +95,7 @@ objects:
       database-user: "${MYSQL_USER}"
       database-password: "${MYSQL_PASSWORD}"
       database-root-password: "${MYSQL_ROOT_PASSWORD}"
-<%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
   -
     apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
     kind: PersistentVolumeClaim
@@ -140,13 +139,13 @@ objects:
         spec:
           volumes:
           - name: ${APPLICATION_NAME}-data
-            <%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
             persistentVolumeClaim:
               claimName: ${APPLICATION_NAME}
-            <%_ } _%>
-            <%_ if (storageType === 'ephemeral') { _%>
+<%_ } _%>
+<%_ if (storageTypeEphemeral) { _%>
             emptyDir: {}
-            <%_ } _%>
+<%_ } _%>
           containers:
           - name: ${APPLICATION_NAME}
             image: <%= DOCKER_MARIADB %>