diff --git a/ci/Dockerfile b/ci/Dockerfile index 0f6a9cec..b4824f34 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="akrug@mozilla.com" # 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 diff --git a/docker-compose-local.yml b/docker-compose-local.yml index f2cabbc4..5bac9e15 100644 --- a/docker-compose-local.yml +++ b/docker-compose-local.yml @@ -2,6 +2,7 @@ version: '3.7' services: tester: + platform: linux/amd64 build: context: ci/ dockerfile: Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index 19a77e4d..9158b7c9 100644 --- a/docker-compose.yml +++ b/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 \ No newline at end of file + - db diff --git a/python-modules/cis_aws/setup.py b/python-modules/cis_aws/setup.py index ba34c982..b059c173 100644 --- a/python-modules/cis_aws/setup.py +++ b/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} diff --git a/python-modules/cis_change_service/setup.py b/python-modules/cis_change_service/setup.py index 2ebd07a3..828a3ca8 100644 --- a/python-modules/cis_change_service/setup.py +++ b/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} diff --git a/python-modules/cis_crypto/setup.py b/python-modules/cis_crypto/setup.py index 72c1f9c2..d44cc1cb 100644 --- a/python-modules/cis_crypto/setup.py +++ b/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} diff --git a/python-modules/cis_identity_vault/setup.py b/python-modules/cis_identity_vault/setup.py index 860d91df..89857268 100644 --- a/python-modules/cis_identity_vault/setup.py +++ b/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} diff --git a/python-modules/cis_notifications/setup.py b/python-modules/cis_notifications/setup.py index e63639c6..ac624daa 100644 --- a/python-modules/cis_notifications/setup.py +++ b/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} diff --git a/python-modules/cis_postgresql/setup.py b/python-modules/cis_postgresql/setup.py index 9b37dac0..89691c7b 100644 --- a/python-modules/cis_postgresql/setup.py +++ b/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} diff --git a/python-modules/cis_processor/setup.py b/python-modules/cis_processor/setup.py index c747a778..e4c5441f 100644 --- a/python-modules/cis_processor/setup.py +++ b/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} diff --git a/python-modules/cis_profile/setup.py b/python-modules/cis_profile/setup.py index 49309329..9a091be7 100644 --- a/python-modules/cis_profile/setup.py +++ b/python-modules/cis_profile/setup.py @@ -5,7 +5,7 @@ requirements = ["jsonschema", "requests", "graphene", "Faker", "everett", "everett[ini]", "configobj", "click"] test_requirements = [ - "mock", + "mock<=4.0.2", "pytest", "pytest-watch", "pytest-cov", @@ -13,6 +13,7 @@ "flask", "flask_graphql", "flask_restful", + "responses<0.12.1", ] setup_requirements = ["pytest-runner", "setuptools>=40.5.0"] diff --git a/python-modules/cis_profile_retrieval_service/setup.py b/python-modules/cis_profile_retrieval_service/setup.py index 06415a3b..4c6e0e38 100644 --- a/python-modules/cis_profile_retrieval_service/setup.py +++ b/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} diff --git a/python-modules/cis_publisher/setup.py b/python-modules/cis_publisher/setup.py index 6e5a8b9a..1d073b65 100644 --- a/python-modules/cis_publisher/setup.py +++ b/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} diff --git a/python-modules/package-lock.json b/python-modules/package-lock.json index bd364d52..dd21fbbc 100644 --- a/python-modules/package-lock.json +++ b/python-modules/package-lock.json @@ -30,11 +30,11 @@ } }, "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "requires": { - "lodash": "^4.17.14" + "lodash": "^4.17.21" } }, "big.js": { @@ -158,7 +158,7 @@ "resolved": "https://registry.npmjs.org/dynalite/-/dynalite-2.3.2.tgz", "integrity": "sha512-7RplmU+luCqpEoUReApp1TfmbJohW+9s25TL+HHIExQ+zlaIU3W3TlTGynMDABc6RC0/KJREsJ+TC8SYyIHAGw==", "requires": { - "async": "^2.6.2", + "async": "^2.6.4", "big.js": "^5.2.2", "buffer-crc32": "^0.2.13", "lazy": "^1.0.11", @@ -166,7 +166,7 @@ "levelup": "^4.0.1", "lock": "^1.1.0", "memdown": "^4.0.0", - "minimist": "^1.2.0", + "minimist": "^1.2.6", "once": "^1.4.0", "subleveldown": "^4.0.0" } @@ -287,14 +287,14 @@ "resolved": "https://registry.npmjs.org/kinesalite/-/kinesalite-2.0.3.tgz", "integrity": "sha512-iCYbIAWEPGyOtYGR3FDy8f8iCAwXV19KhLZVIjWHAnwqMXD+hay522Z1tHjlz55MbLeJBIfgz40cOPe7QMJWQw==", "requires": { - "async": "^2.6.2", + "async": "^2.6.4", "bignumber.js": "^8.1.1", "lazy": "^1.0.11", "leveldown": "^4.0.1", "levelup": "^4.0.1", "lock": "^1.1.0", "memdown": "^3.0.0", - "minimist": "^1.2.0", + "minimist": "^1.2.6", "node-uuid": "^1.4.7", "once": "^1.3.3", "subleveldown": "^3.0.1" @@ -453,9 +453,9 @@ "integrity": "sha1-UxV0mdFlOxNspmRRBx/KYVcD+lU=" }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "ltgt": { "version": "2.2.1", @@ -492,9 +492,9 @@ "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" }, "mkdirp": { "version": "0.5.1", @@ -590,7 +590,7 @@ "os-homedir": "^1.0.1", "pump": "^2.0.1", "rc": "^1.2.7", - "simple-get": "^2.7.0", + "simple-get": "^2.8.2", "tar-fs": "^1.13.0", "tunnel-agent": "^0.6.0", "which-pm-runs": "^1.0.0" @@ -666,9 +666,9 @@ "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=" }, "simple-get": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz", - "integrity": "sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==", + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.2.tgz", + "integrity": "sha512-Ijd/rV5o+mSBBs4F/x9oDPtTx9Zb6X9brmnXvMW4J7IR15ngi9q5xxqWBKU744jTZiaXtxaPL7uHG6vtN8kUkw==", "requires": { "decompress-response": "^3.3.0", "once": "^1.3.1",