From 38909c6407f6c4e88934fd6f70d945b05288cf1a Mon Sep 17 00:00:00 2001 From: Trevor Roberts Jr Date: Mon, 13 Apr 2020 17:21:16 -0400 Subject: [PATCH 1/3] Updated flask-cors to address Issue #21 --- workshop-1/app/like-service/service/requirements.txt | 2 +- workshop-1/app/monolith-service/service/requirements.txt | 2 +- workshop-2/app/like-service/service/requirements.txt | 2 +- workshop-2/app/monolith-service/service/requirements.txt | 2 +- workshop-2/ws3-start/app/like-service/service/requirements.txt | 2 +- .../ws3-start/app/monolith-service/service/requirements.txt | 2 +- workshop-3/app/like-service/service/requirements.txt | 2 +- workshop-3/app/monolith-service/service/requirements.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/workshop-1/app/like-service/service/requirements.txt b/workshop-1/app/like-service/service/requirements.txt index 38c4bfa..04dd396 100644 --- a/workshop-1/app/like-service/service/requirements.txt +++ b/workshop-1/app/like-service/service/requirements.txt @@ -1,3 +1,3 @@ Flask==0.12.2 -flask-cors==3.0.0 +flask-cors==3.0.8 requests==1.2.3 diff --git a/workshop-1/app/monolith-service/service/requirements.txt b/workshop-1/app/monolith-service/service/requirements.txt index 46ec477..d4e24a5 100644 --- a/workshop-1/app/monolith-service/service/requirements.txt +++ b/workshop-1/app/monolith-service/service/requirements.txt @@ -1,3 +1,3 @@ Flask==0.12.2 -flask-cors==3.0.0 +flask-cors==3.0.8 boto3==1.7.16 diff --git a/workshop-2/app/like-service/service/requirements.txt b/workshop-2/app/like-service/service/requirements.txt index 38c4bfa..04dd396 100644 --- a/workshop-2/app/like-service/service/requirements.txt +++ b/workshop-2/app/like-service/service/requirements.txt @@ -1,3 +1,3 @@ Flask==0.12.2 -flask-cors==3.0.0 +flask-cors==3.0.8 requests==1.2.3 diff --git a/workshop-2/app/monolith-service/service/requirements.txt b/workshop-2/app/monolith-service/service/requirements.txt index 46ec477..d4e24a5 100644 --- a/workshop-2/app/monolith-service/service/requirements.txt +++ b/workshop-2/app/monolith-service/service/requirements.txt @@ -1,3 +1,3 @@ Flask==0.12.2 -flask-cors==3.0.0 +flask-cors==3.0.8 boto3==1.7.16 diff --git a/workshop-2/ws3-start/app/like-service/service/requirements.txt b/workshop-2/ws3-start/app/like-service/service/requirements.txt index 38c4bfa..04dd396 100644 --- a/workshop-2/ws3-start/app/like-service/service/requirements.txt +++ b/workshop-2/ws3-start/app/like-service/service/requirements.txt @@ -1,3 +1,3 @@ Flask==0.12.2 -flask-cors==3.0.0 +flask-cors==3.0.8 requests==1.2.3 diff --git a/workshop-2/ws3-start/app/monolith-service/service/requirements.txt b/workshop-2/ws3-start/app/monolith-service/service/requirements.txt index 46ec477..d4e24a5 100644 --- a/workshop-2/ws3-start/app/monolith-service/service/requirements.txt +++ b/workshop-2/ws3-start/app/monolith-service/service/requirements.txt @@ -1,3 +1,3 @@ Flask==0.12.2 -flask-cors==3.0.0 +flask-cors==3.0.8 boto3==1.7.16 diff --git a/workshop-3/app/like-service/service/requirements.txt b/workshop-3/app/like-service/service/requirements.txt index 38c4bfa..04dd396 100755 --- a/workshop-3/app/like-service/service/requirements.txt +++ b/workshop-3/app/like-service/service/requirements.txt @@ -1,3 +1,3 @@ Flask==0.12.2 -flask-cors==3.0.0 +flask-cors==3.0.8 requests==1.2.3 diff --git a/workshop-3/app/monolith-service/service/requirements.txt b/workshop-3/app/monolith-service/service/requirements.txt index 46ec477..d4e24a5 100755 --- a/workshop-3/app/monolith-service/service/requirements.txt +++ b/workshop-3/app/monolith-service/service/requirements.txt @@ -1,3 +1,3 @@ Flask==0.12.2 -flask-cors==3.0.0 +flask-cors==3.0.8 boto3==1.7.16 From ef1209b5349a94b6b444be9bdbd78a6df8563b1d Mon Sep 17 00:00:00 2001 From: Trevor Roberts Jr Date: Mon, 13 Apr 2020 17:21:16 -0400 Subject: [PATCH 2/3] Updated flask-cors to address Issue #21 and updated Flask flask-cors 3.0.0 does not properly pass the required headers to prevent CORS errors Flask 0.12.2 does not pin the Werkzeug dependency version and odd "AttributeError...is_xhr" errors populate the logs. Flask 0.12.5 pins the Werkzeug version dependency to avoid these errors. --- workshop-1/README.md | 2 +- workshop-1/app/like-service/service/requirements.txt | 2 +- workshop-1/app/monolith-service/service/requirements.txt | 2 +- workshop-2/app/like-service/service/requirements.txt | 2 +- workshop-2/app/monolith-service/service/requirements.txt | 2 +- .../ws3-start/app/like-service/service/requirements.txt | 4 ++++ .../ws3-start/app/monolith-service/service/requirements.txt | 4 ++++ workshop-3/app/like-service/service/requirements.txt | 2 +- workshop-3/app/monolith-service/service/requirements.txt | 2 +- 9 files changed, 15 insertions(+), 7 deletions(-) diff --git a/workshop-1/README.md b/workshop-1/README.md index 82a1c32..05b7996 100644 --- a/workshop-1/README.md +++ b/workshop-1/README.md @@ -252,7 +252,7 @@ The Mythical Mysfits adoption agency infrastructure has always been running dire ---> f24fe4e69d88 Step 7/10 : RUN pip install -r ./requirements.txt ---> Running in 1c878073d631 - Collecting Flask==0.12.2 (from -r ./requirements.txt (line 1)) + Collecting Flask==0.12.5 (from -r ./requirements.txt (line 1)) Try reordering the instructions in your Dockerfile to copy the monolith code over after the requirements are installed. The thinking here is that the Python source will see more changes than the dependencies noted in requirements.txt, so why rebuild requirements every time when we can just have it be another cached layer. diff --git a/workshop-1/app/like-service/service/requirements.txt b/workshop-1/app/like-service/service/requirements.txt index 04dd396..b0c0e0e 100644 --- a/workshop-1/app/like-service/service/requirements.txt +++ b/workshop-1/app/like-service/service/requirements.txt @@ -1,3 +1,3 @@ -Flask==0.12.2 +Flask==0.12.5 flask-cors==3.0.8 requests==1.2.3 diff --git a/workshop-1/app/monolith-service/service/requirements.txt b/workshop-1/app/monolith-service/service/requirements.txt index d4e24a5..304e166 100644 --- a/workshop-1/app/monolith-service/service/requirements.txt +++ b/workshop-1/app/monolith-service/service/requirements.txt @@ -1,3 +1,3 @@ -Flask==0.12.2 +Flask==0.12.5 flask-cors==3.0.8 boto3==1.7.16 diff --git a/workshop-2/app/like-service/service/requirements.txt b/workshop-2/app/like-service/service/requirements.txt index 04dd396..b0c0e0e 100644 --- a/workshop-2/app/like-service/service/requirements.txt +++ b/workshop-2/app/like-service/service/requirements.txt @@ -1,3 +1,3 @@ -Flask==0.12.2 +Flask==0.12.5 flask-cors==3.0.8 requests==1.2.3 diff --git a/workshop-2/app/monolith-service/service/requirements.txt b/workshop-2/app/monolith-service/service/requirements.txt index d4e24a5..304e166 100644 --- a/workshop-2/app/monolith-service/service/requirements.txt +++ b/workshop-2/app/monolith-service/service/requirements.txt @@ -1,3 +1,3 @@ -Flask==0.12.2 +Flask==0.12.5 flask-cors==3.0.8 boto3==1.7.16 diff --git a/workshop-2/ws3-start/app/like-service/service/requirements.txt b/workshop-2/ws3-start/app/like-service/service/requirements.txt index 04dd396..08eb1fc 100644 --- a/workshop-2/ws3-start/app/like-service/service/requirements.txt +++ b/workshop-2/ws3-start/app/like-service/service/requirements.txt @@ -1,3 +1,7 @@ +<<<<<<< HEAD Flask==0.12.2 +======= +Flask==0.12.5 +>>>>>>> Updated flask-cors to address Issue #21 and updated Flask flask-cors==3.0.8 requests==1.2.3 diff --git a/workshop-2/ws3-start/app/monolith-service/service/requirements.txt b/workshop-2/ws3-start/app/monolith-service/service/requirements.txt index d4e24a5..edb0627 100644 --- a/workshop-2/ws3-start/app/monolith-service/service/requirements.txt +++ b/workshop-2/ws3-start/app/monolith-service/service/requirements.txt @@ -1,3 +1,7 @@ +<<<<<<< HEAD Flask==0.12.2 +======= +Flask==0.12.5 +>>>>>>> Updated flask-cors to address Issue #21 and updated Flask flask-cors==3.0.8 boto3==1.7.16 diff --git a/workshop-3/app/like-service/service/requirements.txt b/workshop-3/app/like-service/service/requirements.txt index 04dd396..b0c0e0e 100755 --- a/workshop-3/app/like-service/service/requirements.txt +++ b/workshop-3/app/like-service/service/requirements.txt @@ -1,3 +1,3 @@ -Flask==0.12.2 +Flask==0.12.5 flask-cors==3.0.8 requests==1.2.3 diff --git a/workshop-3/app/monolith-service/service/requirements.txt b/workshop-3/app/monolith-service/service/requirements.txt index d4e24a5..304e166 100755 --- a/workshop-3/app/monolith-service/service/requirements.txt +++ b/workshop-3/app/monolith-service/service/requirements.txt @@ -1,3 +1,3 @@ -Flask==0.12.2 +Flask==0.12.5 flask-cors==3.0.8 boto3==1.7.16 From 247f4ce2b1360affb971d46633c06b25270da6c4 Mon Sep 17 00:00:00 2001 From: Trevor Roberts Jr Date: Mon, 13 Apr 2020 17:21:16 -0400 Subject: [PATCH 3/3] Updated flask-cors to address Issue #21 and updated Flask flask-cors 3.0.0 does not properly pass the required headers to prevent CORS errors Flask 0.12.2 does not pin the Werkzeug dependency version and odd "AttributeError...is_xhr" errors populate the logs. Flask 0.12.5 pins the Werkzeug version dependency to avoid these errors. --- .../ws3-start/app/like-service/service/requirements.txt | 4 ---- .../ws3-start/app/monolith-service/service/requirements.txt | 4 ---- 2 files changed, 8 deletions(-) diff --git a/workshop-2/ws3-start/app/like-service/service/requirements.txt b/workshop-2/ws3-start/app/like-service/service/requirements.txt index 08eb1fc..b0c0e0e 100644 --- a/workshop-2/ws3-start/app/like-service/service/requirements.txt +++ b/workshop-2/ws3-start/app/like-service/service/requirements.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD -Flask==0.12.2 -======= Flask==0.12.5 ->>>>>>> Updated flask-cors to address Issue #21 and updated Flask flask-cors==3.0.8 requests==1.2.3 diff --git a/workshop-2/ws3-start/app/monolith-service/service/requirements.txt b/workshop-2/ws3-start/app/monolith-service/service/requirements.txt index edb0627..304e166 100644 --- a/workshop-2/ws3-start/app/monolith-service/service/requirements.txt +++ b/workshop-2/ws3-start/app/monolith-service/service/requirements.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD -Flask==0.12.2 -======= Flask==0.12.5 ->>>>>>> Updated flask-cors to address Issue #21 and updated Flask flask-cors==3.0.8 boto3==1.7.16