generator-jhipster 7.3.1 → 7.4.0

package/generators/kubernetes/templates/istio/gateway/zipkin-gateway.yml.ejs

@@ -16,7 +16,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-apiVersion: networking.istio.io/v1alpha3
+# This configuration uses 'http' and is not recommended for production use.
+# Refer https://istio.io/latest/docs/tasks/observability/gateways/ for a more secure 'https' config
+# using a self signed certificate and prefer that for production use
+apiVersion: <%= KUBERNETES_ISTIO_NETWORKING_API_VERSION %>
 kind: Gateway
 metadata:
   name: zipkin-observability-gateway
@@ -38,7 +41,7 @@ spec:
     hosts:
     - zipkin.istio-system.<%= ingressDomain %>
 ---
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: <%= KUBERNETES_ISTIO_NETWORKING_API_VERSION %>
 kind: VirtualService
 metadata:
   name: zipkin-gw-virtualservice

package/generators/kubernetes/templates/istio/gateway.yml.ejs

@@ -16,6 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+# This configuration uses 'http' and is not recommended for production use.
+# Refer https://istio.io/latest/docs/reference/config/networking/gateway/ for a more secure 'https' config
+# using certificates and prefer that for production use
 apiVersion: <%= KUBERNETES_ISTIO_NETWORKING_API_VERSION %>
 kind: Gateway
 metadata:
@@ -58,15 +61,14 @@ spec:
   <%_ appConfigs.filter(config => config.baseName !== app.baseName).forEach(config => { _%>
   - match:
     - uri:
-        prefix: /<%= config.baseName.toLowerCase() %>/
+        prefix: /services/<%= config.baseName.toLowerCase() %>/
+    rewrite:
+      uri: /
     route:
     - destination:
         host: <%= config.baseName.toLowerCase() %>
   <%_ }); _%>
 <%_ } _%>
-  - match:
-    - uri:
-        prefix: /
-    route:
+  - route:
     - destination:
         host: <%= app.baseName.toLowerCase() %>

package/generators/kubernetes/templates/secret/couchbase-secret.yml.ejs

@@ -0,0 +1,9 @@
+apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
+kind: Secret
+metadata:
+  name: couchbase-secret
+  namespace: <%= kubernetesNamespace %>
+type: Opaque
+data:
+  username: QWRtaW5pc3RyYXRvcg==
+  password: cGFzc3dvcmQ=

package/generators/kubernetes-base.js

@@ -144,4 +144,5 @@ function setupHelmConstants() {
   this.HELM_MYSQL = constants.HELM_MYSQL;
   this.HELM_POSTGRESQL = constants.HELM_POSTGRESQL;
   this.HELM_MOGODB_REPLICASET = constants.HELM_MOGODB_REPLICASET;
+  this.HELM_COUCHBASE_OPERATOR = constants.HELM_COUCHBASE_OPERATOR;
 }

package/generators/kubernetes-helm/files.js

@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const { COUCHBASE } = require('../../jdl/jhipster/database-types');
 const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
 const { GATEWAY, MONOLITH } = require('../../jdl/jhipster/application-types');
 const { JWT } = require('../../jdl/jhipster/authentication-types');
@@ -50,13 +49,6 @@ function writeFiles() {
         this.template('app/requirements.yml.ejs', `${appOut}/requirements.yaml`);
         this.template('app/helpers.tpl.ejs', `${appOut}/templates/_helpers.tpl`);
 
-        if (this.app.prodDatabaseType === COUCHBASE) {
-          this.template(
-            `${kubernetesSubgenPath}/db/${this.app.prodDatabaseType}.yml.ejs`,
-            `${appOut}/templates/${appName}-${this.app.prodDatabaseType}.yml`
-          );
-        }
-
         if (this.app.searchEngine === ELASTICSEARCH) {
           this.template(`${kubernetesSubgenPath}/db/elasticsearch.yml.ejs`, `${appOut}/templates/${appName}-elasticsearch.yml`);
         }
@@ -70,6 +62,9 @@ function writeFiles() {
         if (!this.app.serviceDiscoveryType && this.app.authenticationType === JWT) {
           this.template(`${kubernetesSubgenPath}/secret/jwt-secret.yml.ejs`, `${appOut}/templates/jwt-secret.yml`);
         }
+        if (this.app.prodDatabaseTypeCouchbase) {
+          this.template(`${kubernetesSubgenPath}/secret/couchbase-secret.yml.ejs`, `${appOut}/templates/couchbase-secret.yml`);
+        }
         if (this.istio) {
           this.template(`${kubernetesSubgenPath}/istio/destination-rule.yml.ejs`, `${appOut}/templates/${appName}-destination-rule.yml`);
           this.template(`${kubernetesSubgenPath}/istio/virtual-service.yml.ejs`, `${appOut}/templates/${appName}-virtual-service.yml`);

package/generators/kubernetes-helm/index.js

@@ -36,11 +36,11 @@ const {
 } = require('../kubernetes-base');
 const statistics = require('../statistics');
 
-let useBlueprints;
 module.exports = class extends BaseDockerGenerator {
-  constructor(args, options, features) {
-    super(args, options, features);
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_KUBERNETES_HELM);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_KUBERNETES_HELM);
+    }
   }
 
   _initializing() {
@@ -59,7 +59,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -83,7 +83,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -111,7 +111,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -129,7 +129,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -138,7 +138,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -185,7 +185,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/kubernetes-helm/templates/README-KUBERNETES-HELM.md.ejs

@@ -48,6 +48,5 @@ For Kubernetes specific information, refer to the `kubernetes` sub-generator Rea
 
 ### Backlogs to be covered
 
-* Couchbase is yet to be integrated with Helm repository, it is still referring the Kubernetes sub-generator manifest - to be tested
 * helm upgrade - to be tested
 * Istio - to be tested

package/generators/kubernetes-helm/templates/app/Chart.yml.ejs

@@ -36,4 +36,9 @@ dependencies:
   version: <%= HELM_MOGODB_REPLICASET %>
   repository: https://charts.helm.sh/stable
   condition: mongodb.enabled
+<%_ } else if (app.prodDatabaseTypeCouchbase) { _%>
+- name: couchbase-operator
+  version: <%= HELM_COUCHBASE_OPERATOR %>
+  repository: https://couchbase-partners.github.io/helm-charts/
+  condition: couchbase-operator.enabled
 <%_ } _%>

package/generators/kubernetes-helm/templates/app/helpers.tpl.ejs

@@ -43,15 +43,4 @@ mongodb customisation
 {{- define "mongodb-replicaset.fullname" -}}
 {{- default "<%= app.baseName.toLowerCase() %>-mongodb" -}}
 {{- end -}}
-<%_ } else if (app.prodDatabaseTypeCouchbase) { _%>
-{{/*
-couchdb customisation
-*/}}
-{{- define "couchdb.name" -}}
-{{- default "<%= app.baseName.toLowerCase() %>-couchbase" -}}
-{{- end -}}
-
-{{- define "couchdb.fullname" -}}
-{{- default "<%= app.baseName.toLowerCase() %>-couchbase" -}}
-{{- end -}}
 <%_ } _%>

package/generators/kubernetes-helm/templates/app/requirements.yml.ejs

@@ -19,4 +19,9 @@ dependencies:
     version: <%= HELM_MOGODB_REPLICASET %>
     repository: https://charts.helm.sh/stable
     condition: mongodb.enabled
+<%_ } else if (app.prodDatabaseTypeCouchbase) { _%>
+  - name: couchbase-operator
+    version: <%= HELM_COUCHBASE_OPERATOR %>
+    repository: https://couchbase-partners.github.io/helm-charts/
+    condition: couchbase-operator.enabled
 <%_ } _%>

package/generators/kubernetes-helm/templates/app/values.yml.ejs

@@ -48,10 +48,73 @@ mongodb-replicaset:
     sidecar.istio.io/inject: "false"
   <%_ } _%>
 <%_ } else if (app.prodDatabaseTypeCouchbase) { _%>
-couchdb:
+couchbase-operator:
   enabled: true
-  allowAdminParty: true
-  clusterSize: 3
-  persistentVolume:
-    enabled: true
+  buckets:
+    default: nil
+    <%= app.baseName.toLowerCase() %>:
+      replicas: <%= app.dbPeerCount - 1 %>
+  users:
+    <%= app.baseName.toLowerCase() %>:
+      authSecret: couchbase-secret
+      authDomain: local
+      roles:
+        - name: bucket_admin
+          bucket: <%= app.baseName.toLowerCase() %>
+        - name: bucket_full_access
+          bucket: <%= app.baseName.toLowerCase() %>
+        - name: fts_admin
+          bucket: <%= app.baseName.toLowerCase() %>
+        - name: fts_searcher
+          bucket: <%= app.baseName.toLowerCase() %>
+  cluster:
+    antiAffinity: true
+    image: <%= DOCKER_COUCHBASE %>
+    security:
+      adminSecret: couchbase-secret
+    servers:
+      default:
+    <%_ if (kubernetesUseDynamicStorage) { _%>
+        volumeMounts:
+          default: pvc-default
+          data: pvc-data
+          index: pvc-index
+    <%_ } _%>
+        services:
+          - data
+          - query
+          - index
+          - search
+        size: <%= app.dbPeerCount %>
+    cluster:
+      dataServiceMemoryQuota: 500Mi
+      indexServiceMemoryQuota: 300Mi
+      searchServiceMemoryQuota: 300Mi
+      indexStorageSetting: plasma
+      indexer:
+        storageMode: plasma
+    <%_ if (kubernetesUseDynamicStorage) { _%>
+    volumeClaimTemplates:
+      - metadata:
+          name: pvc-default
+        spec:
+          storageClassName: <%= kubernetesStorageClassName %>
+          resources:
+            requests:
+              storage: 1Gi
+      - metadata:
+          name: pvc-data
+        spec:
+          storageClassName: <%= kubernetesStorageClassName %>
+          resources:
+            requests:
+              storage: 1Gi
+      - metadata:
+          name: pvc-index
+        spec:
+          storageClassName: <%= kubernetesStorageClassName %>
+          resources:
+            requests:
+              storage: 1Gi
+    <%_ } _%>
 <%_ } _%>

package/generators/kubernetes-helm/templates/csvc/Chart.yml.ejs

@@ -23,7 +23,7 @@ dependencies:
   condition: kafka.enabled
 <%_ } _%>
 <%_ if (monitoringPrometheus) { _%>
-- name: prometheus-community
+- name: prometheus
   version: <%= HELM_PROMETHEUS %>
   repository: https://prometheus-community.github.io/helm-charts
   condition: prometheus.enabled

package/generators/kubernetes-helm/templates/csvc/requirements.yml.ejs

@@ -6,7 +6,7 @@ dependencies:
     condition: kafka.enabled
 <%_ } _%>
 <%_ if (monitoringPrometheus) { _%>
-  - name: prometheus-community
+  - name: prometheus
     version: <%= HELM_PROMETHEUS %>
     repository: https://prometheus-community.github.io/helm-charts
     condition: prometheus.enabled

package/generators/kubernetes-knative/index.js

@@ -41,11 +41,11 @@ const { GeneratorTypes } = require('../../jdl/jhipster/kubernetes-platform-types
 
 const { K8S } = GeneratorTypes;
 
-let useBlueprints;
 module.exports = class extends BaseDockerGenerator {
-  constructor(args, options, features) {
-    super(args, options, features);
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_KUBERNETES_KNATIVE);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_KUBERNETES_KNATIVE);
+    }
   }
 
   _initializing() {
@@ -85,7 +85,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -106,7 +106,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -134,7 +134,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -152,7 +152,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -161,7 +161,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -235,7 +235,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/kubernetes-knative/templates/istio/gateway.yml.ejs

@@ -16,6 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+# This configuration uses 'http' and is not recommended for production use.
+# Refer https://istio.io/latest/docs/reference/config/networking/gateway/ for a more secure 'https' config
+# using certificates and prefer that for production use
 apiVersion: <%= KUBERNETES_ISTIO_NETWORKING_API_VERSION %>
 kind: Gateway
 metadata:
@@ -59,6 +62,8 @@ spec:
   - match:
     - uri:
         prefix: /services/<%= config.baseName.toLowerCase() %>/
+    rewrite:
+      uri: /
     route:
     - destination:
         host: <%= config.baseName.toLowerCase() %>-knative
@@ -69,10 +74,7 @@ spec:
             Knative-Serving-Revision: <%= config.baseName.toLowerCase() %>-knative
   <%_ }); _%>
 <%_ } _%>
-  - match:
-    - uri:
-        prefix: /
-    route:
+  - route:
     - destination:
         host: <%= app.baseName.toLowerCase() %>-knative
       headers:

package/generators/kubernetes-knative/templates/service.yml.ejs

@@ -114,7 +114,7 @@ spec:
 <%_ if (app.prodDatabaseTypeCouchbase) { _%>
             - name: SPRING_COUCHBASE_CONNECTION_STRING
               value: "<% for (let i = 0; i < app.dbPeerCount; i++) { %><%= app.baseName.toLowerCase() %>-couchbase-<%= i %>.<%= app.baseName.toLowerCase() %>-couchbase<% if (i < (app.dbPeerCount-1)) { %>,<% }} %>"
-            - name: JHIPSTER_COUCHBASE_BUCKET_NAME
+            - name: JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME
               value: <%= app.baseName.toLowerCase() %>
 <%_ } _%>
 <%_ if (app.searchEngineElasticsearch) { _%>

package/generators/languages/index.js

@@ -31,8 +31,6 @@ const ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
 const REACT = constants.SUPPORTED_CLIENT_FRAMEWORKS.REACT;
 const VUE = constants.SUPPORTED_CLIENT_FRAMEWORKS.VUE;
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, { unique: 'namespace', ...features });
@@ -90,10 +88,12 @@ module.exports = class extends BaseBlueprintGenerator {
         }
       });
     }
+  }
 
-    useBlueprints =
-      !this.fromBlueprint &&
-      this.instantiateBlueprints('languages', { languages: this.languagesToApply, arguments: this.options.languages });
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints('languages', { languages: this.languagesToApply, arguments: this.options.languages });
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -118,7 +118,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -131,7 +131,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -170,7 +170,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -193,7 +193,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -214,7 +214,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -229,7 +229,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -258,7 +258,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -292,7 +292,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 };

package/generators/openapi-client/index.js

@@ -25,8 +25,6 @@ const prompts = require('./prompts');
 const { writeFiles, customizeFiles } = require('./files');
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, features);
@@ -35,7 +33,12 @@ module.exports = class extends BaseBlueprintGenerator {
       type: Boolean,
       defaults: OpenAPIDefaultValues.REGEN,
     });
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_OPENAPI_CLIENT);
+  }
+
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_OPENAPI_CLIENT);
+    }
   }
 
   _initializing() {
@@ -55,7 +58,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -68,7 +71,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -101,7 +104,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -110,7 +113,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -119,7 +122,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 
@@ -146,7 +149,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   install() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._install();
   }
 
@@ -159,7 +162,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/openshift/index.js

@@ -38,13 +38,12 @@ const NO_DATABASE = databaseTypes.NO;
 const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
 const { EPHEMERAL, PERSISTENT } = StorageTypes;
 
-let useBlueprints;
-
 /* eslint-disable consistent-return */
 module.exports = class extends BaseDockerGenerator {
-  constructor(args, options, features) {
-    super(args, options, features);
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_OPENSHIFT);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_OPENSHIFT);
+    }
   }
 
   _initializing() {
@@ -90,7 +89,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -110,7 +109,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -159,7 +158,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -177,7 +176,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -186,7 +185,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -261,7 +260,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }