Merge branch 'warn-upgrade' into package

* warn-upgrade:
  Add chalice stage option and deprecate existing arg
  Add support for chalice stage specific config
  Clarify APIG stage vs. chalice stage
  Move object creation to factory class
  Introduce version in config file

chalice/awsclient.py

@@ -23,6 +23,8 @@
 import botocore.session  # noqa
 from typing import Any, Optional, Dict, Callable, List  # noqa
 
+from chalice.constants import DEFAULT_STAGE_NAME
+
 
 class TypedAWSClient(object):
 
@@ -156,12 +158,12 @@ def update_api_from_swagger(self, rest_api_id, swagger_document):
             restApiId=rest_api_id,
             body=json.dumps(swagger_document, indent=2))
 
-    def deploy_rest_api(self, rest_api_id, stage_name):
+    def deploy_rest_api(self, rest_api_id, api_gateway_stage):
         # type: (str, str) -> None
         client = self._client('apigateway')
         client.create_deployment(
             restApiId=rest_api_id,
-            stageName=stage_name,
+            stageName=api_gateway_stage,
         )
 
     def add_permission_for_apigateway_if_needed(self, function_name,
@@ -244,20 +246,8 @@ def get_function_policy(self, function_name):
         policy = client.get_policy(FunctionName=function_name)
         return json.loads(policy['Policy'])
 
-    def get_sdk_download_stream(self, rest_api_id, stage='dev',
-                                sdk_type='javascript'):
-        # type: (str, str, str) -> file
-        """Generate an SDK for a given SDK.
-
-        Returns a file like object that streams a zip contents for the
-        generated SDK.
-
-        """
-        response = self._client('apigateway').get_sdk(
-            restApiId=rest_api_id, stageName=stage, sdkType=sdk_type)
-        return response['body']
-
-    def download_sdk(self, rest_api_id, output_dir, stage='dev',
+    def download_sdk(self, rest_api_id, output_dir,
+                     api_gateway_stage=DEFAULT_STAGE_NAME,
                      sdk_type='javascript'):
         # type: (str, str, str, str) -> None
         """Download an SDK to a directory.
@@ -269,7 +259,8 @@ def download_sdk(self, rest_api_id, output_dir, stage='dev',
 
         """
         zip_stream = self.get_sdk_download_stream(
-            rest_api_id, stage=stage, sdk_type=sdk_type)
+            rest_api_id, api_gateway_stage=api_gateway_stage,
+            sdk_type=sdk_type)
         tmpdir = tempfile.mkdtemp()
         with open(os.path.join(tmpdir, 'sdk.zip'), 'wb') as f:
             f.write(zip_stream.read())
@@ -291,6 +282,21 @@ def download_sdk(self, rest_api_id, output_dir, stage='dev',
             "The downloaded SDK had an unexpected directory structure: %s" %
             (', '.join(dirnames)))
 
+    def get_sdk_download_stream(self, rest_api_id,
+                                api_gateway_stage=DEFAULT_STAGE_NAME,
+                                sdk_type='javascript'):
+        # type: (str, str, str) -> file
+        """Generate an SDK for a given SDK.
+
+        Returns a file like object that streams a zip contents for the
+        generated SDK.
+
+        """
+        response = self._client('apigateway').get_sdk(
+            restApiId=rest_api_id, stageName=api_gateway_stage,
+            sdkType=sdk_type)
+        return response['body']
+
     def add_permission_for_apigateway(self, function_name, region_name,
                                       account_id, rest_api_id, random_id):
         # type: (str, str, str, str, str) -> None