Fix GitHub CI and tests

ci/Dockerfile

@@ -4,7 +4,7 @@ LABEL maintainer="[email protected]"
 # skip global package update - whatever archlinux/latest has is enough
 #RUN pacman -Syyu --noconfirm
 # install arch base-devel, dependencies, and refresh the package list from upstream
-RUN pacman --noconfirm -S -y --needed base-devel iputils net-tools grep nodejs npm docker make pacman-contrib jq python-pip zip gcc python2 wget unzip tar gawk jdk-openjdk postgresql-libs python-psycopg2
+RUN pacman --noconfirm -S -y --needed base-devel iputils net-tools grep nodejs npm docker make pacman-contrib jq python-pip zip gcc wget unzip tar gawk jdk-openjdk postgresql-libs python-psycopg2
 ## Use this if you need to force-downgrade system's python
 ## You'll want to compile the version you want first and upload it to S3
 # RUN wget https://s3-us-west-2.amazonaws.com/public.iam.mozilla.com/python37-3.7.5-2-x86_64.pkg.tar.xz

docker-compose-local.yml

@@ -2,6 +2,7 @@
 version: '3.7'
 services:
   tester:
+    platform: linux/amd64
     build:
       context: ci/
       dockerfile: Dockerfile

docker-compose.yml

@@ -2,6 +2,7 @@
 version: '3.7'
 services:
   db:
+    platform: linux/amd64
     image: postgres:11.1
     environment:
       POSTGRES_USER: cis_user
@@ -12,6 +13,7 @@ services:
     networks:
       - default
   tester:
+    platform: linux/amd64
     build:
       context: ci/
       dockerfile: Dockerfile
@@ -29,4 +31,4 @@ services:
     networks:
       - default
     depends_on:
-      - db
+      - db

python-modules/cis_aws/setup.py

@@ -10,7 +10,8 @@
 
 setup_requirements = ["pytest-runner", "setuptools>=40.5.0"]
 
-test_requirements = ["jsonschema", "mock", "moto", "pytest", "pytest-watch", "pytest-cov", "flake8"]
+test_requirements = ["jsonschema", "mock<=4.0.2", "moto[dynamodb2,kinesis,sts]<2", "pytest", "pytest-watch",
+                     "pytest-cov", "flake8", "botocore<1.23.24", "responses<0.12.1"]
 
 extras = {"test": test_requirements}
 

python-modules/cis_change_service/setup.py

@@ -23,7 +23,8 @@
 
 setup_requirements = ["pytest-runner", "setuptools>=40.5.0"]
 
-test_requirements = ["pytest", "pytest-watch", "pytest-cov", "patch", "mock", "flake8", "moto"]
+test_requirements = ["pytest", "pytest-watch", "pytest-cov", "patch", "mock<=4.0.2", "flake8", "moto<2",
+                     "botocore<1.23.24", "responses<0.12.1"]
 
 extras = {"test": test_requirements}
 

python-modules/cis_crypto/setup.py

@@ -21,7 +21,8 @@
 
 setup_requirements = ["pytest-runner", "setuptools>=40.5.0"]
 
-test_requirements = ["pytest", "pytest-watch", "pytest-cov", "pytest-mock", "moto", "mock", "flake8", "cis_profile"]
+test_requirements = ["pytest", "pytest-watch", "pytest-cov", "pytest-mock", "moto[ssm]<2", "mock<=4.0.2", "flake8",
+                     "cis_profile", "botocore<1.23.24", "responses<0.12.1"]
 
 extras = {"test": test_requirements}
 

python-modules/cis_identity_vault/setup.py

@@ -28,12 +28,14 @@
     "pytest-watch",
     "pytest-cov",
     "patch",
-    "mock",
-    "moto>=1.3.7",
+    "mock<=4.0.2",
+    "moto[dynamodb2,ssm]>=1.3.7,<2",
     "flake8",
     "pytest-benchmark",
     "psycopg2",
     "psycopg2-binary",
+    "botocore<1.23.24",
+    "responses<0.12.1",
 ]
 
 extras = {"test": test_requirements}

python-modules/cis_notifications/setup.py

@@ -10,7 +10,8 @@
 
 setup_requirements = ["pytest-runner", "setuptools>=40.5.0"]
 
-test_requirements = ["pytest", "pytest-watch", "pytest-cov", "patch", "mock", "flake8", "moto", "PyYAML"]
+test_requirements = ["pytest", "pytest-watch", "pytest-cov", "patch", "mock<=4.0.2", "flake8",
+                     "moto[secretsmanager,ssm]<2", "PyYAML", "botocore<1.23.24", "responses<0.12.1"]
 
 extras = {"test": test_requirements}
 

python-modules/cis_postgresql/setup.py

@@ -15,12 +15,14 @@
     "pytest-watch",
     "pytest-cov",
     "patch",
-    "mock",
     "flake8",
-    "moto",
+    "mock<=4.0.2",
+    "moto[dynamodb2]<2",
     "docker",
     "psycopg2",
     "psycopg2-binary",
+    "botocore<1.23.24",
+    "responses<0.12.1",
 ]
 
 extras = {"test": test_requirements}

python-modules/cis_processor/setup.py

@@ -10,7 +10,8 @@
 
 setup_requirements = ["pytest-runner", "setuptools>=40.5.0"]
 
-test_requirements = ["pytest", "pytest-watch", "pytest-cov", "patch", "mock", "flake8", "moto"]
+test_requirements = ["pytest", "pytest-watch", "pytest-cov", "patch", "mock<=4.0.2", "flake8", "moto[dynamodb2]<2",
+                     "botocore<1.23.24", "responses<0.12.1"]
 
 extras = {"test": test_requirements}
 

python-modules/cis_profile/setup.py

@@ -5,14 +5,15 @@
 
 requirements = ["jsonschema", "requests", "graphene", "Faker", "everett", "everett[ini]", "configobj", "click"]
 test_requirements = [
-    "mock",
+    "mock<=4.0.2",
     "pytest",
     "pytest-watch",
     "pytest-cov",
     "flake8",
     "flask",
     "flask_graphql",
     "flask_restful",
+    "responses<0.12.1",
 ]
 setup_requirements = ["pytest-runner", "setuptools>=40.5.0"]
 

python-modules/cis_profile_retrieval_service/setup.py

@@ -29,7 +29,8 @@
 
 setup_requirements = ["pytest-runner", "setuptools>=40.5.0"]
 
-test_requirements = ["pytest", "pytest-watch", "pytest-cov", "pytest-mock", "moto", "mock", "flake8"]
+test_requirements = ["pytest", "pytest-watch", "pytest-cov", "pytest-mock", "moto<2", "mock<=4.0.2", "flake8",
+                     "botocore<1.23.24", "responses<0.12.1"]
 
 extras = {"test": test_requirements}
 

python-modules/cis_publisher/setup.py

@@ -10,7 +10,8 @@
 
 setup_requirements = ["pytest-runner"]
 
-test_requirements = ["pytest", "pytest-watch", "pytest-cov", "moto", "flake8", "mock"]
+test_requirements = ["pytest", "pytest-watch", "pytest-cov", "moto[lambda,ssm]<2", "flake8", "mock<=4.0.2",
+                     "botocore<1.23.24", "responses<0.12.1"]
 
 extras = {"test": test_requirements}