Skip to content

Commit

Permalink
merged dev
Browse files Browse the repository at this point in the history
  • Loading branch information
GaelFerrand committed Feb 10, 2025
2 parents 7c8a72e + 6b36253 commit ed8695b
Show file tree
Hide file tree
Showing 1,207 changed files with 44,143 additions and 12,154 deletions.
16 changes: 14 additions & 2 deletions .env.model
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@ S3_REGION=*********
S3_ACCESS_KEY_ID=*********
S3_SECRET_ACCESS_KEY=*********
S3_BUCKET=*********

S3_REGISTRY_ERRORS_BUCKET=*********
S3_REGISTRY_IMPORTS_BUCKET=*********
S3_REGISTRY_EXPORTS_BUCKET=*********
S3_REGISTRY_MODELS_BUCKET=*********
# File storage configuration for empty bsds templates
S3_BSD_TEMPLATES_ACCESS_KEY_ID==*********
S3_BSD_TEMPLATES_SECRET_ACCESS_KEY==*********
Expand Down Expand Up @@ -233,4 +236,13 @@ GERICO_WEBHOOK_SLUG="/lorem"
GERICO_WEBHOOK_TOKEN="***"

# For testing purposes, optional and defaulted to november 2024 release date: "2024-11-13T00:00:00.000Z"
VERIFY_DESTINATION_PROFILES_FOR_BSDD_CREATED_AFTER="2024-10-26:00:00.000Z"
VERIFY_DESTINATION_PROFILES_FOR_BSDD_CREATED_AFTER="2024-10-26T00:00:00.000Z"

# For testing purposes, optional and defaulted to "2024-12-17"
OVERRIDE_V20241201="2024-10-26T00:00:00.000Z"

# For testing purposes, optional and defaulted to "2025-01-15"
OVERRIDE_V20250101="2024-12-27T00:00:00.000Z"

# For testing purposes, optional and defaulted to "2025-02-12"
OVERRIDE_V20250201="2025-01-15T00:00:00.000Z"
32 changes: 24 additions & 8 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,30 @@
# Contexte

<!--
Résumé succinct et à jour du ticket Favro
-->

# Points de vigilance pour les intégrateurs

<!--
Décrivez brièvement l'objectif de votre pull request.
La liste ci-dessous comporte des éléments importants à garder en tête pour chaque PR.
Pensez à ajouter le lien du ticket Favro correspondant.
Si la PR introduit des breaking changes ou des modifications
côté API, mettre ici un bref résumé technique type TL;DR à
l'attention des intégrateurs
-->

# Démo

<!--
Vidéo de préférence
-->

# Ticket Favro

[Titre](lien)

# Checklist

- [ ] Mettre à jour la documentation
- [ ] Mettre à jour le change log
- [ ] Documenter les manipulations à faire lors de la mise en production (sur le ticket Favro de release)
- [ ] S'assurer que la numérotation des nouvelles migrations est bien cohérente
- [ ] Informer le data engineer de tout changement de schéma DB
---

- [Ticket Favro]()
- [ ] Informer le data engineer de tout changement de schéma DB
2 changes: 2 additions & 0 deletions .github/workflows/brgm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
steps:
- name: Checkout the repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Git
run: |
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,13 @@ jobs:
TD_COMPANY_ELASTICSEARCH_CACERT: ${{ secrets.TD_COMPANY_ELASTICSEARCH_CACERT }}
OTEL_SDK_DISABLED: true
ELASTIC_SEARCH_URL: http://elasticsearch:9200
S3_ENDPOINT: http://localhost:9000
S3_REGION: fr-par
S3_BUCKET: unset
S3_ACCESS_KEY_ID: trackdechets
S3_SECRET_ACCESS_KEY: password
S3_REGISTRY_ERRORS_BUCKET: registry-errors-integration
S3_REGISTRY_IMPORTS_BUCKET: registry-imports-integration
S3_REGISTRY_EXPORTS_BUCKET: registry-exports-integration
S3_REGISTRY_MODELS_BUCKET: registry-models-integration
- run: npx nx affected -t build --parallel=3
10 changes: 9 additions & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,16 @@ jobs:
run: docker compose up -d
- name: Init DB & ES index
run: |
npx nx run back:codegen
npx nx run @td/codegen-back:build
npx nx run @td/prisma:generate
npx nx run @td/codegen-ui:build
TERM=xterm bash ./scripts/deploy-db.sh
- name: Create MinIO buckets
run: |
docker exec trackdechets-minio-1 mc alias set myminio http://localhost:9000 trackdechets password
docker exec trackdechets-minio-1 mc mb myminio/"$S3_REGISTRY_ERRORS_BUCKET"
docker exec trackdechets-minio-1 mc mb myminio/"$S3_REGISTRY_IMPORTS_BUCKET"
docker exec trackdechets-minio-1 mc mb myminio/"$S3_REGISTRY_EXPORTS_BUCKET"
- name: Start TD applications
run: |
npx nx run api:serve >> /tmp/td-api.log &
Expand Down Expand Up @@ -164,6 +170,8 @@ env:
S3_SECRET_ACCESS_KEY: password
S3_REGISTRY_ERRORS_BUCKET: registry-errors-integration
S3_REGISTRY_IMPORTS_BUCKET: registry-imports-integration
S3_REGISTRY_EXPORTS_BUCKET: registry-exports-integration
S3_REGISTRY_MODELS_BUCKET: registry-models-integration

S3_BSD_TEMPLATES_ACCESS_KEY_ID: unset
S3_BSD_TEMPLATES_SECRET_ACCESS_KEY: unset
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@ jobs:
run: docker compose up -d
- name: Init DB & ES index
run: |
npx nx run back:codegen
npx nx run @td/codegen-back:build
npx nx run @td/prisma:generate
TERM=xterm bash ./scripts/deploy-db.sh
- name: Create MinIO buckets
run: |
docker exec trackdechets-minio-1 mc alias set myminio http://localhost:9000 trackdechets password
docker exec trackdechets-minio-1 mc mb myminio/"$S3_REGISTRY_ERRORS_BUCKET"
docker exec trackdechets-minio-1 mc mb myminio/"$S3_REGISTRY_IMPORTS_BUCKET"
docker exec trackdechets-minio-1 mc mb myminio/"$S3_REGISTRY_EXPORTS_BUCKET"
- name: Start queues
run: |
npx nx run-many -t serve --projects=tag:backend:queues --parallel=6 --configuration=integration &
Expand Down Expand Up @@ -123,5 +124,9 @@ env:
S3_SECRET_ACCESS_KEY: password
S3_REGISTRY_ERRORS_BUCKET: registry-errors-integration
S3_REGISTRY_IMPORTS_BUCKET: registry-imports-integration
S3_REGISTRY_EXPORTS_BUCKET: registry-exports-integration
S3_REGISTRY_MODELS_BUCKET: registry-models-integration
VERIFY_DESTINATION_PROFILES_FOR_BSDD_CREATED_AFTER: 2024-10-30T00:00:00.000Z

OVERRIDE_V20241201: 2024-10-30T00:00:00.000Z
OVERRIDE_V20250101: 2024-12-27T00:00:00.000Z
OVERRIDE_V20250201: 2025-01-15T00:00:00.000Z
Loading

0 comments on commit ed8695b

Please sign in to comment.