f rs

autopush/config.py

@@ -299,6 +299,9 @@ def from_argparse(cls, ns, **kwargs):
         if not ns.no_aws:
             ami_id = get_amid() or "Unknown"
 
+        import pdb;pdb.set_trace()
+        allow_table_rotation = not ns.no_table_rotation
+
         return cls(
             crypto_key=ns.crypto_key,
             datadog_api_key=ns.datadog_api_key,
@@ -332,6 +335,7 @@ def from_argparse(cls, ns, **kwargs):
                 dh_param=ns.ssl_dh_param
             ),
             sts_max_age=ns.sts_max_age,
+            allow_table_rotation=allow_table_rotation,
             **kwargs
         )
 

autopush/main_argparse.py

@@ -105,10 +105,10 @@ def add_shared_args(parser):
                         help="AWS DynamoDB endpoint override",
                         type=str, default=None,
                         env_var="AWS_LOCAL_DYNAMODB")
-    parser.add_argument('--allow_table_rotation',
-                        help="Allow monthly message table rotation",
+    parser.add_argument('--no_table_rotation',
+                        help="Disallow monthly message table rotation",
                         action="store_true", default=False,
-                        env_var="ALLOW_TABLE_ROTATION")
+                        env_var="NO_TABLE_ROTATION")
     # No ENV because this is for humans
     _add_external_router_args(parser)
     _obsolete_args(parser)

autopush/tests/test_db.py

@@ -117,7 +117,6 @@ def test_init_with_no_rotate_create_table(self):
             latest = autopush.tests.boto_resource.get_latest_message_tablename(
                     prefix=fake_conf.message_table.tablename
                 )
-            print("### {} == {}".format(dm.current_msg_month, latest))
             assert dm.current_msg_month == latest
             assert dm.message_tables == [fake_conf.message_table.tablename]
         finally:

autopush/tests/test_z_main.py

@@ -307,6 +307,7 @@ class TestArg(AutopushConfig):
         sts_max_age = 1234
         _no_sslcontext_cache = False
         aws_ddb_endpoint = None
+        no_table_rotation = False
 
     def setUp(self):
         patchers = [

configs/autopush_shared.ini.sample

@@ -134,4 +134,4 @@ endpoint_port = 8082
 
 ; With TTL implemented, message table rotation is no longer required.
 ; This flag determines if table rotation should be allowed to continue:
-#allow_table_rotation = true
+#no_table_rotation