Skip to content

Commit

Permalink
Merge branch 'main' into test/load-test-signup
Browse files Browse the repository at this point in the history
  • Loading branch information
k1g99 committed May 10, 2024
2 parents a7ed1d8 + 91c9bb4 commit 99d5383
Show file tree
Hide file tree
Showing 24 changed files with 10,066 additions and 12,646 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:

- name: Terraform Init
working-directory: ./apps/infra/deploy
run: terraform init
run: terraform init -upgrade

# TODO: plan in the other job, and reuse the plan file
- name: Terraform Plan
Expand Down
4 changes: 2 additions & 2 deletions apps/backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
### BUILDER ###
ARG target=client

FROM node:20.12.2-alpine AS builder
FROM node:20.13.0-alpine AS builder
ARG target

COPY . /build
Expand All @@ -18,7 +18,7 @@ RUN npx prisma generate
RUN npm run build ${target}

### PRODUCTION ###
FROM node:20.12.2-alpine
FROM node:20.13.0-alpine
ARG target

ENV NODE_ENV=production
Expand Down
30 changes: 15 additions & 15 deletions apps/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
},
"dependencies": {
"@apollo/server": "^4.10.4",
"@aws-sdk/client-s3": "^3.567.0",
"@aws-sdk/client-ses": "^3.567.0",
"@aws-sdk/credential-provider-node": "^3.567.0",
"@aws-sdk/client-s3": "^3.572.0",
"@aws-sdk/client-ses": "^3.572.0",
"@aws-sdk/credential-provider-node": "^3.572.0",
"@golevelup/nestjs-rabbitmq": "^5.3.0",
"@nestjs-modules/mailer": "^1.11.2",
"@nestjs/apollo": "^12.1.0",
Expand All @@ -36,16 +36,16 @@
"@nestjs/platform-express": "^10.3.8",
"@nestjs/swagger": "^7.3.1",
"@opentelemetry/api": "~1.8.0",
"@opentelemetry/exporter-metrics-otlp-http": "^0.51.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.51.0",
"@opentelemetry/exporter-metrics-otlp-http": "^0.51.1",
"@opentelemetry/exporter-trace-otlp-http": "^0.51.1",
"@opentelemetry/host-metrics": "^0.35.1",
"@opentelemetry/instrumentation-express": "^0.38.0",
"@opentelemetry/instrumentation-http": "^0.51.0",
"@opentelemetry/resources": "^1.24.0",
"@opentelemetry/sdk-metrics": "^1.24.0",
"@opentelemetry/sdk-node": "^0.51.0",
"@opentelemetry/sdk-trace-node": "^1.24.0",
"@opentelemetry/semantic-conventions": "^1.24.0",
"@opentelemetry/instrumentation-http": "^0.51.1",
"@opentelemetry/resources": "^1.24.1",
"@opentelemetry/sdk-metrics": "^1.24.1",
"@opentelemetry/sdk-node": "^0.51.1",
"@opentelemetry/sdk-trace-node": "^1.24.1",
"@opentelemetry/semantic-conventions": "^1.24.1",
"@prisma/client": "^5.13.0",
"@prisma/instrumentation": "~5.13.0",
"argon2": "^0.40.1",
Expand Down Expand Up @@ -76,7 +76,7 @@
"pino-pretty": "^11.0.0",
"reflect-metadata": "^0.2.1",
"sql-formatter": "^15.3.1",
"zod": "^3.23.5"
"zod": "^3.23.8"
},
"devDependencies": {
"@faker-js/faker": "^8.4.1",
Expand All @@ -85,12 +85,12 @@
"@nestjs/schematics": "^10.1.1",
"@nestjs/testing": "^10.3.8",
"@types/cache-manager": "^4.0.6",
"@types/chai": "^4.3.15",
"@types/chai": "^4.3.16",
"@types/chai-as-promised": "^7.1.8",
"@types/express": "^4.17.21",
"@types/graphql-upload": "8.0.12",
"@types/mocha": "^10.0.6",
"@types/node": "^20.12.8",
"@types/node": "^20.12.11",
"@types/nodemailer": "^6.4.15",
"@types/passport-jwt": "^4.0.1",
"@types/proxyquire": "^1.3.31",
Expand All @@ -102,7 +102,7 @@
"prisma": "^5.13.0",
"prisma-nestjs-graphql": "^20.0.2",
"proxyquire": "^2.1.3",
"sinon": "^17.0.1",
"sinon": "^17.0.2",
"source-map-support": "^0.5.21",
"ts-loader": "^9.5.1",
"ts-node": "^10.9.2",
Expand Down
38 changes: 19 additions & 19 deletions apps/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"compile": "graphql-codegen --require dotenv/config"
},
"dependencies": {
"@apollo/client": "^3.10.1",
"@apollo/client": "^3.10.3",
"@codemirror/lang-cpp": "^6.0.2",
"@codemirror/lang-java": "^6.0.1",
"@codemirror/lang-python": "^6.1.5",
"@codemirror/lang-python": "^6.1.6",
"@codemirror/state": "^6.4.1",
"@codemirror/view": "^6.26.3",
"@headlessui/react": "^1.7.19",
Expand All @@ -39,26 +39,26 @@
"@radix-ui/react-toast": "^1.1.5",
"@radix-ui/react-toggle": "^1.0.3",
"@radix-ui/react-tooltip": "^1.0.7",
"@sentry/nextjs": "^7.113.0",
"@sentry/nextjs": "^7.114.0",
"@tailwindcss/typography": "^0.5.13",
"@tanstack/react-query": "^5.32.1",
"@tanstack/react-query": "^5.35.1",
"@tanstack/react-table": "^8.16.0",
"@tiptap/core": "^2.3.0",
"@tiptap/extension-link": "^2.3.0",
"@tiptap/extension-placeholder": "^2.3.0",
"@tiptap/pm": "^2.3.0",
"@tiptap/react": "^2.3.0",
"@tiptap/starter-kit": "^2.3.0",
"@tiptap/core": "^2.3.2",
"@tiptap/extension-link": "^2.3.2",
"@tiptap/extension-placeholder": "^2.3.2",
"@tiptap/pm": "^2.3.2",
"@tiptap/react": "^2.3.2",
"@tiptap/starter-kit": "^2.3.2",
"@uiw/codemirror-extensions-langs": "^4.22.0",
"@uiw/codemirror-themes": "^4.22.0",
"@uiw/react-codemirror": "^4.22.0",
"apollo-upload-client": "^18.0.1",
"cmdk": "^0.2.1",
"cmdk": "^1.0.0",
"date-fns": "^3.6.0",
"dayjs": "^1.11.11",
"dotenv": "^16.4.5",
"embla-carousel-react": "8.0.2",
"framer-motion": "^11.1.7",
"embla-carousel-react": "8.0.4",
"framer-motion": "^11.1.9",
"graphql": "^16.8.1",
"isomorphic-dompurify": "^2.9.0",
"js-confetti": "^0.12.0",
Expand All @@ -70,14 +70,14 @@
"react": "^18.3.1",
"react-day-picker": "^8.10.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.51.3",
"react-icons": "^5.2.0",
"react-intersection-observer": "^9.10.1",
"react-hook-form": "^7.51.4",
"react-icons": "^5.2.1",
"react-intersection-observer": "^9.10.2",
"react-resizable-panels": "^2.0.19",
"react-use": "^17.5.0",
"sharp": "^0.33.3",
"sonner": "^1.4.41",
"zod": "^3.23.5",
"zod": "^3.23.8",
"zustand": "^4.5.2"
},
"devDependencies": {
Expand All @@ -87,15 +87,15 @@
"@graphql-typed-document-node/core": "^3.2.0",
"@types/apollo-upload-client": "^18.0.0",
"@types/katex": "^0.16.7",
"@types/node": "^20.12.8",
"@types/node": "^20.12.11",
"@types/react": "^18.3.1",
"@types/react-copy-to-clipboard": "^5.0.7",
"@types/react-dom": "^18.3.0",
"autoprefixer": "^10.4.19",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"eslint-config-next": "^14.2.3",
"lucide-react": "^0.377.0",
"lucide-react": "^0.378.0",
"postcss": "^8.4.38",
"tailwind-merge": "^2.3.0",
"tailwind-scrollbar-hide": "^1.1.7",
Expand Down
60 changes: 30 additions & 30 deletions apps/infra/deploy/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/infra/deploy/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "5.47.0"
version = "5.48.0"
}
}

Expand Down
60 changes: 30 additions & 30 deletions apps/infra/local/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/infra/local/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "5.47.0"
version = "5.48.0"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"name": "log_router",
"image": "grafana/fluent-bit-plugin-loki:2.0.0-amd64",
"cpu": 0,
"cpu": 100,
"memoryReservation": 50,
"portMappings": [],
"essential": true,
Expand All @@ -20,6 +20,8 @@
{
"name": "${task_name}",
"image": "${ecr_uri}",
"cpu": 924,
"memoryReservation": 512,
"essential": true,
"portMappings": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"name": "log_router",
"image": "grafana/fluent-bit-plugin-loki:2.0.0-amd64",
"cpu": 0,
"cpu": 100,
"memoryReservation": 50,
"portMappings": [],
"essential": true,
Expand All @@ -20,6 +20,8 @@
{
"name": "${task_name}",
"image": "${ecr_uri}",
"cpu": 924,
"memoryReservation": 512,
"essential": true,
"portMappings": [
{
Expand Down
Loading

0 comments on commit 99d5383

Please sign in to comment.