Adding support for PHP, Python and NodeJS

continuous_delivery/models/build_configuration.py

@@ -13,9 +13,17 @@ class BuildConfiguration(Model):
         'type': {'key': 'type', 'type': 'str'},
         'working_directory': {'key': 'workingDirectory', 'type': 'str'},
         'node_type': {'key': 'NodeJsTaskRunner', 'type': 'str'},
+        'python_framework': {'key': 'pythonFramework', 'type': 'str'},
+        'python_version': {'key': 'pythonExtensionId', 'type': 'str'},
+        'django_settings_module': {'key': 'djangoSettingsModule', 'type': 'str'},
+        'flask_project_name': {'key': 'flaskProjectName', 'type': 'str'}
     }
 
-    def __init__(self, type=None, working_directory=None, node_type=None):
+    def __init__(self, type=None, working_directory=None, node_type=None, python_framework=None, python_version=None, django_settings_module=None, flask_project_name=None):
         self.type = type
         self.working_directory = working_directory
         self.node_type = node_type
+        self.python_framework = python_framework
+        self.python_version = python_version
+        self.django_settings_module = django_settings_module
+        self.flask_project_name = flask_project_name

tests/test_continuous_delivery_manager.py

@@ -101,8 +101,12 @@ class TestContinousDeliveryManager(unittest.TestCase):
         # set required values
         cdman.set_azure_web_info('group1', 'web1', 'fakeCreds', 'sub1', 'subname1', 'tenant1', 'South Central US')
         cdman.set_repository_info('repoUrl1', 'master1', 'token1')
+        
+        cd_app_type = 'AspNetWap'
+        app_type_details = AppTypeDetails(cd_app_type, None, None, None)
+
         # call setup
-        result = cdman.setup_continuous_delivery('staging', 'AspNetWap', "account1", True, 'token2')
+        result = cdman.setup_continuous_delivery('staging', app_type_details, "account1", True, 'token2')
         self.assertEqual('SUCCESS', result.status)
         self.assertTrue("The Team Services account 'https://account1.visualstudio.com' was created" in result.status_message)
         self.assertEqual('https://portal.azure.com/#resource/subscriptions/sub1/resourceGroups/group1/providers/Microsoft.Web/sites/web1/vstscd', result.azure_continuous_delivery_url)
@@ -114,6 +118,47 @@ class TestContinousDeliveryManager(unittest.TestCase):
         self.assertEqual('https://account1.visualstudio.com/333/_build?_a=simple-process&definitionId=123', result.vsts_build_def_url)
         self.assertEqual('https://account1.visualstudio.com/333/_apps/hub/ms.vss-releaseManagement-web.hub-explorer?definitionId=321&_a=releases', result.vsts_release_def_url)
 
+    def test_build_configuration(self):
+        # create CD manager
+        cdman = ContinuousDeliveryManager(None)
+        cd_app_type = None
+        nodejs_task_runner = None
+        python_framework = None
+        python_version = None
+        test_case_count = 8
+        for i in range(test_case_count):
+            cd_app_type, nodejs_task_runner, python_framework, python_version = self._set_build_configuration_variables(i, cd_app_type, nodejs_task_runner, python_framework, python_version)
+            app_type_details = AppTypeDetails(cd_app_type, nodejs_task_runner, python_framework, python_version)
+            if(i<3) : 
+                # Verifying build configuration outputs
+                build_configuration = cdman._get_build_configuration(app_type_details, None)                
+                self.assertEqual(build_configuration.type, cd_app_type)
+                self.assertEqual(build_configuration.node_type, nodejs_task_runner)
+                self.assertEqual(build_configuration.python_framework, python_framework)
+                self.assertEqual(build_configuration.python_version, python_version)
+            else :
+                # Verifying exceptions
+                with self.assertRaises(RuntimeError):
+                    cdman._get_build_configuration(app_type_details, None)
+
+    def _set_build_configuration_variables(self, i, cd_app_type, nodejs_task_runner, python_framework, python_version):
+        if(i==0):
+            return 'Python', None, 'Django', 'Python 2.7.12 x64'
+        elif(i==1):
+            return 'NodeJS', 'Gulp', None, None
+        elif(i==2):
+            return 'AspNetWap', None, None, None
+        elif(i==3):
+            return None, None, None, None
+        elif(i==4):
+            return 'UnacceptedAppType', None, None, None
+        elif(i==5):
+            return 'Python', None, 'UnacceptedFramework', 'Python 2.7.12 x64'
+        elif(i==6):
+            return 'Python', 'Django', None, 'UnexpectedVersion'
+        elif(i==7):
+            return 'NodeJS', 'UnexpectedNodeJSTaskRunner', None, None
+    
     def _mock_get_vsts_info(self, vsts_repo_url, cred):
         collection_info = CollectionInfo('111', 'collection111', 'https://collection111.visualstudio.com')
         project_info = TeamProjectInfo('333', 'project1', 'https://collection111.visualstudio.com/project1', 'good', '1')
@@ -128,5 +173,13 @@ class TestContinousDeliveryManager(unittest.TestCase):
             CiResult(status, status_message))
         return ProvisioningConfiguration('abcd', None, None, ci_config)
 
+# Copy of the AppTypeDetails class in azure-cli-appservice\azure\cli\command_modules\appservice\custom.py
+class AppTypeDetails(object):
+    def __init__(self, cd_app_type, nodejs_task_runner, python_framework, python_version):
+        self.cd_app_type = cd_app_type
+        self.nodejs_task_runner = nodejs_task_runner
+        self.python_framework = python_framework
+        self.python_version = python_version
+
 if __name__ == '__main__':
     unittest.main()

vsts_cd_manager/continuous_delivery_manager.py

@@ -80,12 +80,12 @@ class ContinuousDeliveryManager(object):
         # TODO: this would be called by appservice web source-control delete
         return
 
-    def setup_continuous_delivery(self, azure_deployment_slot, app_type, vsts_account_name, create_account,
+    def setup_continuous_delivery(self, azure_deployment_slot, app_type_details, vsts_account_name, create_account,
                                   vsts_app_auth_token):
         """
         Use this method to setup Continuous Delivery of an Azure web site from a source control repository.
         :param azure_deployment_slot: the slot to use for deployment
-        :param app_type: the type of app that will be deployed. i.e. AspNetWap, AspNetCore, etc.
+        :param app_type_details: the details of app that will be deployed. i.e. app_type = Python, python_framework = Django etc.
         :param vsts_account_name:
         :param create_account:
         :param vsts_app_auth_token:
@@ -128,7 +128,7 @@ class ContinuousDeliveryManager(object):
         cd = ContinuousDelivery('3.2-preview.1', portalext_account_url, self._azure_info.credentials)
 
         # Construct the config body of the continuous delivery call
-        build_configuration = self._get_build_configuration(app_type, None)
+        build_configuration = self._get_build_configuration(app_type_details, None)
         source = ProvisioningConfigurationSource('codeRepository', source_repository, build_configuration)
         auth_info = AuthorizationInfo('Headers', AuthorizationInfoParameters('Bearer ' + vsts_app_auth_token))
         slot_name = azure_deployment_slot or 'staging'
@@ -155,20 +155,37 @@ class ContinuousDeliveryManager(object):
         if source_repository.type in ['Github', 'ExternalGit'] and not cd_account:
             raise RuntimeError('You must provide a value for cd-account since your repo-url is not a Team Services repository.')
 
-    def _get_build_configuration(self, app_type, working_directory):
+    def _get_build_configuration(self, app_type_details, working_directory):
+
+        accepted_app_type = ['AspNetWap', 'AspNetCore', 'NodeJS', 'PHP', 'Python']
+        accepted_nodejs_task_runner = ['None', 'Gulp', 'Grunt']
+        accepted_python_framework = ['Bottle', 'Django', 'Flask']
+        accepted_python_version = ['Python 2.7.12 x64', 'Python 2.7.12 x86', 'Python 2.7.13 x64', 'Python 2.7.13 x86', 'Python 3.5.3 x64', 'Python 3.5.3 x86', 'Python 3.6.0 x64', 'Python 3.6.0 x86', 'Python 3.6.2 x64', 'Python 3.6.1 x86']
+        
         build_configuration = None
-        if app_type == 'AspNetWap':
+        app_type = app_type_details.cd_app_type
+        if (app_type == 'AspNetWap') or (app_type == 'AspNetCore') or (app_type == 'PHP') :
             build_configuration = BuildConfiguration(app_type, working_directory)
-        elif app_type == 'AspNetCore':
-            build_configuration = BuildConfiguration(app_type, working_directory)
-        elif app_type == 'PHP':
-            build_configuration = BuildConfiguration(app_type, working_directory)
-        elif app_type == 'NodeJSWithGulp':
-            build_configuration = BuildConfiguration('NodeJS', working_directory, 'Gulp')
-        elif app_type == 'NodeJSWithGrunt':
-            build_configuration = BuildConfiguration('NodeJS', working_directory, 'Grunt')
+        elif app_type == 'NodeJS' :
+            nodejs_task_runner = app_type_details.nodejs_task_runner
+            if any(s == nodejs_task_runner for s in accepted_nodejs_task_runner) :
+                build_configuration = BuildConfiguration(app_type, working_directory, nodejs_task_runner)
+            else:
+                raise RuntimeError("The nodejs_task_runner %s was not understood. Accepted values: %s." % (nodejs_task_runner, accepted_nodejs_task_runner))
+        elif app_type == 'Python' :
+            python_framework = app_type_details.python_framework
+            python_version = app_type_details.python_version
+            django_setting_module = 'DjangoProjectName.settings'
+            flask_project_name = 'FlaskProjectName'
+            if any(s == python_framework for s in accepted_python_framework) :
+                if any(s == python_version for s in accepted_python_version) :
+                    build_configuration = BuildConfiguration(app_type, working_directory, None, python_framework, python_version, django_setting_module, flask_project_name)
+                else :
+                    raise RuntimeError("The python_version %s was not understood. Accepted values: %s." % (python_version, accepted_python_version))
+            else:
+                raise RuntimeError("The python_framework %s was not understood. Accepted values: %s." % (python_framework, accepted_python_framework))
         else:
-            raise RuntimeError("The app_type '{}' was not understood. Accepted values: AspNetWap, AspNetCore, NodeJSWithGulp, NodeJSWithGrunt, PHP.")
+            raise RuntimeError("The app_type %s was not understood. Accepted values: %s." % (app_type, accepted_app_type))
         return build_configuration
 
     def _get_source_repository(self, uri, token, branch, cred):