Skip to content

Commit

Permalink
chore: release (#534)
Browse files Browse the repository at this point in the history
  • Loading branch information
achauve authored Oct 7, 2024
2 parents b80da71 + da2cc70 commit 9c81a85
Show file tree
Hide file tree
Showing 106 changed files with 7,974 additions and 22,485 deletions.
8 changes: 8 additions & 0 deletions .env.dev.example.env
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,11 @@ API_INSEE_URI="/entreprises/sirene/V3.11"
API_MAP_TILER="dtDQE2ONXrpleRHWIyNC"

ANTIVIRUS_URL="https://antivirus.fabrique.social.gouv.fr/vao/api/v1/scan"

# S3 config to use with minio in local
S3_BUCKET_ACCESS_KEY=minioadmin
S3_BUCKET_SECRET_KEY=minioadmin
S3_BUCKET_ENDPOINT="http://minio:9000"
S3_BUCKET_NAME=vao
S3_BUCKET_REGION=xxx # do not matter with minio
S3_BUCKET_ROOT_DIR=local
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Lint and format
name: Lint, format and test

on:
push:

jobs:
lint-and-format:
lint-format-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -17,3 +17,5 @@ jobs:
run: yarn --immutable
- name: Run the linter
run: yarn lint:all
- name: Run backend tests
run: yarn workspace @vao/backend test
3 changes: 1 addition & 2 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no -- commitlint --edit ${1}
npx --no -- commitlint --edit ${1}
1 change: 0 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx lint-staged

Expand Down
61 changes: 61 additions & 0 deletions .kontinuous/env/dev/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
global:
s3SecretName: vao-dev-app-access-key

maildev: {}

backend:
vars:
S3_BUCKET_ROOT_DIR: review-branch/{{ .Values.global.branchSlug32 }}/files

jobs:
runs:
build-frontend-usagers:
Expand All @@ -12,3 +19,57 @@ jobs:
buildArgs:
NUXT_PUBLIC_ENVIRONMENT: "development"
NUXT_PUBLIC_SENTRY_ENABLED: "true"
migrations-db:
env:
- name: PG_VAO_SUPERUSER
valueFrom:
secretKeyRef:
name: pg-superuser
key: user
- name: PG_VAO_SUPERPASSWORD
valueFrom:
secretKeyRef:
name: pg-superuser
key: password
- name: POSTGRES_HOST
valueFrom:
secretKeyRef:
name: pg-superuser
key: host
- name: POSTGRES_PORT
valueFrom:
secretKeyRef:
name: pg-superuser
key: port
- name: POSTGRES_DB
valueFrom:
secretKeyRef:
name: pg-app
key: PGDATABASE
- name: S3_BUCKET_ENDPOINT
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_endpoint
- name: S3_BUCKET_NAME
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_name
- name: S3_BUCKET_REGION
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_region
- name: S3_BUCKET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_access_key
- name: S3_BUCKET_SECRET_KEY
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_secret_key
- name: S3_BUCKET_ROOT_DIR
value: review-branch/{{ .Values.global.branchSlug32 }}/files
61 changes: 61 additions & 0 deletions .kontinuous/env/preprod/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
global:
s3SecretName: vao-dev-app-access-key

maildev: {}

backend:
vars:
S3_BUCKET_ROOT_DIR: preprod/files

pgweb:
~chart: pgweb
pgweb:
Expand Down Expand Up @@ -39,3 +46,57 @@ jobs:
NUXT_PUBLIC_APP_VERSION: "{{ .Values.global.gitBranch }}"
NUXT_PUBLIC_ENVIRONMENT: "preprod"
NUXT_PUBLIC_SENTRY_ENABLED: "true"
migrations-db:
env:
- name: PG_VAO_SUPERUSER
valueFrom:
secretKeyRef:
name: pg-superuser
key: user
- name: PG_VAO_SUPERPASSWORD
valueFrom:
secretKeyRef:
name: pg-superuser
key: password
- name: POSTGRES_HOST
valueFrom:
secretKeyRef:
name: pg-superuser
key: host
- name: POSTGRES_PORT
valueFrom:
secretKeyRef:
name: pg-superuser
key: port
- name: POSTGRES_DB
valueFrom:
secretKeyRef:
name: pg-app
key: PGDATABASE
- name: S3_BUCKET_ENDPOINT
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_endpoint
- name: S3_BUCKET_NAME
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_name
- name: S3_BUCKET_REGION
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_region
- name: S3_BUCKET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_access_key
- name: S3_BUCKET_SECRET_KEY
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_secret_key
- name: S3_BUCKET_ROOT_DIR
value: preprod/files
60 changes: 60 additions & 0 deletions .kontinuous/env/prod/values.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
global:
s3SecretName: vao-prod-app-access-key

backend:
autoscale:
enabled: true
host: api-vao.social.gouv.fr
redirectFrom:
- "api-{{ .Values.global.host }}"
vars:
S3_BUCKET_ROOT_DIR: prod/files


frontend-usagers:
autoscale:
Expand Down Expand Up @@ -35,3 +41,57 @@ jobs:
NUXT_PUBLIC_BACKEND_URL: "https://api-vao.social.gouv.fr"
NUXT_PUBLIC_ENVIRONMENT: "production"
NUXT_PUBLIC_SENTRY_ENABLED: "true"
migrations-db:
env:
- name: PG_VAO_SUPERUSER
valueFrom:
secretKeyRef:
name: pg-superuser
key: user
- name: PG_VAO_SUPERPASSWORD
valueFrom:
secretKeyRef:
name: pg-superuser
key: password
- name: POSTGRES_HOST
valueFrom:
secretKeyRef:
name: pg-superuser
key: host
- name: POSTGRES_PORT
valueFrom:
secretKeyRef:
name: pg-superuser
key: port
- name: POSTGRES_DB
valueFrom:
secretKeyRef:
name: pg-app
key: PGDATABASE
- name: S3_BUCKET_ENDPOINT
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_endpoint
- name: S3_BUCKET_NAME
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_name
- name: S3_BUCKET_REGION
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_region
- name: S3_BUCKET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_access_key
- name: S3_BUCKET_SECRET_KEY
valueFrom:
secretKeyRef:
name: "{{.Values.global.s3SecretName}}"
key: bucket_secret_key
- name: S3_BUCKET_ROOT_DIR
value: prod/files
Loading

0 comments on commit 9c81a85

Please sign in to comment.