generator-jhipster 8.0.0-beta.3 → 8.0.0

package/dist/generators/cucumber/templates/src/test/java/_package_/cucumber/stepdefs/UserStepDefs.java.ejs

@@ -0,0 +1,114 @@
+<%#
+ Copyright 2013-2023 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.
+-%>
+package <%= packageName %>.cucumber.stepdefs;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import io.cucumber.java.Before;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.User;
+
+import <%= packageName %>.web.rest.UserResource;
+import <%= packageName %>.security.AuthoritiesConstants;
+
+<%_ if (reactive) { _%>
+import org.springframework.test.web.reactive.server.WebTestClient;
+import static org.hamcrest.Matchers.is;
+<%_ } else { _%>
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+<%_ } _%>
+
+public class UserStepDefs extends StepDefs {
+
+    @Autowired
+    private UserResource userResource;
+
+<%_ if (reactive) { _%>
+    private WebTestClient userResourceMock;
+<%_ } else { _%>
+    private MockMvc userResourceMock;
+<%_ } _%>
+
+    @Before
+    public void setup() {
+        List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
+        grantedAuthorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN));
+        User principal = new User("admin", "", true, true, true, true, grantedAuthorities);
+        Authentication authentication = new UsernamePasswordAuthenticationToken(
+            principal,
+            principal.getPassword(),
+            principal.getAuthorities()
+        );
+        SecurityContext context = SecurityContextHolder.createEmptyContext();
+        context.setAuthentication(authentication);
+        SecurityContextHolder.setContext(context);
+<%_ if (reactive) { _%>
+        this.userResourceMock = WebTestClient.bindToController(userResource).build();
+<%_ } else { _%>
+        this.userResourceMock = MockMvcBuilders.standaloneSetup(userResource).build();
+<%_ } _%>
+    }
+
+    @When("I search user {string}")
+    public void i_search_user(String userId) throws Throwable {
+<%_ if (reactive) { _%>
+        actions = userResourceMock.get().uri("/api/admin/users/" + userId).accept(MediaType.APPLICATION_JSON).exchange();
+<%_ } else { _%>
+        actions = userResourceMock.perform(get("/api/admin/users/" + userId).accept(MediaType.APPLICATION_JSON));
+<%_ } _%>
+    }
+
+    @Then("the user is found")
+    public void the_user_is_found() throws Throwable {
+<%_ if (reactive) { _%>
+        actions
+            .expectStatus().isOk()
+            .expectHeader().contentTypeCompatibleWith(MediaType.APPLICATION_JSON_VALUE);
+<%_ } else { _%>
+        actions
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE));
+<%_ } _%>
+    }
+
+    @Then("his last name is {string}")
+    public void his_last_name_is(String lastName) throws Throwable {
+<%_ if (reactive) { _%>
+        actions.expectBody().jsonPath("$.lastName").value(is(lastName));
+<%_ } else { _%>
+        actions.andExpect(jsonPath("$.lastName").value(lastName));
+<%_ } _%>
+    }
+
+}

package/dist/generators/cucumber/templates/src/test/resources/_package_/cucumber/user.feature.ejs

@@ -0,0 +1,6 @@
+Feature: User management
+
+    Scenario: Retrieve administrator user
+        When I search user 'admin'
+        Then the user is found
+        And his last name is 'Administrator'

package/dist/generators/cypress/command.mjs

@@ -0,0 +1,15 @@
+const command = {
+    options: {
+        cypressCoverage: {
+            description: 'Enable Cypress code coverage report generation',
+            type: Boolean,
+            scope: 'storage',
+        },
+        cypressAudit: {
+            description: 'Enable cypress-audit/lighthouse report generation',
+            type: Boolean,
+            scope: 'storage',
+        },
+    },
+};
+export default command;

package/dist/generators/cypress/files.mjs

@@ -17,12 +17,16 @@
  * limitations under the License.
  */
 import { CLIENT_TEST_SRC_DIR } from '../generator-constants.mjs';
+import { clientRootTemplatesBlock } from '../client/support/index.mjs';
 const CYPRESS_TEMPLATE_SOURCE_DIR = `${CLIENT_TEST_SRC_DIR}cypress/`;
 export const cypressFiles = {
     common: [
         {
-            templates: ['cypress.config.ts', 'README.md.jhi.cypress'],
+            templates: ['README.md.jhi.cypress'],
         },
+        clientRootTemplatesBlock({
+            templates: ['cypress.config.ts'],
+        }),
     ],
     clientTestFw: [
         {
@@ -73,10 +77,10 @@ export const cypressFiles = {
             renameTo: (ctx, file) => `${ctx.cypressDir}${file}`,
             templates: ['e2e/lighthouse.audits.ts'],
         },
-        {
+        clientRootTemplatesBlock({
             condition: generator => generator.cypressAudit,
             templates: ['cypress-audits.config.ts'],
-        },
+        }),
     ],
     coverage: [
         {

package/dist/generators/cypress/generator.mjs

@@ -26,11 +26,13 @@ import { generateTestEntity as entityWithFakeValues } from '../client/support/in
 const { ANGULAR } = clientFrameworkTypes;
 export default class CypressGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
-        // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_CLIENT.
-        await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_CYPRESS);
         }
+        if (!this.delegateToBlueprint) {
+            // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_CLIENT.
+            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+        }
     }
     get prompting() {
         return this.asPromptingTaskGroup({
@@ -157,7 +159,8 @@ export default class CypressGenerator extends BaseApplicationGenerator {
                 this.loadNodeDependenciesFromPackageJson(application.nodeDependencies, this.fetchFromInstalledJHipster('client', 'resources', 'package.json'));
             },
             configure({ application }) {
-                this.packageJson.merge({
+                const clientPackageJson = this.createStorage(this.destinationPath(application.clientRootDir, 'package.json'));
+                clientPackageJson.merge({
                     devDependencies: {
                         'eslint-plugin-cypress': application.nodeDependencies['eslint-plugin-cypress'],
                     },
@@ -174,7 +177,8 @@ export default class CypressGenerator extends BaseApplicationGenerator {
             configureAudits({ application }) {
                 if (!application.cypressAudit)
                     return;
-                this.packageJson.merge({
+                const clientPackageJson = this.createStorage(this.destinationPath(application.clientRootDir, 'package.json'));
+                clientPackageJson.merge({
                     devDependencies: {
                         lighthouse: application.nodeDependencies.lighthouse,
                         'cypress-audit': application.nodeDependencies['cypress-audit'],
@@ -192,7 +196,8 @@ export default class CypressGenerator extends BaseApplicationGenerator {
                 const { cypressCoverage, clientFrameworkAngular, dasherizedBaseName } = application;
                 if (!cypressCoverage)
                     return;
-                this.packageJson.merge({
+                const clientPackageJson = this.createStorage(this.destinationPath(application.clientRootDir, 'package.json'));
+                clientPackageJson.merge({
                     devDependencies: {
                         '@cypress/code-coverage': application.nodeDependencies['@cypress/code-coverage'],
                         'babel-loader': application.nodeDependencies['babel-loader'],
@@ -201,7 +206,7 @@ export default class CypressGenerator extends BaseApplicationGenerator {
                     },
                     scripts: {
                         'clean-coverage': 'rimraf .nyc_output coverage',
-                        'pree2e:cypress:coverage': 'npm run clean coverage && npm run ci:server:await',
+                        'pree2e:cypress:coverage': 'npm run clean-coverage && npm run ci:server:await',
                         'e2e:cypress:coverage': 'npm run e2e:cypress:headed',
                         'poste2e:cypress:coverage': 'nyc report',
                         'prewebapp:instrumenter': 'npm run clean-www && npm run clean-coverage',

package/dist/generators/cypress/index.mjs

@@ -17,5 +17,6 @@
  * limitations under the License.
  */
 export { default } from './generator.mjs';
+export { default as command } from './command.mjs';
 export * from './generator.mjs';
 export { cypressFiles, cypressEntityFiles } from './files.mjs';

package/dist/generators/cypress/templates/cypress.config.ts.ejs

@@ -20,10 +20,10 @@ import { defineConfig } from 'cypress';
 
 export default defineConfig({
   video: false,
-  fixturesFolder: '<%= cypressDir %>fixtures',
-  screenshotsFolder: '<%= cypressTemporaryDir %>screenshots',
-  downloadsFolder: '<%= cypressTemporaryDir %>downloads',
-  videosFolder: '<%= cypressTemporaryDir %>videos',
+  fixturesFolder: '<%= this.relativeDir(clientRootDir, cypressDir) %>fixtures',
+  screenshotsFolder: '<%= this.relativeDir(clientRootDir, cypressTemporaryDir) %>screenshots',
+  downloadsFolder: '<%= this.relativeDir(clientRootDir, cypressTemporaryDir) %>downloads',
+  videosFolder: '<%= this.relativeDir(clientRootDir, cypressTemporaryDir) %>videos',
   chromeWebSecurity: true,
   viewportWidth: 1200,
   viewportHeight: 720,
@@ -45,11 +45,12 @@ export default defineConfig({
     // We've imported your old cypress plugins here.
     // You may want to clean this up later by importing these.
     async setupNodeEvents(on, config) {
-      return (await import('./<%= cypressDir %>plugins/index')).default(on, config);
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+      return (await import('./<%= this.relativeDir(clientRootDir, cypressDir) %>plugins/index')).default(on, config);
     },
     baseUrl: 'http://localhost:<%= gatewayServerPort || serverPort %>/',
-    specPattern: '<%= cypressDir %>e2e/**/*.cy.ts',
-    supportFile: '<%= cypressDir %>support/index.ts',
+    specPattern: '<%= this.relativeDir(clientRootDir, cypressDir) %>e2e/**/*.cy.ts',
+    supportFile: '<%= this.relativeDir(clientRootDir, cypressDir) %>support/index.ts',
     experimentalRunAllSpecs: true,
   },
 });

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/login-page.cy.ts.ejs

@@ -40,6 +40,13 @@ describe('login modal', () => {
   it('greets with signin', () => {
     cy.get(titleLoginSelector).should('be.visible');
   });
+<%_ if (clientFrameworkAngular) { _%>
+
+  it('greets visiting /login directly', () => {
+    cy.visit('/login');
+    cy.get(titleLoginSelector).should('be.visible');
+  });
+<%_ } _%>
 
   it('requires username', () => {
     cy.get(passwordLoginSelector).type('a-password');

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/settings-page.cy.ts.ejs

@@ -79,6 +79,7 @@ describe('/account/settings', () => {
 
   it("should be able to change 'user' lastname settings", () => {
     cy.get(lastNameSettingsSelector).clear();
+    cy.get(firstNameSettingsSelector).type('jhipster');
     cy.get(lastNameSettingsSelector).type('retspihj');
     cy.get(submitSettingsSelector).click();
     cy.wait('@settingsSave').then(({ response }) => expect(response?.statusCode).to.equal(200));
@@ -86,6 +87,7 @@ describe('/account/settings', () => {
 
   it("should be able to change 'user' email settings", () => {
     cy.get(emailSettingsSelector).clear();
+    cy.get(firstNameSettingsSelector).type('jhipster');
     cy.get(emailSettingsSelector).type('user@localhost.fr');
     cy.get(submitSettingsSelector).click();
     cy.wait('@settingsSave').then(({ response }) => expect(response?.statusCode).to.equal(200));
@@ -114,6 +116,7 @@ describe('/account/settings', () => {
 
     it("should not be able to change 'user' email to same value", () => {
       cy.get(emailSettingsSelector).clear();
+      cy.get(firstNameSettingsSelector).type('jhipster');
       cy.get(emailSettingsSelector).type(testAdminEmail);
       cy.get(submitSettingsSelector).click();
       cy.wait('@settingsSave').then(({ response }) => expect(response?.statusCode).to.equal(400));

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/administration/administration.cy.ts.ejs

@@ -86,7 +86,12 @@ describe('/admin', () => {
           cy.get(swaggerFrameSelector).should('be.visible').then(() => {
             // Wait iframe to load
             cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
-            cy.get(swaggerFrameSelector).its('0.contentDocument.body').find(swaggerPageSelector, { timeout: 15000 }).should('be.visible');
+            const getSwaggerIframe = () => {
+              return cy.get(swaggerFrameSelector).its('0.contentDocument.body').should('not.be.empty').then(cy.wrap);
+            };
+            getSwaggerIframe().find(swaggerPageSelector, { timeout: 15000 }).should('be.visible');
+            getSwaggerIframe().find('[id="select"] > option').its('length').should('be.gt', 0);
+            getSwaggerIframe().find(swaggerPageSelector).then(cy.wrap).find('.information-container').its('length').should('be.gt', 0);
           });
         }
       });

package/dist/generators/cypress/templates/src/test/javascript/cypress/tsconfig.json.ejs

@@ -17,13 +17,17 @@
  limitations under the License.
 -%>
 {
-  "extends": "../../../../tsconfig.json",
+<%_ if (clientFrameworkVue) { _%>
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
+<%_ } else { _%>
+  "extends": "<%= this.relativeDir(cypressDir, clientRootDir) %>tsconfig.json",
+<%_ } _%>
   "compilerOptions": {
     "baseUrl": "./",
     "sourceMap": false,
-    "outDir": "../../../../<%= cypressTemporaryDir %>out-tsc",
+    "outDir": "<%- this.relativeDir(cypressDir, temporaryDir) %>cypress/tsc",
     "target": "es2018",
     "types": ["cypress", "node"]
   },
-  "include": ["./../../../../cypress*.config.ts", "./**/*.ts"]
+  "include": ["./<%= this.relativeDir(cypressDir, clientRootDir) %>cypress*.config.ts", "./**/*.ts"]
 }

package/dist/generators/docker/files.mjs

@@ -1,41 +1,53 @@
-import { DOCKER_DIR } from '../generator-constants.mjs';
+import { TEMPLATES_DOCKER_DIR } from '../generator-constants.mjs';
+const renameTo = (ctx, filepath) => `${ctx.dockerServicesDir}${filepath}`.replace('/_eureka_', '').replace('/_consul_', '');
 // eslint-disable-next-line import/prefer-default-export
 export const dockerFiles = {
     sqlDatabasesFiles: [
         {
-            condition: ctx => ctx.databaseTypeSql && !ctx.prodDatabaseTypeOracle,
-            path: DOCKER_DIR,
-            templates: [{ file: ctx => `${ctx.prodDatabaseType}.yml` }],
+            condition: ctx => ctx.dockerServices.some(service => ['postgresql', 'mariadb', 'mysql', 'mssql'].includes(service)),
+            templates: [
+                {
+                    sourceFile: ctx => `${TEMPLATES_DOCKER_DIR}${ctx.prodDatabaseType}.yml`,
+                    destinationFile: ctx => `${ctx.dockerServicesDir}${ctx.prodDatabaseType}.yml`,
+                },
+            ],
         },
         {
-            condition: ctx => ctx.prodDatabaseTypeMysql,
-            path: DOCKER_DIR,
-            templates: [{ file: 'config/mysql/my.cnf', noEjs: true }],
+            condition: ctx => ctx.dockerServices.includes('mysql'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
+            transform: false,
+            templates: ['config/mysql/my.cnf'],
         },
         {
-            condition: ctx => ctx.prodDatabaseTypeMariadb,
-            path: DOCKER_DIR,
-            templates: [{ file: 'config/mariadb/my.cnf', noEjs: true }],
+            condition: ctx => ctx.dockerServices.includes('mariadb'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
+            transform: false,
+            templates: ['config/mariadb/my.cnf'],
         },
     ],
     couchbaseFiles: [
         {
-            condition: ctx => ctx.databaseTypeCouchbase,
-            path: DOCKER_DIR,
+            condition: ctx => ctx.dockerServices.includes('couchbase'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
             templates: ['couchbase.yml', 'couchbase-cluster.yml', 'couchbase/Couchbase.Dockerfile', 'couchbase/scripts/configure-node.sh'],
         },
     ],
     mongodbFiles: [
         {
-            condition: ctx => ctx.databaseTypeMongodb,
-            path: DOCKER_DIR,
+            condition: ctx => ctx.dockerServices.includes('mongodb'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
             templates: ['mongodb.yml', 'mongodb-cluster.yml', 'mongodb/MongoDB.Dockerfile', 'mongodb/scripts/init_replicaset.js'],
         },
     ],
     cassandraFiles: [
         {
-            condition: ctx => ctx.databaseTypeCassandra,
-            path: DOCKER_DIR,
+            condition: ctx => ctx.dockerServices.includes('cassandra'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
             templates: [
                 // docker-compose files
                 'cassandra.yml',
@@ -51,112 +63,121 @@ export const dockerFiles = {
     ],
     neo4jFiles: [
         {
-            condition: ctx => ctx.databaseTypeNeo4j,
-            path: DOCKER_DIR,
+            condition: ctx => ctx.dockerServices.includes('neo4j'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
             templates: ['neo4j.yml'],
         },
     ],
     cacheProvideFiles: [
         {
-            condition: generator => generator.cacheProviderHazelcast,
-            path: DOCKER_DIR,
+            condition: generator => generator.dockerServices.includes('hazelcast'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
             templates: ['hazelcast-management-center.yml'],
         },
         {
-            condition: generator => generator.cacheProviderMemcached,
-            path: DOCKER_DIR,
+            condition: generator => generator.dockerServices.includes('memcached'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
             templates: ['memcached.yml'],
         },
         {
-            condition: generator => generator.cacheProviderRedis,
-            path: DOCKER_DIR,
+            condition: generator => generator.dockerServices.includes('redis'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
             templates: ['redis.yml', 'redis-cluster.yml', 'redis/Redis-Cluster.Dockerfile', 'redis/connectRedisCluster.sh'],
         },
     ],
     searchDiscoveryFiles: [
         {
             condition: generator => generator.serviceDiscoveryAny,
-            path: DOCKER_DIR,
-            templates: [{ file: 'config/README.md', renameTo: () => 'central-server-config/README.md' }],
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
+            templates: ['central-server-config/README.md'],
         },
         {
-            condition: generator => generator.serviceDiscoveryConsul,
-            path: DOCKER_DIR,
-            templates: [
-                'consul.yml',
-                'config/git2consul.json',
-                { file: 'config/consul-config/application.yml', renameTo: () => 'central-server-config/application.yml' },
-            ],
+            condition: generator => generator.dockerServices.includes('consul'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
+            templates: ['consul.yml', 'config/git2consul.json', 'central-server-config/_consul_/application.yml'],
         },
         {
-            condition: generator => generator.serviceDiscoveryEureka,
-            path: DOCKER_DIR,
+            condition: generator => generator.dockerServices.includes('eureka'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
             templates: [
                 'jhipster-registry.yml',
-                {
-                    file: 'config/docker-config/application.yml',
-                    renameTo: () => 'central-server-config/docker-config/application.yml',
-                },
-                {
-                    file: 'config/localhost-config/application.yml',
-                    renameTo: () => 'central-server-config/localhost-config/application.yml',
-                },
+                'central-server-config/_eureka_/docker-config/application.yml',
+                'central-server-config/_eureka_/localhost-config/application.yml',
             ],
         },
     ],
     applicationFiles: [
         {
-            path: DOCKER_DIR,
+            path: TEMPLATES_DOCKER_DIR,
+            condition: ctx => ctx.dockerServices.includes('app'),
+            renameTo,
+            templates: ['app.yml'],
+        },
+        {
+            path: TEMPLATES_DOCKER_DIR,
+            condition: ctx => ctx.backendTypeJavaAny,
+            renameTo,
             templates: [
-                'app.yml',
                 'jhipster-control-center.yml',
-                'sonar.yml',
                 'monitoring.yml',
-                'prometheus/prometheus.yml',
                 'grafana/provisioning/dashboards/dashboard.yml',
                 'grafana/provisioning/dashboards/JVM.json',
                 'grafana/provisioning/datasources/datasource.yml',
             ],
         },
         {
-            condition: generator => generator.searchEngineElasticsearch,
-            path: DOCKER_DIR,
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
+            templates: ['sonar.yml', 'prometheus/prometheus.yml'],
+        },
+        {
+            condition: generator => generator.dockerServices.includes('elasticsearch'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
             templates: ['elasticsearch.yml'],
         },
         {
-            condition: generator => generator.messageBrokerKafka,
-            path: DOCKER_DIR,
+            condition: generator => generator.dockerServices.includes('kafka'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
             templates: ['kafka.yml'],
         },
         {
-            condition: generator => generator.messageBrokerPulsar,
-            path: DOCKER_DIR,
+            condition: generator => generator.dockerServices.includes('pulsar'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
             templates: ['pulsar.yml'],
         },
         {
-            condition: generator => !!generator.enableSwaggerCodegen,
-            path: DOCKER_DIR,
+            condition: generator => !!generator.dockerServices.includes('swagger-editor'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
             templates: ['swagger-editor.yml'],
         },
         {
-            condition: generator => generator.authenticationTypeOauth2,
-            path: DOCKER_DIR,
-            templates: [
-                'keycloak.yml',
-                {
-                    file: 'config/keycloak-health-check.sh',
-                    renameTo: () => 'realm-config/keycloak-health-check.sh',
-                    transform: false,
-                },
-                {
-                    file: 'config/realm-config/jhipster-realm.json',
-                    renameTo: () => 'realm-config/jhipster-realm.json',
-                },
-            ],
+            condition: generator => generator.dockerServices.includes('keycloak'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
+            templates: ['keycloak.yml', 'realm-config/jhipster-realm.json'],
+        },
+        {
+            condition: generator => generator.dockerServices.includes('keycloak'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
+            transform: false,
+            templates: ['realm-config/keycloak-health-check.sh'],
         },
         {
-            condition: generator => generator.serviceDiscoveryAny || generator.applicationTypeGateway || generator.applicationTypeMicroservice,
-            path: DOCKER_DIR,
+            condition: generator => generator.dockerServices.includes('zipkin'),
+            path: TEMPLATES_DOCKER_DIR,
+            renameTo,
             templates: ['zipkin.yml'],
         },
     ],