Use baseName as password for postgresql

jhipster · Sep 12, 2024 · 3df0a95 · 3df0a95
1 parent c279385
commit 3df0a95
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap b/generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap
@@ -647,7 +647,7 @@ jhipster:
  image: postgresql-placeholder
  environment:
  - POSTGRES_USER=mspsql
- - POSTGRES_PASSWORD=postgresql
+ - POSTGRES_PASSWORD=mspsql
  - POSTGRES_HOST_AUTH_METHOD=trust
  healthcheck:
  test:
@@ -1041,7 +1041,7 @@ jhipster:
  image: postgresql-placeholder
  environment:
  - POSTGRES_USER=mspsql
- - POSTGRES_PASSWORD=postgresql
+ - POSTGRES_PASSWORD=mspsql
  - POSTGRES_HOST_AUTH_METHOD=trust
  healthcheck:
  test:
@@ -1459,7 +1459,7 @@ jhipster:
  image: postgresql-placeholder
  environment:
  - POSTGRES_USER=mspsql
- - POSTGRES_PASSWORD=postgresql
+ - POSTGRES_PASSWORD=mspsql
  - POSTGRES_HOST_AUTH_METHOD=trust
  healthcheck:
  test:
@@ -1794,7 +1794,7 @@ jhipster:
  image: postgresql-placeholder
  environment:
  - POSTGRES_USER=mspsql
- - POSTGRES_PASSWORD=postgresql
+ - POSTGRES_PASSWORD=mspsql
  - POSTGRES_HOST_AUTH_METHOD=trust
  healthcheck:
  test:

diff --git a/generators/spring-data-relational/support/application-properties.ts b/generators/spring-data-relational/support/application-properties.ts
@@ -46,10 +46,11 @@ export default function prepareSqlApplicationProperties({ application }: { appli
  }
 
  const prodDatabaseData = getDatabaseData(application.prodDatabaseType);
+ const { defaultPassword } = prodDatabaseData;
  application.prodHibernateDialect = prodDatabaseData.hibernateDialect;
  application.prodJdbcDriver = prodDatabaseData.jdbcDriver;
  application.prodDatabaseUsername = prodDatabaseData.defaultUsername ?? application.baseName;
- application.prodDatabasePassword = prodDatabaseData.defaultPassword ?? '';
+ application.prodDatabasePassword = defaultPassword === '<baseName>' ? application.baseName : (defaultPassword ?? '');
  application.prodDatabaseName = prodDatabaseData.defaultDatabaseName ?? application.baseName;
 
  const prodDatabaseOptions = {
@@ -69,10 +70,11 @@ export default function prepareSqlApplicationProperties({ application }: { appli
  if (application.devDatabaseTypeH2Any) {
  try {
  const devDatabaseData = getDatabaseData(application.devDatabaseType);
+ const { defaultPassword } = devDatabaseData;
  application.devHibernateDialect = devDatabaseData.hibernateDialect;
  application.devJdbcDriver = devDatabaseData.jdbcDriver;
  application.devDatabaseUsername = devDatabaseData.defaultUsername ?? application.baseName;
- application.devDatabasePassword = devDatabaseData.defaultPassword ?? '';
+ application.devDatabasePassword = defaultPassword === '<baseName>' ? application.baseName : (defaultPassword ?? '');
  application.devDatabaseName = devDatabaseData.defaultDatabaseName ?? application.baseName;
 
  const devDatabaseOptions = {

diff --git a/generators/spring-data-relational/support/database-data.ts b/generators/spring-data-relational/support/database-data.ts
@@ -151,7 +151,9 @@ const databaseData: Record<string, DatabaseDataSpec> = {
  jdbcDriver: 'org.postgresql.Driver',
  hibernateDialect: 'org.hibernate.dialect.PostgreSQLDialect',
  port: ':5432/',
- defaultPassword: 'postgresql',
+ // Password is required by Spring Boot v3.3.x, can be removed for v3.4.x, see https://github.com/spring-projects/spring-boot/pull/41511
+ // User baseName as password to avoid being flagged by SonarQube
+ defaultPassword: '<baseName>',
 
  constraintNameMaxLength: 63,
  tableNameMaxLength: 63,
@@ -186,6 +188,8 @@ export function getDatabaseData(databaseType: string) {
  if (databaseData[databaseType] === undefined) {
  throw new Error(`Database data not found for database ${databaseType}`);
  }
+ if (databaseData[databaseType].defaultPassword === '<baseName>') {
+ }
  return databaseData[databaseType];
 }