diff --git a/.env.example b/.env.example index 48ed9fc5..56b7d43b 100644 --- a/.env.example +++ b/.env.example @@ -42,6 +42,7 @@ FORMATIONS_INITIALES_ONISEP_RAW_FILE_EXTENSION= FORMATIONS_INITIALES_EXTRACT_LOG_LEVEL= FORMATIONS_INITIALES_MINIO_RAW_BUCKET_NAME= +FORMATIONS_INITIALES_MINIO_TRANSFORMED_BUCKET_NAME= HOUSING_EXTRACT_LOG_LEVEL= HOUSING_LOAD_LOG_LEVEL= diff --git a/.env.test b/.env.test index 7dc028fc..62325bfb 100644 --- a/.env.test +++ b/.env.test @@ -42,6 +42,7 @@ FORMATIONS_INITIALES_ONISEP_RAW_FILE_EXTENSION=.xml FORMATIONS_INITIALES_EXTRACT_LOG_LEVEL=debug FORMATIONS_INITIALES_MINIO_RAW_BUCKET_NAME=formations-initiales-raw +FORMATIONS_INITIALES_MINIO_TRANSFORMED_BUCKET_NAME=formations-initiales-json HOUSING_EXTRACT_LOG_LEVEL=debug HOUSING_LOAD_LOG_LEVEL=debug diff --git a/apps/formations-initiales/src/transformation/infrastructure/configuration/configuration.ts b/apps/formations-initiales/src/transformation/infrastructure/configuration/configuration.ts index 962567e8..e98d0e88 100644 --- a/apps/formations-initiales/src/transformation/infrastructure/configuration/configuration.ts +++ b/apps/formations-initiales/src/transformation/infrastructure/configuration/configuration.ts @@ -66,10 +66,10 @@ export class ConfigurationFactory extends ConfigurationValidator { ACCESS_KEY: getOrError("MINIO_ACCESS_KEY"), HISTORY_DIRECTORY_NAME: getOrDefault("MINIO_HISTORY_DIRECTORY_NAME", DEFAULT_HISTORY_DIRECTORY_NAME), PORT: Number(getOrDefault("MINIO_PORT", DEFAULT_MINIO_PORT)), - RAW_BUCKET_NAME: getOrDefault("EVENTS_MINIO_RAW_BUCKET_NAME", DEFAULT_RAW_BUCKET_NAME), + RAW_BUCKET_NAME: getOrDefault("FORMATIONS_INITIALES_MINIO_RAW_BUCKET_NAME", DEFAULT_RAW_BUCKET_NAME), SECRET_KEY: getOrError("MINIO_SECRET_KEY"), URL: getOrError("MINIO_URL"), - TRANSFORMED_BUCKET_NAME: getOrError("EVENTS_MINIO_TRANSFORMED_BUCKET_NAME"), + TRANSFORMED_BUCKET_NAME: getOrError("FORMATIONS_INITIALES_MINIO_TRANSFORMED_BUCKET_NAME"), }, NODE_ENV: getOrError("NODE_ENV") as Environment, SENTRY: { diff --git a/apps/maintenance/src/infrastructure/configuration/configuration.ts b/apps/maintenance/src/infrastructure/configuration/configuration.ts index a68e0a97..fb95b294 100644 --- a/apps/maintenance/src/infrastructure/configuration/configuration.ts +++ b/apps/maintenance/src/infrastructure/configuration/configuration.ts @@ -24,6 +24,7 @@ type MinioConfiguration = { CONTACTS_MANAGEMENT_POE: BucketConfiguration; DEFAULT_DAYS_AFTER_EXPIRATION: number; FORMATIONS_INITIALES_EXTRACT: BucketConfiguration; + FORMATIONS_INITIALES_TRANSFORM: BucketConfiguration; EVENTS_EXTRACT: BucketConfiguration; EVENTS_TRANSFORM: BucketConfiguration; EVENTS_LOAD: BucketConfiguration; @@ -88,6 +89,7 @@ export class ConfigurationFactory extends ConfigurationValidator { EVENTS_TRANSFORM: { BUCKET_NAME: getOrError("EVENTS_MINIO_TRANSFORMED_BUCKET_NAME") }, EVENTS_LOAD: { BUCKET_NAME: getOrError("EVENTS_MINIO_RESULT_BUCKET_NAME") }, FORMATIONS_INITIALES_EXTRACT: { BUCKET_NAME: getOrError("FORMATIONS_INITIALES_MINIO_RAW_BUCKET_NAME") }, + FORMATIONS_INITIALES_TRANSFORM: { BUCKET_NAME: getOrError("FORMATIONS_INITIALES_MINIO_TRANSFORMED_BUCKET_NAME") }, HOUSING_EXTRACT: { BUCKET_NAME: getOrError("HOUSING_MINIO_RAW_BUCKET_NAME") }, HOUSING_TRANSFORM: { BUCKET_NAME: getOrError("HOUSING_MINIO_TRANSFORMED_BUCKET_NAME") }, HOUSING_LOAD: { BUCKET_NAME: getOrError("HOUSING_MINIO_RESULT_BUCKET_NAME") }, diff --git a/apps/shared/src/infrastructure/configuration/configuration.ts b/apps/shared/src/infrastructure/configuration/configuration.ts index a7362c29..e4fb7380 100644 --- a/apps/shared/src/infrastructure/configuration/configuration.ts +++ b/apps/shared/src/infrastructure/configuration/configuration.ts @@ -14,6 +14,7 @@ type MinioConfiguration = { EVENTS_MINIO_RESULT_BUCKET_NAME: string EVENTS_MINIO_TRANSFORMED_BUCKET_NAME: string FORMATIONS_INITIALES_MINIO_RAW_BUCKET_NAME: string + FORMATIONS_INITIALES_MINIO_TRANSFORMED_BUCKET_NAME: string HISTORY_DIRECTORY_NAME: string HOUSING_MINIO_RAW_BUCKET_NAME: string HOUSING_MINIO_TRANSFORMED_BUCKET_NAME: string @@ -140,6 +141,7 @@ export class ConfigurationFactory extends ConfigurationValidator { EVENTS_MINIO_TRANSFORMED_BUCKET_NAME: getOrError("EVENTS_MINIO_TRANSFORMED_BUCKET_NAME"), EVENTS_MINIO_RESULT_BUCKET_NAME: getOrError("EVENTS_MINIO_RESULT_BUCKET_NAME"), FORMATIONS_INITIALES_MINIO_RAW_BUCKET_NAME: getOrError("FORMATIONS_INITIALES_MINIO_RAW_BUCKET_NAME"), + FORMATIONS_INITIALES_MINIO_TRANSFORMED_BUCKET_NAME: getOrError("FORMATIONS_INITIALES_MINIO_TRANSFORMED_BUCKET_NAME"), HISTORY_DIRECTORY_NAME: getOrDefault("MINIO_HISTORY_DIRECTORY_NAME", "history"), HOUSING_MINIO_RAW_BUCKET_NAME: getOrError("HOUSING_MINIO_RAW_BUCKET_NAME"), HOUSING_MINIO_TRANSFORMED_BUCKET_NAME: getOrError("HOUSING_MINIO_TRANSFORMED_BUCKET_NAME"),