Merge pull request #138 from rstudio/default-ip-range

Resize/renumber the default VPC CidrBlocks

Author: statik

conftest.py

@@ -73,7 +73,7 @@ def env_setup():
 def dynamodb(fake_users, monkeypatch):
     from fuzzbucket import aws
 
-    with moto.mock_dynamodb():
+    with moto.mock_aws():
         ddb = boto3.resource("dynamodb", region_name="us-east-1")
         setup_dynamodb_tables(ddb, fake_users)
 
@@ -87,7 +87,7 @@ def dynamodb(fake_users, monkeypatch):
 def ec2(monkeypatch):
     from fuzzbucket import aws
 
-    with moto.mock_ec2():
+    with moto.mock_aws():
         ec2c = boto3.client("ec2", region_name="us-east-1")
 
         with monkeypatch.context() as mp:

default-resources.yml

@@ -3,7 +3,7 @@ resources:
     VPC:
       Type: AWS::EC2::VPC
       Properties:
-        CidrBlock: 172.98.0.0/18
+        CidrBlock: 172.22.0.0/20
         EnableDnsSupport: true
         EnableDnsHostnames: true
         Tags:
@@ -15,7 +15,7 @@ resources:
       Properties:
         VpcId: !Ref VPC
         AvailabilityZone: ${aws:region, 'us-east-1'}a
-        CidrBlock: 172.98.0.0/18
+        CidrBlock: 172.22.0.0/20
         MapPublicIpOnLaunch: true
         Tags:
         - Key: Name

fuzzbucket/__init__.py

@@ -8,7 +8,7 @@
 
 def deferred_app(
     environ: dict[str, str], start_response: typing.Callable
-) -> typing.Iterable[str]:
+) -> typing.Iterable[bytes]:
     return cached_app()(environ, start_response)
 
 

fuzzbucket/g.py

@@ -7,10 +7,10 @@
     flask_dance.consumer.OAuth2ConsumerBlueprint
 ] = werkzeug.local.LocalProxy(auth.get_oauth_blueprint)
 
-oauth_session: werkzeug.local.LocalProxy[
-    flask_dance.consumer.OAuth2Session
-] = werkzeug.local.LocalProxy(lambda: auth.get_oauth_blueprint().session)
+oauth_session: werkzeug.local.LocalProxy[flask_dance.consumer.OAuth2Session] = (
+    werkzeug.local.LocalProxy(lambda: auth.get_oauth_blueprint().session)
+)
 
-user_storage: werkzeug.local.LocalProxy[
-    flask_dance_storage.FlaskDanceStorage
-] = werkzeug.local.LocalProxy(flask_dance_storage.get_storage)
+user_storage: werkzeug.local.LocalProxy[flask_dance_storage.FlaskDanceStorage] = (
+    werkzeug.local.LocalProxy(flask_dance_storage.get_storage)
+)

fuzzbucket_client/__main__.py

@@ -141,8 +141,7 @@ def utcnow() -> datetime.datetime:
 
 class CustomHelpFormatter(
     argparse.ArgumentDefaultsHelpFormatter, argparse.RawDescriptionHelpFormatter
-):
-    ...
+): ...
 
 
 def main(sysargs: list[str] = sys.argv[:]) -> int:

pyproject.toml

@@ -123,6 +123,8 @@ addopts = '''
   --cov-report term
   --cov-report html
   --cov-report xml
+  --ignore=wsgi_handler.py
+  --ignore=serverless_wsgi.py
   -vv
   --mypy
   --disable-warnings