Adding support for switches and runtimes

src/hack/azext_hack/__init__.py

@@ -6,20 +6,28 @@
 from azure.cli.core import AzCommandsLoader
 from azure.cli.command_modules.appservice.commands import ex_handler_factory
 
+
 class HackExtCommandLoader(AzCommandsLoader):
     def __init__(self, cli_ctx=None):
         from azure.cli.core.commands import CliCommandType
         hack_custom = CliCommandType(operations_tmpl='azext_hack.custom#{}')
         super(HackExtCommandLoader, self).__init__(cli_ctx=cli_ctx,
                                                    custom_command_type=hack_custom,
                                                    min_profile="2017-03-10-profile")
+
     def load_command_table(self, _):
         with self.command_group('hack') as g:
             g.custom_command('up', 'hack_up')
         return self.command_table
 
     def load_arguments(self, _):
         with self.argument_context('hack up') as c:
-            c.argument('name', options_list=['--name', '-n'], help='Name of resources')
+            c.argument('name', options_list=[
+                       '--name', '-n'], help='Name of resources')
+            c.argument('database', options_list=[
+                       '--database', '-d'], help='Database type - { SQL | MySQL }', choices=['SQL', 'MySQL'], default='sql')
+            c.argument('runtime', options_list=['--runtime', '-r'], help='Runtime', choices=[
+                       'php', 'node', 'tomcat', 'jetty', 'python', 'aspnet'])
+
 
 COMMAND_LOADER_CLS = HackExtCommandLoader

src/hack/azext_hack/custom.py

@@ -14,35 +14,33 @@
 
 logger = get_logger(__name__)
 
-def hack_up(cmd, name):
+def hack_up(cmd, name, runtime, database='sql'):
     location = 'westus'
-    runtime = 'Python|3.6'
     database_admin = name + '_user'
     database_password = uuid4()
     output = {}
-    database_provider = 'mysql'
 
     # Create RG
     logger.warning("Creating resource group")
     create_resource_group(cmd, name, location)
     logger.warning("Created resource group")
     # Create SQL server and database
     logger.warning("Starting database creation job...")
-    database_poller = create_database(cmd, database_provider, name, location, database_admin, database_password)
+    database_poller = create_database(cmd, database, name, location, database_admin, database_password)
     # Create app service plan and website
     logger.warning("Starting website creation job...")
     output = create_website(cmd, name, runtime)
-    output['settings'] = set_website_settings(cmd, name, database_admin, database_password)
+    output['settings'] = set_website_settings(cmd, name, database, database_admin, database_password)
     # Database takes a while. Wait at the end for it to complete
     while True:
         database_poller.result(15)
         if database_poller.done():
             break
 
     if output['deployment_password'] == '***':
-        logger.warning('Deployment user was already created. To change password use az webapp deployment user set')
+        logger.warning('Deployment user was already created. To change password use `az webapp deployment user set`')
     else:
-        logger.warning('Created password for deployment user. To change use az webapp deployment user set')
+        logger.warning('Created password for deployment user. To change use `az webapp deployment user set`')
     return output
 
 def hack_down(cmd, name, dryrun=False, confirm=False):

src/hack/azext_hack/utils.py

@@ -72,10 +72,9 @@ def create_database(cmd, database_provider, name, location, admin, password):
         database_client = cf_mysql_db(cmd.cli_ctx, None)
         admin = admin[:16]
         database_settings['engine'] = 'django.db.backends.mysql'
-
 
         def server_creator():
-            sku_name='B_Gen5_1'
+            sku_name = 'B_Gen5_1'
             parameters = ServerForCreate(
                 sku=MySqlSku(name=sku_name),
                 location=location,
@@ -92,6 +91,7 @@ def server_creator():
                 )
             )
             return server_client.create(resource_group_name=name, server_name=name, parameters=parameters)
+
         def database_creator():
             print('in mysql database creator')
             return database_client.create_or_update(
@@ -124,12 +124,52 @@ def database_creator():
     return wrapper
 
 
+RUNTIMES = {
+    'php': {
+        'name': 'php|7.3',
+        'is_linux': True
+    },
+    'node': {
+        'name': 'node|10.6',
+        'is_linux': True
+    },
+    'tomcat': {
+        'name': 'java|11|Tomcat|9.0',
+        'is_linux': True
+    },
+    'jetty': {
+        'name': 'java|11|Jetty|9.3',
+        'is_linux': True
+    },
+    'python': {
+        'name': 'python|3.6',
+        'is_linux': True
+    },
+    'aspnet': {
+        'name': 'aspnet|4.7',
+        'is_linux': False
+    }
+}
+
+DATABASES = {
+    'mysql': {
+        'host': '{}.mysql.database.azure.com',
+        'port': '3306'
+    },
+    'sql': {
+        'host': '{}.database.windows.net',
+        'port': '1433'
+    }
+}
+
+
 def create_website(cmd, name, runtime, deployment_local_git=True, deployment_user=None):
+    runtime_values = RUNTIMES[runtime.lower()]
     deployment_user_password = None
     create_app_service_plan(cmd, resource_group_name=name,
-                            name=name, is_linux=True, hyper_v=False).result()
+                            name=name, is_linux=runtime_values['is_linux'], hyper_v=False).result()
     webapp = create_webapp(cmd, resource_group_name=name,
-                           name=name, plan=name, runtime=runtime,
+                           name=name, plan=name, runtime=runtime_values['name'],
                            deployment_local_git=deployment_local_git)
     if deployment_user:
         deployment_user_password = uuid4()
@@ -145,15 +185,15 @@ def create_website(cmd, name, runtime, deployment_local_git=True, deployment_use
     site['hostname'] = 'https://{}'.format(webapp.host_names[0])
     return site
 
-
-def set_website_settings(cmd, name, database_admin, database_password):
+def set_website_settings(cmd, name, database_provider, database_admin, database_password):
     # TODO: Update username to avoid issues
+    database_options = DATABASES[database_provider.lower()]
     settings = []
     settings.append('DATABASE_NAME={}'.format(name))
-    settings.append('DATABASE_HOST={}.database.windows.net'.format(name))
-    settings.append('DATABASE_PORT=1433')
+    settings.append('DATABASE_HOST={}'.format(database_options['host'].format(name)))
+    settings.append('DATABASE_PORT={}'.format(database_options['port']))
     settings.append('DATABASE_USER={}'.format(database_admin))
-    settings.append('DATABASE_PASSWORD={}'.format(database_admin))
+    settings.append('DATABASE_PASSWORD={}'.format(database_password))
     update_app_settings(cmd, resource_group_name=name,
                         name=name, settings=settings)
     return settings

src/hack/build.bat

@@ -1 +1 @@
-az group delete -n geektrainertesting -y && az extension remove -n hack && python setup.py bdist_wheel && az extension add --source .\dist\hack-0.2.17-py2.py3-none-any.whl -y && az hack up -n geektrainertesting
+az group delete -n geektrainertesting -y && az extension remove -n hack && python setup.py bdist_wheel && az extension add --source .\dist\hack-0.2.17-py2.py3-none-any.whl -y && az hack up -n geektrainertesting -d MySQL -r php