fix: remove dashes in kafka configuration

Author: fdelbrayelle

generators/app/files.js

@@ -369,11 +369,11 @@ function overrideMainGeneratorAppYml(generator) {
     const appYmlPath = `${jhipsterConstants.MAIN_DIR}docker/app.yml`;
 
     const kafkaBootstrapServersPattern = /^\s.*KAFKA_BOOTSTRAPSERVERS.*$/gm;
-    const kafkaBootstrapServers = '      - KAFKA_BOOTSTRAP_SERVERS=kafka:29092';
+    const kafkaBootstrapServers = '      KAFKA_BOOTSTRAP_SERVERS: kafka:29092';
     generator.replaceContent(appYmlPath, kafkaBootstrapServersPattern, kafkaBootstrapServers);
 
     const kafkaAdvertisedListenersPattern = /^\s.*KAFKA_ADVERTISED_LISTENERS.*$/gm;
-    const kafkaAdvertisedListeners = '      - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092';
+    const kafkaAdvertisedListeners = '      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092';
     generator.replaceContent(appYmlPath, kafkaAdvertisedListenersPattern, kafkaAdvertisedListeners);
 }
 

test/app.spec.js

@@ -1066,11 +1066,11 @@ function assertNoTopicName(applicationYml, testApplicationYml, entityName) {
 }
 
 function assertBootstrapServerProperties(bootstrapServers = constants.DEFAULT_BOOTSTRAP_SERVERS) {
-    const boostrapProps = `bootstrap.servers: \\\${KAFKA_BOOTSTRAP_SERVERS:${bootstrapServers}}`;
+    const bootstrapProps = `bootstrap.servers: \\\${KAFKA_BOOTSTRAP_SERVERS:${bootstrapServers}}`;
 
-    assert.fileContent(`${jhipsterConstants.SERVER_MAIN_RES_DIR}config/application.yml`, new RegExp(boostrapProps));
+    assert.fileContent(`${jhipsterConstants.SERVER_MAIN_RES_DIR}config/application.yml`, new RegExp(bootstrapProps));
 
-    assert.fileContent(`${jhipsterConstants.SERVER_TEST_RES_DIR}config/application.yml`, new RegExp(boostrapProps));
+    assert.fileContent(`${jhipsterConstants.SERVER_TEST_RES_DIR}config/application.yml`, new RegExp(bootstrapProps));
 }
 
 function assertThatKafkaPropertiesAreOrdered(applicationYml) {

test/templates/message-broker-with-entities-2nd-call/src/main/docker/app.yml

@@ -3,12 +3,12 @@ services:
   message_broker_with_entities-app:
     image: message_broker_with_entities
     environment:
-      - _JAVA_OPTIONS=-Xmx512m -Xms256m
-      - SPRING_PROFILES_ACTIVE=prod,swagger
-      - MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED=true
-      - SPRING_DATASOURCE_URL=jdbc:mysql://message_broker_with_entities-mysql:3306/message_broker_with_entities?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
-      - JHIPSTER_SLEEP=30 # gives time for other services to boot before the application
-      - KAFKA_BOOTSTRAP_SERVERS=kafka:29092
+      _JAVA_OPTIONS: -Xmx512m -Xms256m
+      SPRING_PROFILES_ACTIVE: prod,swagger
+      MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED: true
+      SPRING_DATASOURCE_URL: jdbc:mysql://message_broker_with_entities-mysql:3306/message_broker_with_entities?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
+      JHIPSTER_SLEEP: 30 # gives time for other services to boot before the application
+      KAFKA_BOOTSTRAP_SERVERS: kafka:29092
     ports:
       - 8080:8080
   message_broker_with_entities-mysql:
@@ -20,8 +20,8 @@ services:
       file: kafka.yml
       service: kafka
     environment:
-      - KAFKA_ADVERTISED_HOST_NAME=kafka
-      - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092
+      KAFKA_ADVERTISED_HOST_NAME: kafka
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092
   zookeeper:
     extends:
       file: kafka.yml