Changed autogen_policy default value from True to None

CHANGELOG.rst

@@ -9,6 +9,9 @@ Next Release (TBD)
   redeployments of chalice applications and in the CloudFormation template
   generated by ``chalice package``
   (`#339 <https://github.com/awslabs/chalice/issues/339>`__)
+* Fix autogen_policy in config being ignored
+  (`#367 <https://github.com/awslabs/chalice/pull/367>`__)
+
 
 0.9.0
 =====

chalice/cli/__init__.py

@@ -91,7 +91,7 @@ def local(ctx, port=8000):
 
 @cli.command()
 @click.option('--autogen-policy/--no-autogen-policy',
-              default=True,
+              default=None,
               help='Automatically generate IAM policy for app code.')
 @click.option('--profile', help='Override profile at deploy time.')
 @click.option('--api-gateway-stage',
@@ -104,7 +104,7 @@ def local(ctx, port=8000):
 @click.pass_context
 def deploy(ctx, autogen_policy, profile, api_gateway_stage, stage,
            deprecated_api_gateway_stage):
-    # type: (click.Context, bool, str, str, str, str) -> None
+    # type: (click.Context, Optional[bool], str, str, str, str) -> None
     if api_gateway_stage is not None and \
             deprecated_api_gateway_stage is not None:
         raise _create_deprecated_stage_error(api_gateway_stage,

chalice/cli/factory.py

@@ -85,10 +85,11 @@ def create_default_deployer(self, session, prompter):
             session=session, prompter=prompter)
 
     def create_config_obj(self, chalice_stage_name=DEFAULT_STAGE_NAME,
-                          autogen_policy=True, api_gateway_stage=None):
-        # type: (str, bool, Optional[str]) -> Config
+                          autogen_policy=None, api_gateway_stage=None):
+        # type: (str, Optional[bool], Optional[str]) -> Config
         user_provided_params = {}  # type: Dict[str, Any]
-        default_params = {'project_dir': self.project_dir}
+        default_params = {'project_dir': self.project_dir,
+                          'autogen_policy': True}
         try:
             config_from_disk = self.load_project_config()
         except (OSError, IOError):

tests/functional/cli/test_cli.py

@@ -236,7 +236,7 @@ def test_can_specify_api_gateway_stage(runner, mock_cli_factory,
                                   cli_factory=mock_cli_factory)
         assert result.exit_code == 0
         mock_cli_factory.create_config_obj.assert_called_with(
-            autogen_policy=True, chalice_stage_name='dev',
+            autogen_policy=None, chalice_stage_name='dev',
             api_gateway_stage='notdev'
         )
 

tests/functional/cli/test_factory.py

@@ -68,6 +68,25 @@ def test_can_create_config_obj(clifactory):
     assert isinstance(obj, Config)
 
 
+def test_can_create_config_obj_with_override_autogen(clifactory):
+    config = clifactory.create_config_obj(autogen_policy=False)
+    assert config.autogen_policy is False
+
+
+def test_config_file_override_autogen_policy(clifactory):
+    config_file = os.path.join(
+        clifactory.project_dir, '.chalice', 'config.json')
+    with open(config_file, 'w') as f:
+        f.write('{"autogen_policy": false}')
+    config = clifactory.create_config_obj()
+    assert config.autogen_policy is False
+
+
+def test_can_create_config_obj_with_api_gateway_stage(clifactory):
+    config = clifactory.create_config_obj(api_gateway_stage='custom-stage')
+    assert config.api_gateway_stage == 'custom-stage'
+
+
 def test_cant_load_config_obj_with_bad_project(clifactory):
     clifactory.project_dir = 'nowhere-asdfasdfasdfas'
     with pytest.raises(RuntimeError):