fix failing botocore test suite (DataDog#3075)

* update moto/localstack

* mock firehose instead of kinesis

* update moto versions

* support older/newer moto versions

Author: brettlangdon

docker-compose.yml

@@ -70,7 +70,7 @@ services:
         # container that executes mocked AWS services; this is a custom
         # build that runs all of them in a single container. It is built
         # using this fork: https://github.com/palazzem/moto/tree/palazzem/docker-service
-        image: datadog/docker-library:moto_1_0_1
+        image: motoserver/moto:2.2.19
         ports:
             - "127.0.0.1:5000:5000"
             - "127.0.0.1:5001:5001"
@@ -132,7 +132,7 @@ services:
           - ./.ddriot:/root/project/.riot
 
     localstack:
-        image: localstack/localstack:0.12.1
+        image: localstack/localstack:0.13.1
         network_mode: bridge
         ports:
           - "127.0.0.1:4566:4566"

riotfile.py

@@ -980,15 +980,15 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
         Venv(
             name="boto",
             command="pytest {cmdargs} tests/contrib/boto",
-            venvs=[Venv(pys=select_pys(max_version="3.6"), pkgs={"boto": latest, "moto": ["<1.0"]})],
+            venvs=[Venv(pys=select_pys(max_version="3.6"), pkgs={"boto": latest, "moto": "<1.0.0"})],
         ),
         Venv(
             name="botocore",
             command="pytest {cmdargs} tests/contrib/botocore",
             pkgs={"botocore": latest},
             venvs=[
-                Venv(pys=select_pys(min_version="3.5"), pkgs={"moto": [">=1.0,<2.0"]}),
-                Venv(pys=["2.7"], pkgs={"moto": [">=1.0,<2.0"], "rsa": ["<4.7.1"]}),
+                Venv(pys=select_pys(min_version="3.5"), pkgs={"moto[all]": latest}),
+                Venv(pys=["2.7"], pkgs={"moto": ["~=1.0"], "rsa": ["<4.7.1"]}),
             ],
         ),
         Venv(

tests/contrib/botocore/test.py

@@ -13,6 +13,13 @@
 from moto import mock_s3
 from moto import mock_sqs
 
+
+# Older version of moto used kinesis to mock firehose
+try:
+    from moto import mock_firehose
+except ImportError:
+    from moto import mock_kinesis as mock_firehose
+
 from ddtrace import Pin
 from ddtrace import config
 from ddtrace.constants import ANALYTICS_SAMPLE_RATE_KEY
@@ -761,7 +768,7 @@ def test_stubber_no_response_metadata(self):
             service_response = s3.list_buckets()
             assert service_response == response
 
-    @mock_kinesis
+    @mock_firehose
     def test_firehose_no_records_arg(self):
         firehose = self.session.create_client("firehose", region_name="us-west-2")
         Pin(service=self.TEST_SERVICE, tracer=self.tracer).onto(firehose)