updates

Author: mjhea0

README.md

@@ -3,7 +3,7 @@ version: 0.2
 env:
   variables:
     AWS_REGION: "us-west-1"
-    REACT_APP_USERS_SERVICE_URL: "flask-react-alb-288140227.us-west-1.elb.amazonaws.com"
+    REACT_APP_API_SERVICE_URL: "http://flask-react-alb-828458753.us-west-1.elb.amazonaws.com"
 
 phases:
   install:
@@ -27,19 +27,19 @@ phases:
     commands:
       - echo building and testing dev images...
       - docker-compose up -d --build
-      - docker-compose exec -T users python -m pytest "project/tests" -p no:warnings --cov="project"
-      - docker-compose exec -T users flake8 project
-      - docker-compose exec -T users black project --check
-      - docker-compose exec -T users /bin/sh -c "isort project/*/*.py --check-only"
+      - docker-compose exec -T api python -m pytest "src/tests" -p no:warnings --cov="src"
+      - docker-compose exec -T api flake8 src
+      - docker-compose exec -T api black src --check
+      - docker-compose exec -T api isort src --check-only
       - docker-compose exec -T client npm run lint
       - docker-compose exec -T client npm run prettier:check
       - docker-compose exec -T client npm run prettier:write
       - echo building prod images...
       - >
         docker build \
-          --cache-from $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-users:$DOCKER_TAG  \
+          --cache-from $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-users:$DOCKER_TAG \
           -f services/users/Dockerfile.prod \
-          -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-users:$DOCKER_TAG  \
+          -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-users:$DOCKER_TAG \
           ./services/users
       - >
         docker build \
@@ -48,13 +48,13 @@ phases:
           -f services/client/Dockerfile.prod \
           -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:builder \
           --build-arg NODE_ENV=production \
-          --build-arg REACT_APP_USERS_SERVICE_URL=$REACT_APP_USERS_SERVICE_URL \
+          --build-arg REACT_APP_API_SERVICE_URL=$REACT_APP_API_SERVICE_URL \
           ./services/client
       - >
         docker build \
-          --cache-from $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:$DOCKER_TAG  \
+          --cache-from $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:$DOCKER_TAG \
           -f services/client/Dockerfile.prod \
-          -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:$DOCKER_TAG  \
+          -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/test-driven-client:$DOCKER_TAG \
           ./services/client
   post_build:
     commands:

buildspec.yml

@@ -1,25 +1,25 @@
-version: '3.7'
+version: '3.8'
 
 services:
 
-  users:
+  api:
     build:
       context: ./services/users
       dockerfile: Dockerfile.prod
     ports:
-      - 5001:5000
+      - 5004:5000
     environment:
       - FLASK_ENV=production
-      - APP_SETTINGS=project.config.ProductionConfig
-      - DATABASE_URL=postgres://postgres:postgres@users-db:5432/users_prod
-      - DATABASE_TEST_URL=postgres://postgres:postgres@users-db:5432/users_test
+      - APP_SETTINGS=src.config.ProductionConfig
+      - DATABASE_URL=postgres://postgres:postgres@api-db:5432/api_prod
+      - DATABASE_TEST_URL=postgres://postgres:postgres@api-db:5432/api_test
       - SECRET_KEY=my_precious
     depends_on:
-      - users-db
+      - api-db
 
-  users-db:
+  api-db:
     build:
-      context: ./services/users/project/db
+      context: ./services/users/src/db
       dockerfile: Dockerfile
     expose:
       - 5432
@@ -33,8 +33,8 @@ services:
       dockerfile: Dockerfile.prod
       args:
         - NODE_ENV=production
-        - REACT_APP_USERS_SERVICE_URL=${REACT_APP_USERS_SERVICE_URL}
+        - REACT_APP_API_SERVICE_URL=${REACT_APP_API_SERVICE_URL}
     ports:
       - 3007:80
     depends_on:
-      - users
+      - api

docker-compose.prod.yml

@@ -1,27 +1,27 @@
-version: '3.7'
+version: '3.8'
 
 services:
 
-  users:
+  api:
     build:
       context: ./services/users
       dockerfile: Dockerfile
     entrypoint: ['/usr/src/app/entrypoint.sh']
     volumes:
       - './services/users:/usr/src/app'
     ports:
-      - 5001:5000
+      - 5004:5000
     environment:
       - FLASK_ENV=development
-      - APP_SETTINGS=project.config.DevelopmentConfig
-      - DATABASE_URL=postgresql://postgres:postgres@users-db:5432/users_dev
-      - DATABASE_TEST_URL=postgresql://postgres:postgres@users-db:5432/users_test
+      - APP_SETTINGS=src.config.DevelopmentConfig
+      - DATABASE_URL=postgresql://postgres:postgres@api-db:5432/api_dev
+      - DATABASE_TEST_URL=postgresql://postgres:postgres@api-db:5432/api_test
     depends_on:
-      - users-db
+      - api-db
 
-  users-db:
+  api-db:
     build:
-      context: ./services/users/project/db
+      context: ./services/users/src/db
       dockerfile: Dockerfile
     expose:
       - 5432
@@ -30,6 +30,7 @@ services:
       - POSTGRES_PASSWORD=postgres
 
   client:
+    stdin_open: true
     build:
       context: ./services/client
       dockerfile: Dockerfile
@@ -40,6 +41,6 @@ services:
       - 3007:3000
     environment:
       - NODE_ENV=development
-      - REACT_APP_USERS_SERVICE_URL=${REACT_APP_USERS_SERVICE_URL}
+      - REACT_APP_API_SERVICE_URL=${REACT_APP_API_SERVICE_URL}
     depends_on:
-      - users
+      - api

docker-compose.yml

@@ -15,11 +15,11 @@
       "environment": [
         {
           "name": "APP_SETTINGS",
-          "value": "project.config.ProductionConfig"
+          "value": "src.config.ProductionConfig"
         },
         {
           "name": "DATABASE_TEST_URL",
-          "value": "postgres://postgres:postgres@users-db:5432/users_test"
+          "value": "postgres://postgres:postgres@api-db:5432/api_test"
         },
         {
           "name": "DATABASE_URL",

ecs/ecs_users_taskdefinition.json

@@ -1,35 +1,35 @@
 {
-  "parser": "babel-eslint",
-  "parserOptions": {
-    "ecmaVersion": 2018,
-    "ecmaFeatures": {
-      "jsx": true
+    "parser": "babel-eslint",
+    "parserOptions": {
+      "ecmaVersion": 2018,
+      "ecmaFeatures": {
+        "jsx": true
+      },
+      "sourceType": "module"
     },
-    "sourceType": "module"
-  },
-  "settings": {
-    "react": {
-      "version": "16.0"
-    }
-  },
-  "plugins": [
-    "react"
-  ],
+    "settings": {
+      "react": {
+        "version": "16.0"
+      }
+    },
+    "plugins": [
+      "react"
+    ],
 
-  "extends": [
-    "standard-jsx"
-  ],
-  "rules": {
-    "react/jsx-no-bind": ["error", {
-      "allowArrowFunctions": true,
-      "allowBind": false,
-      "ignoreRefs": true
-    }],
-    "react/no-did-update-set-state": "error",
-    "react/no-unknown-property": "error",
-    "react/no-unused-prop-types": "error",
-    "react/react-in-jsx-scope": "error",
-    "jsx-quotes": "off",
-    "react/jsx-indent": "off"
+    "extends": [
+      "standard-jsx"
+    ],
+    "rules": {
+      "react/jsx-no-bind": ["error", {
+        "allowArrowFunctions": true,
+        "allowBind": false,
+        "ignoreRefs": true
+      }],
+      "react/no-did-update-set-state": "error",
+      "react/no-unknown-property": "error",
+      "react/no-unused-prop-types": "error",
+      "react/react-in-jsx-scope": "error",
+      "jsx-quotes": "off",
+      "react/jsx-indent": "off"
+    }
   }
-}

services/client/.eslintrc.json

@@ -1,5 +1,5 @@
 # pull official base image
-FROM node:13.10.1-alpine
+FROM node:15.2.0-alpine
 
 # set working directory
 WORKDIR /usr/src/app
@@ -8,10 +8,10 @@ WORKDIR /usr/src/app
 ENV PATH /usr/src/app/node_modules/.bin:$PATH
 
 # install and cache app dependencies
-COPY package.json /usr/src/app/package.json
-COPY package-lock.json /usr/src/app/package-lock.json
+COPY package.json .
+COPY package-lock.json .
 RUN npm ci
-RUN npm install react-scripts@3.4.0 -g --silent
+RUN npm install react-scripts@4.0.0 [email protected] [email protected].0 -g --silent
 
 # start app
 CMD ["npm", "start"]

services/client/Dockerfile

@@ -2,8 +2,8 @@
 # BUILDER #
 ###########
 
-# base image
-FROM node:13.10.1-alpine as builder
+# pull official base image
+FROM node:15.2.0-alpine as builder
 
 # set working directory
 WORKDIR /usr/src/app
@@ -12,19 +12,20 @@ WORKDIR /usr/src/app
 ENV PATH /usr/src/app/node_modules/.bin:$PATH
 
 # install and cache app dependencies
-COPY package.json /usr/src/app/package.json
-COPY package-lock.json /usr/src/app/package-lock.json
+COPY package.json .
+COPY package-lock.json .
 RUN npm ci
-RUN npm install [email protected] -g --silent
+RUN npm install [email protected] --silent
+
 
 # set environment variables
-ARG REACT_APP_USERS_SERVICE_URL
-ENV REACT_APP_USERS_SERVICE_URL $REACT_APP_USERS_SERVICE_URL
+ARG REACT_APP_API_SERVICE_URL
+ENV REACT_APP_API_SERVICE_URL $REACT_APP_API_SERVICE_URL
 ARG NODE_ENV
 ENV NODE_ENV $NODE_ENV
 
 # create build
-COPY . /usr/src/app
+COPY . .
 RUN npm run build
 
 
@@ -33,7 +34,7 @@ RUN npm run build
 #########
 
 # base image
-FROM nginx:1.17.9-alpine
+FROM nginx:1.19.4-alpine
 
 # update nginx conf
 RUN rm -rf /etc/nginx/conf.d

services/client/Dockerfile.prod

@@ -1,33 +1,35 @@
+# Getting Started with Create React App
+
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
 
 ## Available Scripts
 
 In the project directory, you can run:
 
-### `yarn start`
+### `npm start`
 
-Runs the app in the development mode.<br />
+Runs the app in the development mode.\
 Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
 
-The page will reload if you make edits.<br />
+The page will reload if you make edits.\
 You will also see any lint errors in the console.
 
-### `yarn test`
+### `npm test`
 
-Launches the test runner in the interactive watch mode.<br />
+Launches the test runner in the interactive watch mode.\
 See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
 
-### `yarn build`
+### `npm run build`
 
-Builds the app for production to the `build` folder.<br />
+Builds the app for production to the `build` folder.\
 It correctly bundles React in production mode and optimizes the build for the best performance.
 
-The build is minified and the filenames include the hashes.<br />
+The build is minified and the filenames include the hashes.\
 Your app is ready to be deployed!
 
 See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
 
-### `yarn eject`
+### `npm run eject`
 
 **Note: this is a one-way operation. Once you `eject`, you can’t go back!**
 
@@ -45,24 +47,24 @@ To learn React, check out the [React documentation](https://reactjs.org/).
 
 ### Code Splitting
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
+This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
 
 ### Analyzing the Bundle Size
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
+This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
 
 ### Making a Progressive Web App
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
+This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
 
 ### Advanced Configuration
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
+This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
 
 ### Deployment
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
+This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
 
-### `yarn build` fails to minify
+### `npm run build` fails to minify
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
+This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)