From 90c86de468ff6420e1ac0c1af948238e66e01702 Mon Sep 17 00:00:00 2001 From: Dinushkasam Date: Fri, 12 Apr 2024 14:38:41 +0530 Subject: [PATCH 1/4] test environment --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5574a12..1246ded 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,7 @@ jobs: docker: name: Docker Build and Push runs-on: ubuntu-latest + environment: prod steps: - name: Checkout From 5a1d6938f58ef81906e52d6eb809b47f6967c006 Mon Sep 17 00:00:00 2001 From: Dinushkasam Date: Fri, 12 Apr 2024 16:01:58 +0530 Subject: [PATCH 2/4] err --- index.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/index.js b/index.js index 3eb0751..12465fc 100755 --- a/index.js +++ b/index.js @@ -1,16 +1,16 @@ -import express from "express"; -import dotenv from "dotenv"; -import cors from "cors"; -import bodyParser from "body-parser"; -import findConfig from "find-config"; -import colors from "colors"; -import connectDB from "./src/configs/database.js"; -import contentRoutes from "./src/routes/contentRoutes.js"; -import categoryRoutes from "./src/routes/categoryRoutes.js"; -import { notFound, errorHandler } from "./src/middleware/errorMiddleware.js"; - -if (process.env.NODE_ENV !== "production") { - dotenv.config({ path: findConfig(".env.dev") }); +import express from 'express'; +import dotenv from 'dotenv'; +import cors from 'cors'; +import bodyParser from 'body-parser'; +import findConfig from 'find-config'; +import colors from 'colors'; +import connectDB from './src/configs/database.js'; +import contentRoutes from './src/routes/contentRoutes.js'; +import categoryRoutes from './src/routes/categoryRoutes.js'; +// import { notFound, errorHandler } from "./src/middleware/errorMiddleware.js"; + +if (process.env.NODE_ENV !== 'production') { + dotenv.config({ path: findConfig('.env.dev') }); } connectDB(); @@ -20,17 +20,17 @@ const app = express(); app.use(cors()); app.use(bodyParser.json({ extended: true })); -app.use("/api/v1/content", contentRoutes); -app.use("/api/v1/category", categoryRoutes); +app.use('/api/v1/content', contentRoutes); +app.use('/api/v1/category', categoryRoutes); -app.use(notFound); -app.use(errorHandler); +// app.use(notFound); +// app.use(errorHandler); const PORT = process.env.PORT || 5000; -if (process.env.NODE_ENV !== "test") { - app.listen(PORT, () => { - console.log(`Server is running on port: ${PORT}`.yellow.bold); - }); +if (process.env.NODE_ENV !== 'test') { + app.listen(PORT, () => { + console.log(`Server is running on port: ${PORT}`.yellow.bold); + }); } export default app; From 3497a08a1249afcc1d2fa32b3e90025bcfdf1e19 Mon Sep 17 00:00:00 2001 From: Dinushkasam Date: Fri, 12 Apr 2024 16:09:52 +0530 Subject: [PATCH 3/4] landing message --- index.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/index.js b/index.js index 12465fc..c4b82b0 100755 --- a/index.js +++ b/index.js @@ -23,6 +23,11 @@ app.use(bodyParser.json({ extended: true })); app.use('/api/v1/content', contentRoutes); app.use('/api/v1/category', categoryRoutes); +// langing message for API +app.get('/', (req, res) => { + res.send('Welcome to Redstream Blog API'); +}); + // app.use(notFound); // app.use(errorHandler); From e08cd1949c08d4bbf6192fe4d66cc6599130fabc Mon Sep 17 00:00:00 2001 From: Navod <54998118+navodveduth@users.noreply.github.com> Date: Fri, 12 Apr 2024 23:19:15 +0530 Subject: [PATCH 4/4] Update branch name in CICD workflow --- .github/workflows/cicd-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml index 38aaad5..f92b802 100644 --- a/.github/workflows/cicd-workflow.yml +++ b/.github/workflows/cicd-workflow.yml @@ -2,7 +2,7 @@ name: AWS ECS Deployment CI/CD on: push: - branches: [dev] + branches: [prod] jobs: build-and-deploy: