generator-jhipster 7.1.0 → 7.4.0

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

@@ -31,13 +31,12 @@ metadata:
   namespace: <%= openshiftNamespace %>
   annotations:
     description: This template defines objects that are required to spin up a mongodb pod
-    tags: db, <%= app.baseName.toLowerCase() %>-mongodb<% if (storageType === 'persistent') { %> ,persistent <% } %> <% if (storageType === 'ephemeral') { %> ,ephemeral <% } %>
+    tags: db, <%= app.baseName.toLowerCase() %>-mongodb<% if (storageTypePersistent) { %> ,persistent <% } %> <% if (storageTypeEphemeral) { %> ,ephemeral <% } %>
     openshift.io/display-name: <%= app.baseName.toLowerCase() %>-mongodb-template
     openshift.io/long-description: >-
-        This template provides objects that are required to spin up a mongodb 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 mongodb 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() %>-mongodb
@@ -98,7 +97,7 @@ objects:
       database-user: "${MONGODB_USER}"
       database-password: "${MONGODB_PASSWORD}"
       database-admin-password: "${MONGODB_ADMIN_PASSWORD}"
-<%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
   -
     apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
     kind: PersistentVolumeClaim
@@ -150,13 +149,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_MONGODB %>

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

@@ -29,13 +29,12 @@ metadata:
   namespace: <%= openshiftNamespace %>
   annotations:
     description: This template defines objects that are required to spin up a mysqldb pod
-    tags: db, <%= app.baseName.toLowerCase() %>-mysqldb<% if (storageType === 'persistent') { %> ,persistent <% } %> <% if (storageType === 'ephemeral') { %> ,ephemeral <% } %>
+    tags: db, <%= app.baseName.toLowerCase() %>-mysqldb<% if (storageTypePersistent) { %> ,persistent <% } %> <% if (storageTypeEphemeral) { %> ,ephemeral <% } %>
     openshift.io/display-name: <%= app.baseName.toLowerCase() %>-mysqldb-template
     openshift.io/long-description: >-
-        This template provides objects that are required to spin up a mysqldb 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 mysqldb 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() %>-mysqldb
@@ -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_MYSQL %>

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

@@ -29,13 +29,12 @@ metadata:
   namespace: <%= openshiftNamespace %>
   annotations:
     description: This template defines objects that are required to spin up a postgresqldb pod
-    tags: db, <%= app.baseName.toLowerCase() %>-postgresqldb<% if (storageType === 'persistent') { %> ,persistent <% } %> <% if (storageType === 'ephemeral') { %> ,ephemeral <% } %>
+    tags: db, <%= app.baseName.toLowerCase() %>-postgresqldb<% if (storageTypePersistent) { %> ,persistent <% } %> <% if (storageTypeEphemeral) { %> ,ephemeral <% } %>
     openshift.io/display-name: <%= app.baseName.toLowerCase() %>-postgresqldb-template
     openshift.io/long-description: >-
-        This template provides objects that are required to spin up a postgresqldb 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 postgresqldb 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() %>-postgresqldb
@@ -93,7 +92,7 @@ objects:
     stringData:
       database-user: "${POSTGRESQL_USER}"
       database-password: "${POSTGRESQL_PASSWORD}"
-<%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
   -
     apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
     kind: PersistentVolumeClaim
@@ -137,13 +136,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_POSTGRESQL %>

package/generators/openshift/templates/deployment.yml.ejs

@@ -94,24 +94,24 @@ objects:
               - |
                   while true
                   do
-                  <%_ if (app.prodDatabaseType === 'mysql') { _%>
+<%_ if (app.prodDatabaseTypeMysql) { _%>
                     rt=$(nc -z -w 1 ${APPLICATION_NAME}-mysqldb 80)
-                  <%_ } _%>
-                  <%_ if (app.prodDatabaseType === 'mariadb') { _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeMariadb) { _%>
                     rt=$(nc -z -w 1 ${APPLICATION_NAME}-mariadb 80)
-                  <%_ } _%>
-                  <%_ if (app.prodDatabaseType === 'postgresql') { _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypePostgres) { _%>
                     rt=$(nc -z -w 1 ${APPLICATION_NAME}-postgresqldb 80)
-                  <%_ } _%>
-                  <%_ if (app.prodDatabaseType === 'mongodb') { _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeMongodb) { _%>
                     rt=$(nc -z -w 1 ${APPLICATION_NAME}-mongodb 80)
-                  <%_ } _%>
-                  <%_ if (app.prodDatabaseType === 'cassandra') { _%>
+<%_ } _%>
+<%_ if (app.databaseTypeCassandra) { _%>
                     rt=$(nc -z -w 1 ${APPLICATION_NAME}-cassandra 9042)
-                  <%_ } _%>
-                  <%_ if (app.prodDatabaseType === 'couchbase') { _%>
+<%_ } _%>
+<%_ if (app.databaseTypeCouchbase) { _%>
                     rt=$(nc -z -w 1 ${APPLICATION_NAME}-couchbase 8091)
-                  <%_ } _%>
+<%_ } _%>
                     if [ $? -eq 0 ]; then
                       echo "DB is UP"
                       break
@@ -126,11 +126,11 @@ objects:
             env:
             - name: SPRING_PROFILES_ACTIVE
               value: prod,api-docs
-            <%_ if (!app.serviceDiscoveryType ) { _%>
+<%_ if (!serviceDiscoveryType) { _%>
             - name: JHIPSTER_SECURITY_AUTHENTICATION_JWT_BASE64_SECRET
               value: YlhrdGMyVmpjbVYwTFhSdmEyVnVMWFJ2TFdOb1lXNW5aUzFwYmkxd2NtOWtkV04wYVc5dUxXRnVaQzEwYnkxclpXVndMV2x1TFdFdGMyVmpkWEpsTFhCc1lXTmwK
-            <%_ } _%>
-            <%_ if (app.serviceDiscoveryType === 'eureka') { _%>
+<%_ } _%>
+<%_ if (serviceDiscoveryEureka) { _%>
             - name: SPRING_CLOUD_CONFIG_URI
               value: http://admin:${jhipster.registry.password}@jhipster-registry:8761/config
             - name: EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE
@@ -140,22 +140,22 @@ objects:
                 secretKeyRef:
                   name: ${REG_SECRET_REF}
                   key: registry-admin-password
-            <%_ } _%>
-            <%_ if (app.serviceDiscoveryType === 'consul') { _%>
+<%_ } _%>
+<%_ if (serviceDiscoveryConsul) { _%>
             - name: SPRING_CLOUD_CONSUL_HOST
               value: ${APPLICATION_NAME}-consul
             - name: SPRING_CLOUD_CONSUL_PORT
               value: 8500
-            <%_ } _%>
-            <%_ if (['mysql', 'mariadb', 'postgresql'].includes(app.prodDatabaseType)) { _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeMysql || app.prodDatabaseTypeMariadb || app.prodDatabaseTypePostgres) { _%>
             - name: SPRING_DATASOURCE_URL
-              <%_ if (app.prodDatabaseType === 'mysql') { _%>
+  <%_ if (app.prodDatabaseTypeMysql) { _%>
               value: <%- getJDBCUrl(app.prodDatabaseType, { hostname: '${APPLICATION_NAME}'+`-${app.prodDatabaseType}db`, databaseName: app.baseName.toLowerCase() }) %>
-              <%_ } else if (app.prodDatabaseType === 'mariadb') { _%>
+  <%_ } else if (app.prodDatabaseTypeMariadb) { _%>
               value: <%- getJDBCUrl(app.prodDatabaseType, { hostname: '${APPLICATION_NAME}'+`-${app.prodDatabaseType}`, databaseName: app.baseName.toLowerCase() }) %>
-              <%_ } else if (app.prodDatabaseType === 'postgresql') { _%>
+  <%_ } else if (app.prodDatabaseTypePostgres) { _%>
               value: <%- getJDBCUrl(app.prodDatabaseType, { hostname: '${APPLICATION_NAME}'+`-${app.prodDatabaseType}db`, databaseName: '${APPLICATION_NAME}' }) %>
-              <%_ } _%>
+  <%_ } _%>
             - name: SPRING_DATASOURCE_USERNAME
               valueFrom:
                 secretKeyRef:
@@ -166,8 +166,8 @@ objects:
                 secretKeyRef:
                   name: ${SECRET_REF}
                   key: database-password
-            <%_ } _%>
-            <%_ if (app.prodDatabaseType === 'mongodb') { _%>
+<%_ } _%>
+<%_ if (app.databaseTypeMongodb) { _%>
             - name: SPRING_DATA_MONGODB_URI
               value: mongodb://${APPLICATION_NAME}-mongodb<% if (app.reactive) { %>/?waitQueueMultiple=1000<% } %>
             - name: SPRING_DATA_MONGODB_DATABASE
@@ -182,22 +182,22 @@ objects:
                 secretKeyRef:
                   name: ${SECRET_REF}
                   key: database-password
-            <%_ } _%>
-            <%_ if (app.prodDatabaseType === 'cassandra') { _%>
+<%_ } _%>
+<%_ if (app.databaseTypeCassandra) { _%>
             - name: SPRING_DATA_CASSANDRA_CONTACTPOINTS
               value: ${APPLICATION_NAME}-cassandra
-            <%_ } _%>
-            <%_ if (app.prodDatabaseType === 'couchbase') { _%>
-            - name: SPRING_COUCHBASE_BOOTSTRAP_HOSTS
+<%_ } _%>
+<%_ if (app.databaseTypeCouchbase) { _%>
+            - name: SPRING_COUCHBASE_CONNECTION_STRING
               value: ${APPLICATION_NAME}-couchbase
-            - name: SPRING_COUCHBASE_BUCKET_NAME
+            - name: JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME
               value: ${APPLICATION_NAME}
-            <%_ } _%>
-            <%_ if (app.searchEngine === 'elasticsearch') { _%>
+<%_ } _%>
+<%_ if (app.searchEngineElasticsearch) { _%>
             - name: SPRING_ELASTICSEARCH_REST_URIS
               value: http://${APPLICATION_NAME}-elasticsearch:9200
-            <%_ } _%>
-            <%_ if (app.messageBroker === 'kafka') { _%>
+<%_ } _%>
+<%_ if (app.messageBrokerKafka) { _%>
             - name: KAFKA_CONSUMER_KEY_DESERIALIZER
               value: 'org.apache.kafka.common.serialization.StringDeserializer'
             - name: KAFKA_CONSUMER_VALUE_DESERIALIZER
@@ -214,11 +214,11 @@ objects:
               value: 'org.apache.kafka.common.serialization.StringDeserializer'
             - name: KAFKA_PRODUCER_VALUE_DESERIALIZER
               value: 'org.apache.kafka.common.serialization.StringDeserializer'
-            <%_ } _%>
-            <%_ if (monitoring === 'prometheus') { _%>
+<%_ } _%>
+<%_ if (monitoringPrometheus) { _%>
             - name: MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED
               value: "true"
-            <%_ } _%>
+<%_ } _%>
             ports:
             - name: http
               containerPort: ${{APP_PORT}}
@@ -228,11 +228,11 @@ objects:
     metadata:
       annotations:
         service.alpha.openshift.io/dependencies: '[{
-          "name": <%_ if (app.prodDatabaseType === 'mysql') { _%>"${APPLICATION_NAME}-mysqldb"<%_ } _%>
-          <%_ if (app.prodDatabaseType === 'mariadb') { _%>"${APPLICATION_NAME}-mariadb"<%_ } _%>
-          <%_ if (app.prodDatabaseType === 'postgresql') { _%>"${APPLICATION_NAME}-postgresqldb"<%_ } _%>
-          <%_ if (app.prodDatabaseType === 'mongodb') { _%>"${APPLICATION_NAME}-mongodb"<%_ } _%>
-          <%_ if (app.prodDatabaseType === 'cassandra') { _%>"${APPLICATION_NAME}-cassandra" <%_ } _%>, "namespace": "", "kind": "Service"}]'
+          "name": <%_ if (app.prodDatabaseTypeMysql) { _%>"${APPLICATION_NAME}-mysqldb"<%_ } _%>
+          <%_ if (app.prodDatabaseTypeMariadb) { _%>"${APPLICATION_NAME}-mariadb"<%_ } _%>
+          <%_ if (app.prodDatabaseTypePostgres) { _%>"${APPLICATION_NAME}-postgresqldb"<%_ } _%>
+          <%_ if (app.databaseTypeMongodb) { _%>"${APPLICATION_NAME}-mongodb"<%_ } _%>
+          <%_ if (app.databaseTypeCassandra) { _%>"${APPLICATION_NAME}-cassandra" <%_ } _%>, "namespace": "", "kind": "Service"}]'
       labels:
         app: ${APPLICATION_NAME}
       name: ${APPLICATION_NAME}
@@ -242,12 +242,12 @@ objects:
       type: LoadBalancer
       ports:
       - name: http
-      <%_ if (!app.serviceDiscoveryType) { _%>
+<%_ if (!app.serviceDiscoveryType) { _%>
         port: 80
         targetPort: ${{APP_PORT}}
-      <%_ } else { _%>
+<%_ } else { _%>
         port: ${{APP_PORT}}
-      <%_ } _%>
+<%_ } _%>
   -
     apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
     kind: Route

package/generators/openshift/templates/messagebroker/kafka.yml.ejs

@@ -29,13 +29,12 @@ metadata:
   namespace: <%= openshiftNamespace %>
   annotations:
     description: This template defines objects that are required to spin up a kafka and zookeeper pod
-    tags: kafka, jhipster-kafka<% if (storageType === 'persistent') { %> ,persistent <% } %> <% if (storageType === 'ephemeral') { %> ,ephemeral <% } %>
+    tags: kafka, jhipster-kafka<% if (storageTypePersistent) { %> ,persistent <% } %> <% if (storageTypeEphemeral) { %> ,ephemeral <% } %>
     openshift.io/display-name: jhipster-kafka-template
     openshift.io/long-description: >-
-        This template provides objects that are required to spin up a kafka and zookeeper 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 kafka and zookeeper 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: jhipster-kafka
@@ -66,7 +65,7 @@ parameters:
     required: true
     displayName: "*** PLEASE DO NOT CHANGE THIS ***"
 objects:
-<%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
   -
     apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
     kind: PersistentVolumeClaim
@@ -79,7 +78,7 @@ objects:
         requests:
           storage: "${VOLUME_CAPACITY}"
 <%_ } _%>
-<%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
   -
     apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
     kind: PersistentVolumeClaim
@@ -124,13 +123,13 @@ objects:
         spec:
           volumes:
           - name: ${ZK_APPLICATION_NAME}-data
-            <%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
             persistentVolumeClaim:
               claimName: ${ZK_APPLICATION_NAME}
-            <%_ } _%>
-            <%_ if (storageType === 'ephemeral') { _%>
+<%_ } _%>
+<%_ if (storageTypeEphemeral) { _%>
             emptyDir: {}
-            <%_ } _%>
+<%_ } _%>
           containers:
           - name: ${ZK_APPLICATION_NAME}
             image: <%= DOCKER_ZOOKEEPER %>
@@ -199,13 +198,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_KAFKA %>

package/generators/openshift/templates/monitoring/jhipster-metrics.yml.ejs

@@ -30,13 +30,13 @@ metadata:
   namespace: <%= openshiftNamespace %>
   annotations:
     description: This template defines objects that are required to spin up metrics monitoring pod
-    tags: prometheus, alertmanager, grafana, jhipster-metrics<% if (storageType === 'persistent') { %> ,persistent <% } %> <% if (storageType === 'ephemeral') { %> ,ephemeral <% } %>
+    tags: prometheus, alertmanager, grafana, jhipster-metrics<% if (storageTypePersistent) { %> ,persistent <% } %> <% if (storageTypeEphemeral) { %> ,ephemeral <% } %>
     openshift.io/display-name: jhipster-metrics-monitoring-template
     openshift.io/long-description: >-
         This template provides objects that are required to spin up a metrics monitoring pod. It contains
-        prometheus for metrics aggregation, and grafana for visualization .<% if (storageType =='persistent') { %>The database is stored on persistent storage, so any restart of the service will not cause any impact to the data.
+        prometheus for metrics aggregation, and grafana for visualization .<% 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: jhipster-metrics
@@ -73,7 +73,7 @@ parameters:
     value: 1Gi
     required: true
 objects:
-  <%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
   -
     apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
     kind: PersistentVolumeClaim
@@ -107,7 +107,7 @@ objects:
       resources:
         requests:
           storage: "${VOLUME_CAPACITY}"
-  <%_ } _%>
+<%_ } _%>
   -
     apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
     kind: ConfigMap
@@ -223,13 +223,13 @@ objects:
         spec:
           volumes:
           - name: ${PT_APP_NAME}-data
-            <%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
             persistentVolumeClaim:
               claimName: ${PT_APP_NAME}
-            <%_ } _%>
-            <%_ if (storageType === 'ephemeral') { _%>
+<%_ } _%>
+<%_ if (storageTypeEphemeral) { _%>
             emptyDir: {}
-            <%_ } _%>
+<%_ } _%>
           - name: ${PT_APP_NAME}-config
             configMap:
               name: metrics-config
@@ -319,13 +319,13 @@ objects:
         spec:
           volumes:
           - name: ${AM_APP_NAME}-data
-            <%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
             persistentVolumeClaim:
               claimName: ${AM_APP_NAME}
-            <%_ } _%>
-            <%_ if (storageType === 'ephemeral') { _%>
+<%_ } _%>
+<%_ if (storageTypeEphemeral) { _%>
             emptyDir: {}
-            <%_ } _%>
+<%_ } _%>
           - name: ${AM_APP_NAME}-config
             configMap:
               name: metrics-config
@@ -406,13 +406,13 @@ objects:
         spec:
           volumes:
           - name: ${GF_APP_NAME}-data
-            <%_ if (storageType === 'persistent') { _%>
+<%_ if (storageTypePersistent) { _%>
             persistentVolumeClaim:
               claimName: ${GF_APP_NAME}
-            <%_ } _%>
-            <%_ if (storageType === 'ephemeral') { _%>
+<%_ } _%>
+<%_ if (storageTypeEphemeral) { _%>
             emptyDir: {}
-            <%_ } _%>
+<%_ } _%>
           containers:
           - name: ${GF_APP_NAME}
             image: <%= DOCKER_GRAFANA %>

package/generators/openshift/templates/registry/application-configmap.yml.ejs

@@ -52,9 +52,9 @@ objects:
     data:
       application.yml: |-
         configserver:
-          name: <% if (serviceDiscoveryType === 'eureka') { %> JHipster Registry<% } %><% if (serviceDiscoveryType === 'consul') { %>Consul<% } %>
-          status: Connected to <% if (serviceDiscoveryType === 'eureka') { %>the JHipster Registry<% } %><% if (serviceDiscoveryType === 'consul') { %>Consul<% } %> running in OpenShift
-        <%_ if (serviceDiscoveryType === 'eureka') {  _%>
+          name: <% if (serviceDiscoveryEureka) { %> JHipster Registry<% } %><% if (serviceDiscoveryConsul) { %>Consul<% } %>
+          status: Connected to <% if (serviceDiscoveryEureka) { %>the JHipster Registry<% } %><% if (serviceDiscoveryConsul) { %>Consul<% } %> running in OpenShift
+<%_ if (serviceDiscoveryEureka) {  _%>
         eureka:
           client:
             initial-instance-info-replication-interval-seconds: 15
@@ -66,18 +66,18 @@ objects:
           instance:
             lease-renewal-interval-in-seconds: 10
             registry-default-open-for-traffic-count: 0
-        <%_ } _%>
+<%_ } _%>
         jhipster:
           security:
             authentication:
               jwt:
                 base64-secret: <%= jwtSecretKey %>
       # app specific configuration
-      <%_ if (serviceDiscoveryType === 'eureka') {  _%>
+<%_ if (serviceDiscoveryEureka) {  _%>
       jhipster-registry.yml: |-
         eureka:
           client:
             service-url:
               # This must contain a list of all Eureka server replicas for registry HA to work correctly
               defaultZone: <% for (let i = 0; i < registryReplicas; i++) { %>http://admin:${SPRING_SECURITY_USER_PASSWORD}@jhipster-registry-<%- i %>.jhipster-registry:8761/eureka/<% if (i < registryReplicas-1) { _%>,<% }} %>
-      <%_ } _%>
+<%_ } _%>

package/generators/options.js

@@ -0,0 +1,63 @@
+/**
+ * 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.
+ */
+const commonOptions = {
+  'from-cli': {
+    desc: 'Indicates the command is run from JHipster CLI',
+    type: Boolean,
+    hide: true,
+  },
+  'skip-prettier': {
+    desc: 'Skip prettier',
+    type: Boolean,
+    hide: true,
+  },
+  'skip-prompts': {
+    desc: 'Skip prompts',
+    type: Boolean,
+  },
+  defaults: {
+    desc: 'Use default config',
+    type: Boolean,
+  },
+  reproducible: {
+    desc: 'Force a reproducible project for testing',
+    type: Boolean,
+    hide: true,
+  },
+  add: {
+    desc: 'Compose with a generator at current project',
+    type: Boolean,
+  },
+  regenerate: {
+    desc: 'Regenerate a generator at current project',
+    type: Boolean,
+  },
+  configure: {
+    desc: 'Configure the generator',
+    type: Boolean,
+  },
+  'skip-jhipster-dependencies': {
+    desc: "Don't add generator-jhipster and blueprints to package.json.",
+    type: Boolean,
+  },
+};
+
+module.exports = {
+  commonOptions,
+};

package/generators/page/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * 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 generator from './index.js';
+
+export default generator;

package/generators/page/generator.spec.mjs

@@ -0,0 +1,47 @@
+/**
+ * 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 testSupport from '../../test/support/index.cjs';
+import Generator from './index.js';
+
+const { snakeCase } = lodash;
+const { testBlueprintSupport } = testSupport;
+
+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);
+  });
+  describe.skip('blueprint support', () => testBlueprintSupport(generator));
+});