Merge branch 'fix14817' of github.com:MathieuAA/generator-jhipster in…

…to fix14817
jhipster · May 14, 2021 · bbddc8c · bbddc8c
2 parents e514705 + e7e089f
commit bbddc8c
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 27 deletions.
diff --git a/jdl/jhipster/deployment-options.js b/jdl/jhipster/deployment-options.js
@@ -46,41 +46,50 @@ const kubernetesRelatedOptions = {
   },
 };
 
-const Options = {
-  deploymentType: {
-    dockerCompose: DeploymentTypes.DOCKERCOMPOSE,
-    kubernetes: DeploymentTypes.KUBERNETES,
-    openshift: DeploymentTypes.OPENSHIFT,
+const openshiftRelatedOptions = {
+  openshiftNamespace: 'default',
+  registryReplicas: {
+    two: 2,
+  },
+  storageType: {
+    ephemeral: 'ephemeral',
+    persistent: 'persistent',
   },
+};
+
+const dockerComposeRelatedOptions = {
   gatewayType: {
     springCloudGateway: 'SpringCloudGateway',
   },
+};
+
+const baseOptions = {
+  appsFolders: [],
+  clusteredDbApps: {},
+  directoryPath: '../',
   monitoring: {
     no: 'no',
     prometheus: 'prometheus',
   },
-  directoryPath: '../',
-  appsFolders: [],
-  clusteredDbApps: {},
-  // adminPassword: 'admin',
   serviceDiscoveryType: {
     eureka: 'eureka',
     consul: 'consul',
     no: 'no',
   },
-  dockerRepositoryName: '',
+};
+
+const Options = {
+  ...baseOptions,
+  deploymentType: {
+    dockerCompose: DeploymentTypes.DOCKERCOMPOSE,
+    kubernetes: DeploymentTypes.KUBERNETES,
+    openshift: DeploymentTypes.OPENSHIFT,
+  },
   dockerPushCommand: 'docker push',
-  // Kubernetes specific
+  dockerRepositoryName: '',
+  ...dockerComposeRelatedOptions,
   ...kubernetesRelatedOptions,
-  // openshift specific
-  openshiftNamespace: 'default',
-  registryReplicas: {
-    two: 2,
-  },
-  storageType: {
-    ephemeral: 'ephemeral',
-    persistent: 'persistent',
-  },
+  ...openshiftRelatedOptions,
 };
 
 Options.defaults = (deploymentType = Options.deploymentType.dockerCompose) => {

diff --git a/jdl/parsing/lexer/deployment-tokens.js b/jdl/parsing/lexer/deployment-tokens.js
@@ -26,19 +26,23 @@ const deploymentCategoryToken = createTokenFromConfig({
 });
 
 const deploymentTokens = [
-  { name: 'DEPLOYMENT_TYPE', pattern: 'deploymentType' },
-  { name: 'GATEWAY_TYPE', pattern: 'gatewayType' },
-  { name: 'MONITORING', pattern: 'monitoring' },
-  { name: 'DIRECTORY_PATH', pattern: 'directoryPath' },
   { name: 'APPS_FOLDERS', pattern: 'appsFolders' },
   { name: 'CLUSTERED_DB_APPS', pattern: 'clusteredDbApps' },
-  { name: 'DOCKER_REPOSITORY_NAME', pattern: 'dockerRepositoryName' },
+  { name: 'DEPLOYMENT_TYPE', pattern: 'deploymentType' },
+  { name: 'DIRECTORY_PATH', pattern: 'directoryPath' },
   { name: 'DOCKER_PUSH_COMMAND', pattern: 'dockerPushCommand' },
-  { name: 'KUBERNETES_NAMESPACE', pattern: 'kubernetesNamespace' },
-  { name: 'KUBERNETES_SERVICE_TYPE', pattern: 'kubernetesServiceType' },
+  { name: 'DOCKER_REPOSITORY_NAME', pattern: 'dockerRepositoryName' },
+  { name: 'GATEWAY_TYPE', pattern: 'gatewayType' },
   { name: 'INGRESS_DOMAIN', pattern: 'ingressDomain' },
+  { name: 'INGRESS_TYPE', pattern: 'ingressType' },
   { name: 'ISTIO', pattern: 'istio' },
+  { name: 'KUBERNETES_NAMESPACE', pattern: 'kubernetesNamespace' },
+  { name: 'KUBERNETES_SERVICE_TYPE', pattern: 'kubernetesServiceType' },
+  { name: 'KUBERNETES_STORAGE_CLASS_NAME', pattern: 'kubernetesStorageClassName' },
+  { name: 'KUBERNETES_USE_DYNAMIC_STORAGE', pattern: 'kubernetesUseDynamicStorage' },
+  { name: 'MONITORING', pattern: 'monitoring' },
   { name: 'OPENSHIFT_NAMESPACE', pattern: 'openshiftNamespace' },
+  { name: 'REGISTRY_REPLICAS', pattern: 'registryReplicas' },
   { name: 'STORAGE_TYPE', pattern: 'storageType' },
 ].map(tokenConfig => {
   tokenConfig.categories = [deploymentCategoryToken];

diff --git a/jdl/parsing/validator.js b/jdl/parsing/validator.js
@@ -275,11 +275,22 @@ const deploymentConfigPropsValidations = {
     pattern: ALPHABETIC,
     msg: 'kubernetesServiceType property',
   },
+  KUBERNETES_STORAGE_CLASS_NAME: {
+    type: 'NAME',
+    pattern: ALPHABETIC,
+    msg: 'kubernetesStorageClassName property',
+  },
+  KUBERNETES_USE_DYNAMIC_STORAGE: { type: 'BOOLEAN' },
   INGRESS_DOMAIN: {
     type: 'STRING',
     pattern: REPONAME_PATTERN,
     msg: 'ingressDomain property',
   },
+  INGRESS_TYPE: {
+    type: 'STRING',
+    pattern: ALPHABETIC,
+    msg: 'ingressType property',
+  },
   ISTIO: {
     type: 'BOOLEAN',
     msg: 'istio property',
@@ -289,6 +300,7 @@ const deploymentConfigPropsValidations = {
     pattern: ALPHANUMERIC_DASH,
     msg: 'openshiftNamespace property',
   },
+  REGISTRY_REPLICAS: { type: 'INTEGER' },
   STORAGE_TYPE: {
     type: 'NAME',
     pattern: ALPHABETIC_LOWER,