Merge branch 'main' into fix-homepage-container-flexibility

Author: OUMIMANDAL

.dockerignore

@@ -4,6 +4,7 @@ __pycache__
 .cache
 .dockerignore
 .env
+.env.*
 .envs
 .git
 .gitignore

backend/poetry.lock

@@ -44,7 +44,7 @@ requests = "^2.32.5"
 sentry-sdk = { extras = [ "django" ], version = "^2.20.0" }
 slack-bolt = "^1.22.0"
 slack-sdk = "^3.35.0"
-strawberry-graphql = { extras = [ "django" ], version = "^0.280.0" }
+strawberry-graphql = { extras = [ "django" ], version = "^0.281.0" }
 strawberry-graphql-django = "^0.65.1"
 thefuzz = "^0.22.1"
 

backend/pyproject.toml

@@ -25,7 +25,6 @@ class Base(Configuration):
     IS_TEST_ENVIRONMENT = False
 
     RELEASE_VERSION = values.Value(environ_name="RELEASE_VERSION")
-    SENTRY_DSN = values.SecretValue(environ_name="SENTRY_DSN")
 
     SESSION_COOKIE_HTTPONLY = True
     SESSION_COOKIE_NAME = "nest.session-id"

backend/settings/base.py

@@ -10,7 +10,7 @@ class Production(Base):
     """Production configuration."""
 
     sentry_sdk.init(
-        dsn=Base.SENTRY_DSN,
+        dsn=values.SecretValue(environ_name="SENTRY_DSN"),
         environment=Base.ENVIRONMENT.lower(),
         profiles_sample_rate=0.5,
         release=Base.RELEASE_VERSION,

backend/settings/production.py

@@ -10,7 +10,7 @@ class Staging(Base):
     """Staging configuration."""
 
     sentry_sdk.init(
-        dsn=Base.SENTRY_DSN,
+        dsn=values.SecretValue(environ_name="SENTRY_DSN"),
         environment=Base.ENVIRONMENT.lower(),
         profiles_sample_rate=0.5,
         release=Base.RELEASE_VERSION,

backend/settings/staging.py

@@ -68,7 +68,7 @@ jest.mock('@fortawesome/react-fontawesome', () => ({
   }) => <span data-testid={`icon-${icon.iconName}`} className={className} {...props} />,
 }))
 
-jest.mock('utils/credentials', () => ({
+jest.mock('utils/env.client', () => ({
   IS_PROJECT_HEALTH_ENABLED: true,
 }))
 

frontend/__tests__/unit/components/CardDetailsPage.test.tsx

@@ -95,7 +95,7 @@ jest.mock('utils/constants', () => ({
   ],
 }))
 
-jest.mock('utils/credentials', () => ({
+jest.mock('utils/env.client', () => ({
   ENVIRONMENT: 'production',
   RELEASE_VERSION: '1.2.3',
 }))

frontend/__tests__/unit/components/Footer.test.tsx

@@ -15,8 +15,8 @@ jest.mock('next/navigation', () => ({
 jest.mock('@heroui/toast', () => ({
   addToast: jest.fn(),
 }))
-jest.mock('utils/credentials', () => ({
-  isGithubAuthEnabled: jest.fn(() => true),
+jest.mock('utils/env.server', () => ({
+  IS_GITHUB_AUTH_ENABLED: true,
 }))
 describe('LoginPage', () => {
   const pushMock = jest.fn()

frontend/__tests__/unit/pages/Login.test.tsx

@@ -53,7 +53,7 @@ COPY --from=builder --chown=root:root --chmod=555 /app/public public
 COPY --from=builder --chown=root:root --chmod=555  /app/.next/standalone .
 
 # Create cache directory and assign ownership to nextjs user with write permission, so that cache can be stored.
-RUN mkdir -p /app/.next/cache && chown -R nextjs:nodejs /app/.next/cache && chmod -R 755 /app/.next/cache
+RUN mkdir -p /app/.next/cache && chown -R nextjs:nodejs /app/.next/cache && chmod -R 755 /app/.next/cache && rm .env
 COPY --from=builder --chown=root:root --chmod=555 /app/.next/static .next/static
 
 USER nextjs