Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix postgres test env file, remove sign up confirm password input #2858

Merged
merged 2 commits into from
Jan 14, 2025
Merged

fix postgres test env file, remove sign up confirm password input #2858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7fc96e
fix postgres test devcontainer env file
xoldd Jan 14, 2025
f11e90d
remove confirmed password sign up input
xoldd Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"initializeCommand": "cp -n ./envFiles/.env.devcontainer ./.env",
"name": "talawa_api",
"overrideCommand": true,
"postCreateCommand": "sudo chown talawa:talawa ./.pnpm-store ./node_modules && fnm install && fnm use && corepack enable npm && corepack enable && corepack install && pnpm install --prod=false && pnpm push_drizzle_schema && pnpm start_development_server",
"postCreateCommand": "sudo chown talawa:talawa ./.pnpm-store ./node_modules && fnm install && fnm use && corepack enable npm && corepack enable && corepack install && pnpm install --prod=false && pnpm start_development_server",
"postStartCommand": "pnpm install --prod=false",
"remoteUser": "talawa",
"service": "api",
Expand Down
2 changes: 1 addition & 1 deletion docker/api.Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RUN curl -fsSL https://fnm.vercel.app/install | bash -s -- --skip-shell \
ENV PATH=/home/talawa/.local/share/fnm:${PATH}
WORKDIR /home/talawa/api

FROM node:22.12.0-bookworm-slim AS base
FROM node:22.13.0-bookworm-slim AS base
# Used to configure the group id for the group assigned to the non-root "talawa" user within the image.
ARG API_GID
# Used to configure the user id for the non-root "talawa" user within the image.
Expand Down
2 changes: 1 addition & 1 deletion envFiles/.env.devcontainer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,5 @@ POSTGRES_TEST_MAPPED_PORT=5433
########## docker compose ##########

COMPOSE_FILE=./compose.yaml:./docker/compose.testing.yaml:./docker/compose.devcontainer.yaml
COMPOSE_PROFILES=api,caddy,cloudbeaver,minio,minio_test,postgres,postgres-test
COMPOSE_PROFILES=api,caddy,cloudbeaver,minio,minio_test,postgres,postgres_test
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

⚠️ Inconsistent naming convention for PostgreSQL test service

The service is defined as postgres-test (with hyphen) in Docker Compose files, but COMPOSE_PROFILES uses postgres_test (with underscore). This mismatch should be fixed:

  • docker/compose.testing.yaml: Uses postgres-test
  • docker/compose.devcontainer.yaml: Uses postgres-test
  • envFiles/.env.devcontainer: Uses postgres_test
🔗 Analysis chain

Approved: Fix for postgres test environment configuration.

The change from postgres-test to postgres_test in COMPOSE_PROFILES aligns with the PR objective to fix the PostgreSQL test database configuration.

Let's verify the consistency of this naming convention:

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check if the service name matches in Docker Compose files
rg -l 'postgres[-_]test' docker/compose.*.yaml

Length of output: 148

Script:

#!/bin/bash
# Display the actual service definitions
rg -A 5 'postgres[-_]test:' docker/compose.*.yaml

Length of output: 2259

COMPOSE_PROJECT_NAME=talawa
22 changes: 11 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"dependencies": {
"@fastify/cors": "^10.0.2",
"@fastify/helmet": "^13.0.1",
"@fastify/jwt": "^9.0.2",
"@fastify/rate-limit": "^10.2.1",
"@fastify/jwt": "^9.0.3",
"@fastify/rate-limit": "^10.2.2",
"@fastify/type-provider-typebox": "^5.1.0",
"@node-rs/argon2": "^2.0.2",
"@pothos/core": "^4.3.0",
"@pothos/plugin-relay": "^4.3.0",
"@sinclair/typebox": "^0.34.13",
"ajv-formats": "^3.0.1",
"close-with-grace": "^2.1.0",
"close-with-grace": "^2.2.0",
"drizzle-orm": "^0.38.3",
"drizzle-zod": "0.6.1",
"env-schema": "^6.0.1",
Expand All @@ -23,7 +23,7 @@
"graphql": "^16.10.0",
"graphql-scalars": "^1.24.0",
"graphql-upload-minimal": "^1.6.1",
"mercurius": "^16.0.0",
"mercurius": "^16.0.1",
"mercurius-upload": "^8.0.0",
"minio": "^8.0.3",
"postgres": "^3.4.5",
Expand All @@ -35,23 +35,23 @@
"devDependencies": {
"@biomejs/biome": "^1.9.4",
"@faker-js/faker": "^9.3.0",
"@swc/cli": "0.5.2",
"@swc/core": "^1.10.6",
"@types/node": "^22.10.5",
"@swc/cli": "0.6.0",
"@swc/core": "^1.10.7",
"@types/node": "^22.10.6",
"@vitest/coverage-v8": "^2.1.8",
"drizzle-kit": "^0.30.1",
"drizzle-seed": "^0.3.0",
"gql.tada": "^1.8.10",
"lefthook": "^1.10.1",
"lefthook": "^1.10.4",
"mercurius-integration-testing": "^9.0.1",
"pino-pretty": "^13.0.0",
"tsx": "^4.19.2",
"typescript": "^5.7.2",
"typescript": "^5.7.3",
"vite-tsconfig-paths": "^5.1.4",
"vitest": "^2.1.8"
},
"engines": {
"node": "22.12.0"
"node": "22.13.0"
},
"homepage": "https://github.com/PalisadoesFoundation/talawa-api#readme",
"keywords": [
Expand All @@ -63,7 +63,7 @@
"license": "GNU General Public License v3.0",
"main": "./dist/index.js",
"name": "talawa-api",
"packageManager": "pnpm@9.15.3",
"packageManager": "pnpm@9.15.4",
"repository": {
"type": "git",
"url": "https://github.com/PalisadoesFoundation/talawa-api"
Expand Down
Loading
Loading