From 632a7e9cbbc0f81f57e9be7b3c9ceb49a22e25f1 Mon Sep 17 00:00:00 2001 From: Andreas Jonsson Date: Tue, 10 Oct 2023 18:50:12 +0200 Subject: [PATCH 1/7] Set cors to true --- vite.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vite.config.ts b/vite.config.ts index 8670cee08..9a5b9e7c2 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -43,7 +43,7 @@ export default defineConfig(({ command, mode }) => { port: 3000, host: "0.0.0.0", cors: { - origin: false, + origin: true, }, }, build: { From 74fb2342f561387d62d95bfb547922b4c16d97b9 Mon Sep 17 00:00:00 2001 From: Andreas Jonsson Date: Tue, 10 Oct 2023 19:10:10 +0200 Subject: [PATCH 2/7] Try setting custom CORS headers --- vite.config.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/vite.config.ts b/vite.config.ts index 9a5b9e7c2..8ce6cbab2 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -43,7 +43,14 @@ export default defineConfig(({ command, mode }) => { port: 3000, host: "0.0.0.0", cors: { - origin: true, + origin: "https://frontend-cypress-realworld-ap.dev.shipyardbuild.shipyard.host", + methods: "GET,HEAD,PUT,PATCH,POST,DELETE", + allowedHeaders: ["Content-Type", "Authorization"], + exposedHeaders: ["Content-Encoding"], + credentials: true, + maxAge: 86400, + preflightContinue: true, + optionsSuccessStatus: 204, }, }, build: { From 99623fd90528afbbdebae3e13028a44069a0c574 Mon Sep 17 00:00:00 2001 From: Andreas Jonsson Date: Tue, 10 Oct 2023 19:27:01 +0200 Subject: [PATCH 3/7] Cors should be on api service + disable api watch mode --- backend/app.ts | 6 +++++- package.json | 2 +- vite.config.ts | 10 ---------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/backend/app.ts b/backend/app.ts index ab13ede7a..8f35e7df5 100644 --- a/backend/app.ts +++ b/backend/app.ts @@ -28,8 +28,12 @@ import { frontendPort, getBackendPort } from "../src/utils/portUtils"; require("dotenv").config(); const corsOption = { - origin: process.env.SHIPYARD_DOMAIN_FRONTEND ? `https://${process.env.SHIPYARD_DOMAIN_FRONTEND}` : `http://localhost:${frontendPort}`, + origin: "https://frontend-cypress-realworld-ap.dev.shipyardbuild.shipyard.host", + methods: "GET,HEAD,PUT,PATCH,POST,DELETE", + allowedHeaders: ["Content-Type", "Authorization"], + exposedHeaders: ["Content-Encoding"], credentials: true, + preflightContinue: true, }; const schema = loadSchemaSync(join(__dirname, "./graphql/schema.graphql"), { diff --git a/package.json b/package.json index 08d4b1b95..8668703ec 100644 --- a/package.json +++ b/package.json @@ -148,7 +148,7 @@ "dev:coverage": "cross-env NODE_ENV=development CYPRESS_COVERAGE=true concurrently yarn:start:react yarn:start:api:watch", "dev:google": "cross-env VITE_GOOGLE=true NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch", "dev:okta": "cross-env VITE_OKTA=true NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch", - "dev": "cross-env NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch", + "dev": "cross-env NODE_ENV=development concurrently yarn:start:react yarn:start:api", "postdb:seed": "yarn db:seed:dev", "postinstall": "husky install && patch-package", "prebuild:ci": "yarn predev:cognito:ci", diff --git a/vite.config.ts b/vite.config.ts index 8ce6cbab2..ea2efdccc 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -42,16 +42,6 @@ export default defineConfig(({ command, mode }) => { server: { port: 3000, host: "0.0.0.0", - cors: { - origin: "https://frontend-cypress-realworld-ap.dev.shipyardbuild.shipyard.host", - methods: "GET,HEAD,PUT,PATCH,POST,DELETE", - allowedHeaders: ["Content-Type", "Authorization"], - exposedHeaders: ["Content-Encoding"], - credentials: true, - maxAge: 86400, - preflightContinue: true, - optionsSuccessStatus: 204, - }, }, build: { outDir: "build", From 9b30bd8f256049334d7f12d4c70fd83562c9031f Mon Sep 17 00:00:00 2001 From: Andreas Jonsson Date: Tue, 10 Oct 2023 20:17:49 +0200 Subject: [PATCH 4/7] Update to the correct hardcoded url --- backend/app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app.ts b/backend/app.ts index 8f35e7df5..f0ee45e94 100644 --- a/backend/app.ts +++ b/backend/app.ts @@ -28,7 +28,7 @@ import { frontendPort, getBackendPort } from "../src/utils/portUtils"; require("dotenv").config(); const corsOption = { - origin: "https://frontend-cypress-realworld-ap.dev.shipyardbuild.shipyard.host", + origin: "https://frontend-cypress-realworld-app-cypress-realworld-ap-pr1.dev.shipyardbuild.shipyard.host", methods: "GET,HEAD,PUT,PATCH,POST,DELETE", allowedHeaders: ["Content-Type", "Authorization"], exposedHeaders: ["Content-Encoding"], From b73282e0a99a266b4012c28f1eddc91be0d3cb2d Mon Sep 17 00:00:00 2001 From: Andreas Jonsson Date: Tue, 10 Oct 2023 20:38:06 +0200 Subject: [PATCH 5/7] No /api basepath --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a64431b73..b96a9e27b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: build: context: '.' labels: - shipyard.route: '/api' + shipyard.route: '/' environment: SHIPYARD_DOMAIN_FRONTEND: ${SHIPYARD_DOMAIN_FRONTEND-} ports: From c3c1e23048b2c79c43662b903baccc5e73c0571f Mon Sep 17 00:00:00 2001 From: Andreas Jonsson Date: Tue, 10 Oct 2023 21:31:05 +0200 Subject: [PATCH 6/7] Disable cors --- backend/app.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/backend/app.ts b/backend/app.ts index f0ee45e94..69b2089b8 100644 --- a/backend/app.ts +++ b/backend/app.ts @@ -28,12 +28,7 @@ import { frontendPort, getBackendPort } from "../src/utils/portUtils"; require("dotenv").config(); const corsOption = { - origin: "https://frontend-cypress-realworld-app-cypress-realworld-ap-pr1.dev.shipyardbuild.shipyard.host", - methods: "GET,HEAD,PUT,PATCH,POST,DELETE", - allowedHeaders: ["Content-Type", "Authorization"], - exposedHeaders: ["Content-Encoding"], - credentials: true, - preflightContinue: true, + origin: false, }; const schema = loadSchemaSync(join(__dirname, "./graphql/schema.graphql"), { From 170cf5f32c22c88b5d78a7d6569a2bad8295eb6a Mon Sep 17 00:00:00 2001 From: Andreas Jonsson Date: Thu, 19 Oct 2023 17:17:35 +0200 Subject: [PATCH 7/7] liveness+readiness testing --- docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index b96a9e27b..56b750cf9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,13 @@ services: labels: shipyard.route: '/' shipyard.primary-route: 'true' + shipyard.liveness.http.path: '/health' + shipyard.liveness.initial_delay: '15' + shipyard.liveness.period: '15' + shipyard.readiness.http.path: '/health' + shipyard.readiness.initial_delay: '10' + shipyard.liveness.timeout_seconds: 15 + shipyard.readiness.period: '15' environment: SHIPYARD_DOMAIN_BACKEND: ${SHIPYARD_DOMAIN_BACKEND-} ports: