Merge branch 'develop' into 'master'

briancaffey · briancaffey · commit 20dce9a00ff8 · 2020-10-25T20:17:34.000Z
Develop

See merge request verbose-equals-true/django-postgres-vue-gitlab-ecs!117
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ include:
   #     - backend/**/*
 
 .Jest:
-  image: node:12.16.3
+  image: node:12.19.0
   stage: test
   before_script:
     - cd quasar
diff --git a/README.md b/README.md
@@ -4,7 +4,6 @@ Documentation for this project can be found here:
 
 [https://verbose-equals-true.gitlab.io/django-postgres-vue-gitlab-ecs/](https://verbose-equals-true.gitlab.io/django-postgres-vue-gitlab-ecs/)
 
-
 ## Project Architecture Overview
 
 Here is an overview of the project architecture, including the CI/CD pipeline and the AWS infrastructure that will be automatically provisioned through the AWS Cloud Development Kit:
diff --git a/awscdk/setup.py b/awscdk/setup.py
@@ -15,32 +15,32 @@
     package_dir={"": "awscdk"},
     packages=setuptools.find_packages(where="awscdk"),
     install_requires=[
-        "aws-cdk.core==1.42.0",
-        "aws-cdk.aws_cloudformation==1.42.0",
-        "aws-cdk.aws_autoscaling==1.42.0",
-        "aws-cdk.aws_applicationautoscaling==1.42.0",
-        "aws-cdk.aws_certificatemanager==1.42.0",
-        "aws-cdk.aws_cloudwatch==1.42.0",
-        "aws-cdk.aws_logs==1.42.0",
-        "aws-cdk.aws_lambda==1.42.0",
-        "aws-cdk.aws_events==1.42.0",
-        "aws-cdk.aws_events_targets==1.42.0",
-        "aws-cdk.aws_secretsmanager==1.42.0",
-        "aws-cdk.aws_route53==1.42.0",
-        "aws-cdk.aws_s3==1.42.0",
-        "aws_cdk.aws_s3_deployment==1.42.0",
-        "aws-cdk.aws_cloudfront==1.42.0",
-        "aws-cdk.aws_route53_targets==1.42.0",
-        "aws-cdk.aws_ecr==1.42.0",
-        "aws-cdk.aws_ec2==1.42.0",
-        "aws-cdk.aws_rds==1.42.0",
-        "aws-cdk.aws_ssm==1.42.0",
-        "aws-cdk.aws_elasticache==1.42.0",
-        "aws-cdk.aws_elasticloadbalancingv2==1.42.0",
-        "aws-cdk.aws_ecs==1.42.0",
-        "aws-cdk.aws_ecs_patterns==1.42.0",
-        "aws-cdk.aws_autoscaling==1.42.0",
-        "aws-cdk.aws_sqs==1.42.0",
+        "aws-cdk.core==1.70.0",
+        "aws-cdk.aws_cloudformation==1.70.0",
+        "aws-cdk.aws_autoscaling==1.70.0",
+        "aws-cdk.aws_applicationautoscaling==1.70.0",
+        "aws-cdk.aws_certificatemanager==1.70.0",
+        "aws-cdk.aws_cloudwatch==1.70.0",
+        "aws-cdk.aws_logs==1.70.0",
+        "aws-cdk.aws_lambda==1.70.0",
+        "aws-cdk.aws_events==1.70.0",
+        "aws-cdk.aws_events_targets==1.70.0",
+        "aws-cdk.aws_secretsmanager==1.70.0",
+        "aws-cdk.aws_route53==1.70.0",
+        "aws-cdk.aws_s3==1.70.0",
+        "aws_cdk.aws_s3_deployment==1.70.0",
+        "aws-cdk.aws_cloudfront==1.70.0",
+        "aws-cdk.aws_route53_targets==1.70.0",
+        "aws-cdk.aws_ecr==1.70.0",
+        "aws-cdk.aws_ec2==1.70.0",
+        "aws-cdk.aws_rds==1.70.0",
+        "aws-cdk.aws_ssm==1.70.0",
+        "aws-cdk.aws_elasticache==1.70.0",
+        "aws-cdk.aws_elasticloadbalancingv2==1.70.0",
+        "aws-cdk.aws_ecs==1.70.0",
+        "aws-cdk.aws_ecs_patterns==1.70.0",
+        "aws-cdk.aws_autoscaling==1.70.0",
+        "aws-cdk.aws_sqs==1.70.0",
     ],
     python_requires=">=3.6",
     classifiers=[
diff --git a/backend/apps/banking/migrations/0005_auto_20200606_1325.py b/backend/apps/banking/migrations/0005_auto_20200606_1325.py
@@ -14,6 +14,9 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='statementfile',
             name='statement_file',
-            field=models.FileField(storage=backend.storage_backends.PrivateMediaStorage, upload_to='banking'),
+            field=models.FileField(
+                storage=backend.storage_backends.PrivateMediaStorage,
+                upload_to='banking',
+            ),
         ),
     ]
diff --git a/backend/apps/core/views.py b/backend/apps/core/views.py
@@ -2,7 +2,6 @@
 
 from django.conf import settings
 from django.http import JsonResponse
-from django.views.generic import TemplateView
 from rest_framework import viewsets
 from rest_framework.decorators import (
     api_view,
@@ -12,7 +11,7 @@
 
 
 from .utils.celery_utils import publish_celery_metrics
-from apps.core.tasks import debug_task, send_test_email_task, sleep_task
+from apps.core.tasks import send_test_email_task, sleep_task
 
 r = settings.REDIS
 
diff --git a/backend/requirements/base.txt b/backend/requirements/base.txt
@@ -1,23 +1,23 @@
-boto3==1.13.16
+boto3==1.16.4
 
-celery==4.4.2
-kombu==4.6.8
+celery==4.4.7
+kombu==4.6.11
 
 channels==2.4.0
 channels-redis==2.4.2
 
 daphne==2.5.0
 
-graphene-django==2.10.1
+graphene-django==2.13.0
 django-graphql-jwt==0.3.1
 
-Django==3.0.6
+Django==3.1.2
 django-filter==2.2.0
 djangorestframework==3.11.0
 djangorestframework_simplejwt==4.4.0
 django-debug-toolbar==2.2
 
-gevent==20.6.2
+gevent==20.9.0
 
 # Python Social Auth
 
@@ -26,18 +26,18 @@ social-auth-core==3.3.3
 
 # Django page caching is not working with this version of Redis
 # but this version is required by Celery
-django-redis==4.11.0
+django-redis==4.12.1
 
-django-storages==1.9.1
+django-storages==1.10.1
 
 # TODO: figure out why pandas is taking a long time to download
 # in cdk deploy step
 # pandas==0.24.2
 
 gunicorn==20.0.4
 
-psycopg2-binary==2.8.5
+psycopg2-binary==2.8.6
 
-redis==3.5.2
+redis==3.5.3
 
 requests==2.23.0
diff --git a/backend/requirements/dev.txt b/backend/requirements/dev.txt
@@ -1,6 +1,6 @@
 better_exceptions==0.2.2
 django-extensions==2.2.9  # NOTE: in installed_apps
 Werkzeug==1.0.1 # used for runserver_plus exception console
-ipython==7.14.0
+ipython==7.18.1
 jupyter==1.0.0
 gql==2.0.0
diff --git a/backend/requirements/test.txt b/backend/requirements/test.txt
@@ -1,8 +1,9 @@
 black==19.10b0
-pytest==5.4.2
-pytest-cov==2.8.1
-pytest-django==3.9.0
-factory_boy==2.12.0
-flake8==3.8.1
-flake8-isort==3.0.0
-coverage==5.1
+pytest==6.1.1
+pytest-cov==2.10.1
+pytest-django==4.1.0
+factory_boy==3.1.0
+flake8==3.8.4
+flake8-isort==4.0.0
+coverage==5.3
+pytest-profiling==1.7.0
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -148,9 +148,9 @@ services:
   flower:
     image: mher/flower
     container_name: flower
-    command: --url_prefix=flower --inspect_timeout=20000
+    command: flower --url_prefix=flower
     environment:
-      - CELERY_BROKER_URL=${CELERY_BROKER_URL}
+      - CELERY_BROKER_URL=redis://redis:6379
       - FLOWER_PORT=5555
     ports:
       - 5555:5555
diff --git a/documentation/package.json b/documentation/package.json
@@ -10,6 +10,6 @@
     "@vuepress/plugin-google-analytics": "1.5.0"
   },
   "devDependencies": {
-    "nodemon": "2.0.4"
+    "nodemon": "2.0.6"
   }
 }
diff --git a/gitlab-ci/aws/cdk.yml b/gitlab-ci/aws/cdk.yml
@@ -26,9 +26,6 @@
   services:
     - docker:19.03.5-dind
   stage: deploy
-  environment:
-    name: ${ENVIRONMENT}-${APP_NAME}
-    url: https://${ENVIRONMENT}.${DOMAIN_NAME}
   variables:
     DOCKER_TLS_CERTDIR: ""
   before_script:
@@ -43,7 +40,8 @@
 .base_task: &task
   image: python:3.8
   stage: deploy
-  when: manual
+  rules:
+    - when: manual
   before_script:
     - pip install awscli
     - apt-get -qq update && apt-get -y install jq
diff --git a/nginx/ci/Dockerfile b/nginx/ci/Dockerfile
@@ -9,7 +9,7 @@ COPY quasar /app/
 RUN quasar build -m pwa
 
 # ci stage
-FROM nginx:1.18.0-alpine as ci-stage
+FROM nginx:1.19.3-alpine as ci-stage
 COPY nginx/ci/ci.conf /etc/nginx/nginx.conf
 COPY --from=build-stage /app/dist/pwa /dist/
 EXPOSE 80
diff --git a/nginx/dev/Dockerfile b/nginx/dev/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.18.0-alpine
+FROM nginx:1.19.3-alpine
 COPY nginx/dev/dev.conf /etc/nginx/nginx.conf
 COPY backend/static /usr/src/app/static/
 EXPOSE 80
diff --git a/nginx/flowerproxy/Dockerfile b/nginx/flowerproxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.18.0-alpine
+FROM nginx:1.19.3-alpine
 COPY proxy.conf /etc/nginx/nginx.conf
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/nginx/minikube/Dockerfile b/nginx/minikube/Dockerfile
@@ -17,7 +17,7 @@ COPY quasar /app/
 RUN quasar build -m pwa
 
 # ci stage
-FROM nginx:1.18.0-alpine as ci-stage
+FROM nginx:1.19.3-alpine as ci-stage
 COPY nginx/minikube/minikube.conf /etc/nginx/nginx.conf
 COPY --from=build-stage /app/dist/pwa /dist/
 EXPOSE 80
diff --git a/quasar/Dockerfile b/quasar/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.16.3
+FROM node:12.19.0
 
 WORKDIR /app/
 
diff --git a/quasar/package.json b/quasar/package.json
@@ -11,32 +11,32 @@
     "test": "echo \"No test specified\" && exit 0"
   },
   "dependencies": {
-    "@quasar/extras": "1.8.1",
+    "@quasar/extras": "1.9.10",
     "apollo-cache-inmemory": "1.6.6",
-    "apollo-client": "2.6.9",
+    "apollo-client": "2.6.10",
     "apollo-link": "1.2.14",
     "apollo-link-context": "1.0.20",
     "apollo-link-http": "1.5.17",
-    "axios": "0.19.2",
+    "axios": "0.21.0",
     "emoji-mart-vue": "2.6.6",
-    "graphql": "15.0.0",
-    "graphql-tag": "2.10.3",
+    "graphql": "15.3.0",
+    "graphql-tag": "2.11.0",
     "highcharts": "8.1.0",
     "highcharts-vue": "1.3.5",
     "js-cookie": "2.2.1",
-    "prettier": "^2.0.5",
-    "quasar": "1.12.0",
+    "prettier": "2.0.5",
+    "quasar": "1.14.2",
     "vue-apollo": "3.0.3",
-    "vue-i18n": "8.17.4",
+    "vue-i18n": "8.22.1",
     "vue-native-websocket": "2.0.14"
   },
   "devDependencies": {
-    "@quasar/app": "1.9.0",
+    "@quasar/app": "1.9.6",
     "@vue/eslint-config-prettier": "6.0.0",
     "babel-eslint": "10.1.0",
-    "eslint": "5.16.0",
+    "eslint": "7.12.0",
     "eslint-loader": "4.0.2",
-    "eslint-plugin-prettier": "3.1.3",
+    "eslint-plugin-prettier": "3.1.4",
     "eslint-plugin-vue": "6.2.2"
   },
   "engines": {
diff --git a/quasar/src-electron/electron-flag.d.ts b/quasar/src-electron/electron-flag.d.ts
@@ -0,0 +1,9 @@
+// THIS FEATURE-FLAG FILE IS AUTOGENERATED,
+//  REMOVAL OR CHANGES WILL CAUSE RELATED TYPES TO STOP WORKING
+import "quasar/dist/types/feature-flag";
+
+declare module "quasar/dist/types/feature-flag" {
+  interface QuasarFeatureFlags {
+    electron: true;
+  }
+}
diff --git a/quasar/yarn.lock b/quasar/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@`
`10`	`10`	`"@vuepress/plugin-google-analytics": "1.5.0"`
`11`	`11`	`},`
`12`	`12`	`"devDependencies": {`
`13`		`- "nodemon": "2.0.4"`
	`13`	`+ "nodemon": "2.0.6"`
`14`	`14`	`}`
`15`	`15`	`}`