From 2f9984953eb0a09c6803905dd0b05d4113f46d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=A9o=20M=C3=A9vollon?= <38255502+matmut7@users.noreply.github.com> Date: Fri, 22 Mar 2024 12:14:11 +0100 Subject: [PATCH] fix: ovh domains (#2236) --- .github/workflows/review-auto.yaml | 4 ++-- .github/workflows/review.yaml | 2 +- .kontinuous/env/dev/values.yaml | 11 +++-------- README.md | 6 +++--- docker-compose.yml | 4 ++-- packages/api/docs/index.md | 2 +- packages/app/.env.development | 2 +- packages/app/.env.production | 2 +- packages/app/.env.test | 4 ++-- packages/app/env.d.ts | 4 ++-- packages/app/src/common/config.ts | 2 +- packages/simulateur/.env.dist | 2 +- packages/simulateur/Dockerfile | 2 +- 13 files changed, 21 insertions(+), 26 deletions(-) diff --git a/.github/workflows/review-auto.yaml b/.github/workflows/review-auto.yaml index c875c72c65..9d130eb336 100644 --- a/.github/workflows/review-auto.yaml +++ b/.github/workflows/review-auto.yaml @@ -36,7 +36,7 @@ jobs: uses: socialgouv/kontinuous/.github/actions/env@v1 - name: Set env run: | - echo "SITE_URL=https://${{ steps.env.outputs.subdomain }}.dev.fabrique.social.gouv.fr" >> $GITHUB_ENV + echo "SITE_URL=https://${{ steps.env.outputs.subdomain }}.ovh.fabrique.social.gouv.fr" >> $GITHUB_ENV echo "$SITE_URL" - name: Cypress run uses: cypress-io/github-action@v5 @@ -44,4 +44,4 @@ jobs: install: false working-directory: ./packages/app config: "pageLoadTimeout=100000,baseUrl=${{ env.SITE_URL }}" - wait-on: "${{ env.SITE_URL }}" \ No newline at end of file + wait-on: "${{ env.SITE_URL }}" diff --git a/.github/workflows/review.yaml b/.github/workflows/review.yaml index c4d2420d04..5871344292 100644 --- a/.github/workflows/review.yaml +++ b/.github/workflows/review.yaml @@ -38,7 +38,7 @@ jobs: uses: socialgouv/kontinuous/.github/actions/env@v1 - name: Set env run: | - echo "SITE_URL=https://${{ steps.env.outputs.subdomain }}.dev.fabrique.social.gouv.fr" >> $GITHUB_ENV + echo "SITE_URL=https://${{ steps.env.outputs.subdomain }}.ovh.fabrique.social.gouv.fr" >> $GITHUB_ENV echo "$SITE_URL" - name: Cypress run uses: cypress-io/github-action@v5 diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml index 862e53cf75..cd91a74637 100644 --- a/.kontinuous/env/dev/values.yaml +++ b/.kontinuous/env/dev/values.yaml @@ -1,5 +1,5 @@ api: - ~needs: [build-api,create-db] + ~needs: [build-api] vars: EGAPRO_SEND_EMAILS: "True" EGAPRO_SMTP_HOST: maildev @@ -9,7 +9,7 @@ api: EGAPRO_SMTP_SSL: "" app: - ~needs: [build-app, create-db] + ~needs: [build-app] vars: MAILER_ENABLE: "True" MAILER_SMTP_HOST: maildev @@ -17,9 +17,4 @@ app: MAILER_SMTP_SSL: "False" maildev: {} -pgweb: {} - -jobs: - runs: - create-db: - use: create-db \ No newline at end of file +pgweb: {} \ No newline at end of file diff --git a/README.md b/README.md index dfca515bc5..7274f3b0e9 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Prod : -Préprod : +Préprod : ## Installer @@ -84,9 +84,9 @@ yarn workspaces run lint Ajouter le préfixe `maildev-` devant l'URL. -Si l'environnement est `https://egapro-feat-limit-char-11oson.dev.fabrique.social.gouv.fr/`. +Si l'environnement est `https://egapro-feat-limit-char-11oson.ovh.fabrique.social.gouv.fr/`. -Le maildev se trouvera alors à `https://maildev-egapro-feat-limit-char-11oson.dev.fabrique.social.gouv.fr/` +Le maildev se trouvera alors à `https://maildev-egapro-feat-limit-char-11oson.ovh.fabrique.social.gouv.fr/` ## Fichiers diff --git a/docker-compose.yml b/docker-compose.yml index 27a352efcd..46b0422d41 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -96,10 +96,10 @@ services: oauth2-proxy-github: image: bitnami/oauth2-proxy command: - # - --redirect-url=https://oauth-egapro.preprod.dev.fabrique.social.gouv.fr/callback + # - --redirect-url=https://oauth-egapro.preprod.ovh.fabrique.social.gouv.fr/callback - --redirect-url=http://localhost:4180/oauth2/callback - --upstream=file:///dev/null - - --whitelist-domain=.dev.fabrique.social.gouv.fr + - --whitelist-domain=.ovh.fabrique.social.gouv.fr - --whitelist-domain=localhost:3000 ports: - 4180:4180 diff --git a/packages/api/docs/index.md b/packages/api/docs/index.md index d68a721ae9..dae06b19fd 100644 --- a/packages/api/docs/index.md +++ b/packages/api/docs/index.md @@ -28,7 +28,7 @@ Où `siren` est le numéro de siren de l'entreprise ou UES déclarant, et `year` Pour aller voir les mails envoyés par le serveur de dev: -https://mailtrap.dev.egapro.fabrique.social.gouv.fr/ +https://mailtrap.ovh.egapro.fabrique.social.gouv.fr/ (Demander un accès.) diff --git a/packages/app/.env.development b/packages/app/.env.development index 8d28e3104b..50cc7c5402 100644 --- a/packages/app/.env.development +++ b/packages/app/.env.development @@ -75,7 +75,7 @@ SECURITY_MONCOMPTEPRO_CLIENT_SECRET="" SECURITY_MONCOMPTEPRO_TEST=true SECURITY_GITHUB_CLIENT_ID= SECURITY_GITHUB_CLIENT_SECRET= -SECURITY_CHARON_URL="https://egapro-charon.dev.fabrique.social.gouv.fr" +SECURITY_CHARON_URL="https://egapro-charon.ovh.fabrique.social.gouv.fr" ## Sentry # old EGAPRO_SENTRY_DSN diff --git a/packages/app/.env.production b/packages/app/.env.production index 2503148e75..621efda4bf 100644 --- a/packages/app/.env.production +++ b/packages/app/.env.production @@ -66,7 +66,7 @@ SECURITY_ALLOWED_IPS="" SECURITY_MONCOMPTEPRO_TEST=false SECURITY_GITHUB_CLIENT_ID= SECURITY_GITHUB_CLIENT_SECRET= -SECURITY_CHARON_URL="https://egapro-charon.dev.fabrique.social.gouv.fr" +SECURITY_CHARON_URL="https://egapro-charon.ovh.fabrique.social.gouv.fr" ## Sentry # old EGAPRO_SENTRY_DSN diff --git a/packages/app/.env.test b/packages/app/.env.test index ccfc2b349d..826d328b84 100644 --- a/packages/app/.env.test +++ b/packages/app/.env.test @@ -1,5 +1,5 @@ -NEXT_PUBLIC_API_URL=https://egapro-preprod.dev.fabrique.social.gouv.fr/api -NEXT_PUBLIC_API_V2_URL=https://egapro-preprod.dev.fabrique.social.gouv.fr/apiv2 +NEXT_PUBLIC_API_URL=https://egapro-preprod.ovh.fabrique.social.gouv.fr/api +NEXT_PUBLIC_API_V2_URL=https://egapro-preprod.ovh.fabrique.social.gouv.fr/apiv2 NEXT_PUBLIC_MATOMO_URL="" NEXT_PUBLIC_MATOMO_SITE_ID="" ## MAILER service diff --git a/packages/app/env.d.ts b/packages/app/env.d.ts index e8af8be670..1e7e565ad5 100755 --- a/packages/app/env.d.ts +++ b/packages/app/env.d.ts @@ -208,7 +208,7 @@ declare namespace NodeJS { */ SECURITY_GITHUB_CLIENT_SECRET?: string; /** - * Dist: `https://egapro-charon.dev.fabrique.social.gouv.fr` + * Dist: `https://egapro-charon.ovh.fabrique.social.gouv.fr` * {@link [Local Env Dist](.env.development)} */ SECURITY_CHARON_URL?: string; @@ -268,4 +268,4 @@ declare type ProcessEnvCustomKeys = | 'SECURITY_GITHUB_CLIENT_SECRET' | 'SECURITY_CHARON_URL' | 'SENTRY_DSN' - | 'SENTRY_ENVIRONMENT'; \ No newline at end of file + | 'SENTRY_ENVIRONMENT'; diff --git a/packages/app/src/common/config.ts b/packages/app/src/common/config.ts index 4fa8da2083..a50a0ca3ae 100644 --- a/packages/app/src/common/config.ts +++ b/packages/app/src/common/config.ts @@ -96,7 +96,7 @@ export const config = { staffRoutes: ["/admin/liste-referents", "/admin/impersonate"], charonUrl: ensureApiEnvVar( process.env.SECURITY_CHARON_URL, - "https://egapro-charon.dev.fabrique.social.gouv.fr", + "https://egapro-charon.ovh.fabrique.social.gouv.fr", ), }, }, diff --git a/packages/simulateur/.env.dist b/packages/simulateur/.env.dist index 3bd882d60d..b055374d7d 100644 --- a/packages/simulateur/.env.dist +++ b/packages/simulateur/.env.dist @@ -4,6 +4,6 @@ PUBLIC_URL="" REACT_APP_GITHUB_SHA= REACT_APP_NAME=$npm_package_name # REACT_APP_DECLARATION_URL="http://localhost:4000/" -REACT_APP_EGAPRO_API_URL="https://egapro-preprod.dev.fabrique.social.gouv.fr/api" +REACT_APP_EGAPRO_API_URL="https://egapro-preprod.ovh.fabrique.social.gouv.fr/api" REACT_APP_EGAPRO_APIV2_URL="http://localhost:3000/apiv2" REACT_APP_SENTRY_DSN="" diff --git a/packages/simulateur/Dockerfile b/packages/simulateur/Dockerfile index 90ce4f69a9..57d0614603 100644 --- a/packages/simulateur/Dockerfile +++ b/packages/simulateur/Dockerfile @@ -15,7 +15,7 @@ COPY packages/simulateur/tsconfig.json ./packages/simulateur/ COPY packages/simulateur/.eslintrc.js ./packages/simulateur/ COPY packages/simulateur/src ./packages/simulateur/src -ARG REACT_APP_EGAPRO_API_URL=https://egapro-preprod.dev.fabrique.social.gouv.fr/api +ARG REACT_APP_EGAPRO_API_URL=https://egapro-preprod.ovh.fabrique.social.gouv.fr/api ENV REACT_APP_EGAPRO_API_URL=$REACT_APP_EGAPRO_API_URL ARG REACT_APP_DECLARATION_URL="/index-egapro/declaration/"