Add Preview deployments + Cloudfront distro (#6)

lukqw · lukqw · commit 3f608fe13dc7 · 2023-11-23T19:01:54.000+01:00
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -0,0 +1,38 @@
+name: Create PR Preview
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  preview:
+    permissions: write-all
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Deploy Preview
+        uses: LocalStack/setup-localstack/preview@main
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          localstack-api-key: ${{ secrets.LOCALSTACK_API_KEY }}
+          preview-cmd: |
+            npm install -g aws-cdk-local aws-cdk
+            pip install awscli-local[ver1]
+            make build
+            make bootstrap
+            make deploy
+            make prepare-frontend-local
+            make build-frontend
+            make bootstrap-frontend
+            make deploy-frontend
+            distributionId=$(awslocal cloudfront list-distributions | jq -r '.DistributionList.Items[0].Id')
+            echo "Open URL: $AWS_ENDPOINT_URL/cloudfront/$AWS_DEFAULT_REGION/$distributionId/"
+
+      - name: Finalize PR comment
+        uses: LocalStack/setup-localstack/finish@main
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          include-preview: true
diff --git a/README.md b/README.md
diff --git a/aws-sdk-js-notes.png b/aws-sdk-js-notes.png
diff --git a/images/aws-sdk-js-notes.png b/images/aws-sdk-js-notes.png
diff --git a/packages/backend/src/createNote.ts b/packages/backend/src/createNote.ts
@@ -5,6 +5,7 @@ import { success, failure } from "./libs/response";
 
 // eslint-disable-next-line no-unused-vars
 import { APIGatewayEvent } from "aws-lambda";
+import { endpoint } from "./libs/endpoint";
 
 export const handler = async (event: APIGatewayEvent) => {
   const data = JSON.parse(event.body || "{}");
@@ -19,7 +20,7 @@ export const handler = async (event: APIGatewayEvent) => {
   };
 
   try {
-    const client = new DynamoDBClient({});
+    const client = new DynamoDBClient({endpoint});
     await client.send(new PutItemCommand(params));
     return success(params.Item);
   } catch (e) {
diff --git a/packages/backend/src/deleteNote.ts b/packages/backend/src/deleteNote.ts
@@ -4,6 +4,7 @@ import { success, failure } from "./libs/response";
 
 // eslint-disable-next-line no-unused-vars
 import { APIGatewayEvent } from "aws-lambda";
+import { endpoint } from "./libs/endpoint";
 
 export const handler = async (event: APIGatewayEvent) => {
   const params = {
@@ -14,7 +15,7 @@ export const handler = async (event: APIGatewayEvent) => {
   };
 
   try {
-    const client = new DynamoDBClient({});
+    const client = new DynamoDBClient({endpoint});
     await client.send(new DeleteItemCommand(params));
     return success({ status: true });
   } catch (e) {
diff --git a/packages/backend/src/getNote.ts b/packages/backend/src/getNote.ts
@@ -4,6 +4,7 @@ import { success, failure } from "./libs/response";
 
 // eslint-disable-next-line no-unused-vars
 import { APIGatewayEvent } from "aws-lambda";
+import { endpoint } from "./libs/endpoint";
 
 export const handler = async (event: APIGatewayEvent) => {
   const params = {
@@ -14,7 +15,7 @@ export const handler = async (event: APIGatewayEvent) => {
   };
 
   try {
-    const client = new DynamoDBClient({});
+    const client = new DynamoDBClient({endpoint});
     const result = await client.send(new GetItemCommand(params));
     if (result.Item) {
       // Return the retrieved item
diff --git a/packages/backend/src/libs/endpoint.ts b/packages/backend/src/libs/endpoint.ts
@@ -0,0 +1 @@
+export const endpoint = process.env.AWS_ENDPOINT_URL || '';
diff --git a/packages/backend/src/listNotes.ts b/packages/backend/src/listNotes.ts
@@ -1,14 +1,16 @@
 import { DynamoDBClient, ScanCommand } from "@aws-sdk/client-dynamodb";
 import { unmarshall } from "@aws-sdk/util-dynamodb";
 import { success, failure } from "./libs/response";
+import { endpoint } from "./libs/endpoint";
 
 export const handler = async () => {
   const params = {
     TableName: process.env.NOTES_TABLE_NAME || "",
   };
 
+
   try {
-    const client = new DynamoDBClient({});
+    const client = new DynamoDBClient({endpoint});
     const result = await client.send(new ScanCommand(params));
     // Return the matching list of items in response body
     return success(result.Items.map((Item) => unmarshall(Item)));
diff --git a/packages/backend/src/updateNote.ts b/packages/backend/src/updateNote.ts
@@ -4,6 +4,7 @@ import { success, failure } from "./libs/response";
 
 // eslint-disable-next-line no-unused-vars
 import { APIGatewayEvent } from "aws-lambda";
+import { endpoint } from "./libs/endpoint";
 
 export const handler = async (event: APIGatewayEvent) => {
   const data = JSON.parse(event.body || "{}");
@@ -23,7 +24,7 @@ export const handler = async (event: APIGatewayEvent) => {
   };
 
   try {
-    const client = new DynamoDBClient({});
+    const client = new DynamoDBClient({endpoint});
     await client.send(new UpdateItemCommand(params));
     return success({ status: true });
   } catch (e) {
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -13,14 +13,14 @@
     "@aws-sdk/s3-request-presigner": "3.245.0",
     "@aws-sdk/util-create-request": "3.234.0",
     "@aws-sdk/util-format-url": "3.226.0",
-    "@reach/router": "1.3.4",
     "buffer": "6.0.3",
     "events": "^3.3.0",
     "microphone-stream": "6.0.1",
     "process": "0.11.10",
     "react": "18.2.0",
     "react-bootstrap": "1.4.0",
     "react-dom": "18.2.0",
+    "react-router-dom": "^6.20.0",
     "util": "^0.12.5"
   },
   "scripts": {
diff --git a/packages/frontend/src/Routes.tsx b/packages/frontend/src/Routes.tsx
@@ -1,20 +1,24 @@
-import React, { lazy, Suspense } from "react";
-import { Router } from "@reach/router";
+import React from "react";
+import { Suspense } from "react";
+import { BrowserRouter, Route, Routes as RouterRoutes } from "react-router-dom";
+import ListNotes from "./content/ListNotes";
+import CreateNote from "./content/CreateNote";
+import ShowNote from "./content/ShowNote";
+import NotFound from "./content/NotFound";
 
-const ListNotes = lazy(() => import("./content/ListNotes"));
-const CreateNote = lazy(() => import("./content/CreateNote"));
-const ShowNote = lazy(() => import("./content/ShowNote"));
-const NotFound = lazy(() => import("./content/NotFound"));
+import { BASE_URL } from "./config";
 
-const Routes = () => (
+const   Routes = () => (
   <div className="mt-md-4 d-flex flex-column justify-content-center">
     <Suspense fallback={<div>Loading...</div>}>
-      <Router>
-        <ListNotes path="/" />
-        <CreateNote path="/note/new" />
-        <ShowNote path="/notes/:noteId" />
-        <NotFound default />
-      </Router>
+      <BrowserRouter basename={BASE_URL}>
+        <RouterRoutes>
+          <Route path="/" element={<ListNotes/>} />
+          <Route path="/note/new" element={<CreateNote/>} />
+          <Route path="/notes/:noteId" element={<ShowNote/>} />
+          <Route element={<NotFound/>} />
+        </RouterRoutes>
+      </BrowserRouter>
     </Suspense>
   </div>
 );
diff --git a/packages/frontend/src/components/HomeButton.tsx b/packages/frontend/src/components/HomeButton.tsx
@@ -1,8 +1,10 @@
 import React from "react";
 import { Button } from "react-bootstrap";
+import { BASE_URL } from "../config";
+
 
 const HomeButton = () => (
-  <Button href="/" variant="light" className="border border-secondary">
+  <Button href={BASE_URL} variant="light" className="border border-secondary">
     &lt; Home
   </Button>
 );
diff --git a/packages/frontend/src/config.json b/packages/frontend/src/config.json
diff --git a/packages/frontend/src/config.tsx b/packages/frontend/src/config.tsx
@@ -0,0 +1,15 @@
+const getOrigin = () => {
+    const origin = window.location.origin;
+    if (origin.indexOf('localhost') !== -1) {
+        return 'http://localhost:4566';
+    }
+    return origin;
+}
+
+
+export const GATEWAY_URL = `${getOrigin()}/restapis/${import.meta.env.VITE_GATEWAY_ID}/prod/_user_request_/`;
+export const  MAX_FILE_SIZE = 500000;
+export const  FILES_BUCKET = import.meta.env.VITE_FILES_BUCKET;
+export const REGION = import.meta.env.VITE_REGION;
+export const IDENTITY_POOL_ID = import.meta.env.VITE_IDENTITY_POOL_ID;
+export const  BASE_URL =  import.meta.env.BASE_URL;
diff --git a/packages/frontend/src/content/CreateNote.tsx b/packages/frontend/src/content/CreateNote.tsx
@@ -1,16 +1,18 @@
 import React, { useState, FormEvent } from "react";
 import { Form, Button, Alert } from "react-bootstrap";
-import { navigate, RouteComponentProps } from "@reach/router";
-import { GATEWAY_URL, MAX_FILE_SIZE } from "../config.json";
+import { GATEWAY_URL, MAX_FILE_SIZE } from "../config";
 import { putObject } from "../libs";
 import { HomeButton, ButtonSpinner, PageContainer } from "../components";
+import { useNavigate } from "react-router-dom";
 
-const CreateNote = (props: RouteComponentProps) => {
+const CreateNote = (): JSX.Element => {
   const [isLoading, setIsLoading] = useState(false);
   const [errorMsg, setErrorMsg] = useState("");
   const [noteContent, setNoteContent] = useState("");
   const [file, setFile] = useState();
 
+  const navigate = useNavigate();
+
   const handleSubmit = async (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
 
diff --git a/packages/frontend/src/content/DeleteNoteButton.tsx b/packages/frontend/src/content/DeleteNoteButton.tsx
@@ -1,15 +1,17 @@
 import React, { useState } from "react";
 import { Button, Alert } from "react-bootstrap";
-import { GATEWAY_URL } from "../config.json";
-import { navigate } from "@reach/router";
+import { GATEWAY_URL } from "../config";
 import { deleteObject } from "../libs";
 import { ButtonSpinner } from "../components";
+import { useNavigate } from "react-router-dom";
 
 const DeleteNoteButton = (props: { noteId: string; attachment?: string }) => {
   const { noteId, attachment } = props;
   const [isDeleting, setIsDeleting] = useState(false);
   const [errorMsg, setErrorMsg] = useState("");
 
+  const navigate = useNavigate();
+
   const handleDelete = async (event: any) => {
     event.preventDefault();
     setIsDeleting(true);
diff --git a/packages/frontend/src/content/ListNotes.tsx b/packages/frontend/src/content/ListNotes.tsx
@@ -1,16 +1,16 @@
 import React, { useState, useEffect } from "react";
-import { Link, RouteComponentProps } from "@reach/router";
-import { GATEWAY_URL } from "../config.json";
+import { GATEWAY_URL } from "../config";
 import { Card, Alert, CardColumns, Button } from "react-bootstrap";
 import { Loading, PageContainer } from "../components";
+import { Link } from "react-router-dom";
 interface Note {
   noteId: string;
   createdAt: string;
   content: string;
   attachment: boolean;
 }
 
-const ListNotes = (props: RouteComponentProps) => {
+const ListNotes = (): JSX.Element => {
   const [isLoading, setIsLoading] = useState(true);
   const [errorMsg, setErrorMsg] = useState("");
   const [notes, setNotes] = useState([]);
diff --git a/packages/frontend/src/content/NotFound.tsx b/packages/frontend/src/content/NotFound.tsx
@@ -1,8 +1,6 @@
-import React from "react";
-import { RouteComponentProps } from "@reach/router";
 import { HomeButton, PageContainer } from "../components";
 
-const NotFound = (props: RouteComponentProps) => (
+const NotFound = (): JSX.Element => (
   <PageContainer header={<HomeButton />}>404 Page Not Found</PageContainer>
 );
 
diff --git a/packages/frontend/src/content/SaveNoteButton.tsx b/packages/frontend/src/content/SaveNoteButton.tsx
@@ -1,13 +1,15 @@
 import React, { useState } from "react";
 import { Button, Alert } from "react-bootstrap";
-import { GATEWAY_URL } from "../config.json";
-import { navigate } from "@reach/router";
+import { GATEWAY_URL } from "../config";
 import { ButtonSpinner } from "../components";
+import { useNavigate } from "react-router-dom";
 
 const SaveNoteButton = (props: { noteId: string; noteContent: string }) => {
   const [isSaving, setIsSaving] = useState(false);
   const [errorMsg, setErrorMsg] = useState("");
 
+  const navigate = useNavigate();
+
   const handleSave = async (event: any) => {
     event.preventDefault();
     setIsSaving(true);
diff --git a/packages/frontend/src/content/ShowNote.tsx b/packages/frontend/src/content/ShowNote.tsx
@@ -1,17 +1,18 @@
 import React, { useState, useEffect } from "react";
-import { RouteComponentProps, navigate } from "@reach/router";
 import { Form, Card } from "react-bootstrap";
-import { GATEWAY_URL } from "../config.json";
+import { GATEWAY_URL } from "../config";
 import { DeleteNoteButton, SaveNoteButton } from "./";
 import { getObjectUrl } from "../libs";
 import { HomeButton, Loading, PageContainer } from "../components";
+import { useNavigate, useParams } from "react-router-dom";
 
-const ShowNote = (props: RouteComponentProps<{ noteId: string }>) => {
-  const { noteId } = props;
+const ShowNote = () => {
+  const { noteId } = useParams<'noteId'>();
   const [isLoading, setIsLoading] = useState(true);
   const [noteContent, setNoteContent] = useState("");
   const [attachment, setAttachment] = useState("");
   const [attachmentURL, setAttachmentURL] = useState("");
+  const navigate = useNavigate();
 
   useEffect(() => {
     const fetchNote = async (noteId: string) => {
diff --git a/packages/frontend/src/libs/deleteObject.ts b/packages/frontend/src/libs/deleteObject.ts
@@ -1,5 +1,5 @@
 import { s3Client } from "./s3Client";
-import { FILES_BUCKET } from "../config.json";
+import { FILES_BUCKET } from "../config";
 import { DeleteObjectCommand } from "@aws-sdk/client-s3";
 
 const deleteObject = async (fileName: string) =>
diff --git a/packages/frontend/src/libs/getObjectUrl.ts b/packages/frontend/src/libs/getObjectUrl.ts
@@ -1,5 +1,5 @@
 import { s3Client } from "./s3Client";
-import { FILES_BUCKET } from "../config.json";
+import { FILES_BUCKET } from "../config";
 
 import { createRequest } from "@aws-sdk/util-create-request";
 import { GetObjectCommand } from "@aws-sdk/client-s3";
diff --git a/packages/frontend/src/libs/putObject.ts b/packages/frontend/src/libs/putObject.ts
@@ -1,5 +1,5 @@
 import { s3Client } from "./s3Client";
-import { FILES_BUCKET } from "../config.json";
+import { FILES_BUCKET } from "../config";
 import { PutObjectCommand } from "@aws-sdk/client-s3";
 
 const putObject = async (file: File) => {
diff --git a/packages/frontend/src/libs/s3Client.ts b/packages/frontend/src/libs/s3Client.ts
@@ -1,7 +1,7 @@
 import { S3Client } from "@aws-sdk/client-s3";
 import { fromCognitoIdentityPool } from "@aws-sdk/credential-provider-cognito-identity";
 import { CognitoIdentityClient } from "@aws-sdk/client-cognito-identity";
-import { IDENTITY_POOL_ID, REGION } from "../config.json";
+import { IDENTITY_POOL_ID, REGION } from "../config";
 
 const s3Client = new S3Client({
   region: REGION,
diff --git a/packages/frontend/tsconfig.json b/packages/frontend/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "target": "ESNext",
+    "types": ["vite/client"],
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
@@ -1,12 +1,17 @@
-import { defineConfig } from "vite";
+import { defineConfig, loadEnv } from "vite";
 import reactRefresh from "@vitejs/plugin-react-refresh";
 
 // https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [reactRefresh()],
-  resolve: {
-    alias: {
-      "./runtimeConfig": "./runtimeConfig.browser",
+export default ({mode}) => {
+  console.log(process.env.VITE_BASE_URL)
+  process.env = {...process.env, ...loadEnv(mode, process.cwd())};
+  return defineConfig({
+    plugins: [reactRefresh()],
+    base: process.env.VITE_BASE_URL,
+    resolve: {
+      alias: {
+        "./runtimeConfig": "./runtimeConfig.browser",
+      },
     },
-  },
-});
+  });
+}
diff --git a/packages/infra/cdk/aws-sdk-js-notes-app-frontend-stack.ts b/packages/infra/cdk/aws-sdk-js-notes-app-frontend-stack.ts
diff --git a/packages/infra/cdk/aws-sdk-js-notes-app-stack.ts b/packages/infra/cdk/aws-sdk-js-notes-app-stack.ts
diff --git a/packages/scripts/populate-frontend-config.js b/packages/scripts/populate-frontend-config.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export const endpoint = process.env.AWS_ENDPOINT_URL \|\| '';`