Added some options for choosing Cloud SQL generation and the db region. (GoogleCloudPlatform#121)

* Added some options for choosing Cloud SQL generation and the db region.

Author: Takashi Matsuo

appengine/wordpress/src/WordPressSetup.php

@@ -40,6 +40,15 @@ class WordPressSetup extends Command
     const FLEXIBLE_ENV = 'Flexible Environment';
     const STANDARD_ENV = 'Standard Environment';
 
+    const DEFAULT_DB_REGION = 'us-central1';
+
+    private static $availableDbRegions = array(
+        'us-central1',
+        'us-east1',
+        'europe-west1',
+        'asia-east1',
+    );
+
     protected function configure()
     {
         $this
@@ -63,13 +72,29 @@ protected function configure()
                 'Directory for the new project',
                 self::DEFAULT_DIR
             )
+            ->addOption(
+                'sql_gen',
+                '',
+                InputOption::VALUE_OPTIONAL,
+                sprintf('Cloud SQL generation to use; 2: %s, 1: %s',
+                        'Second Generation',
+                        'First Generation'),
+                2
+            )
             ->addOption(
                 'project_id',
                 'p',
                 InputOption::VALUE_OPTIONAL,
                 'Google Cloud project id',
                 ''
             )
+            ->addOption(
+                'db_region',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Cloud SQL region',
+                ''
+            )
             ->addOption(
                 'db_instance',
                 null,
@@ -225,15 +250,53 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $q->setErrorMessage('Environment %s is invalid.');
             $env = $helper->ask($input, $output, $q);
         }
-        $output->writeln('Creating a new project for: ' . $env);
+        $output->writeln('Creating a new project for: ' . $env
+                         . '');
+
+        // Determine the Cloud SQL Generation to use.
+        $sql_gen = $input->getOption('sql_gen');
+        switch ($sql_gen) {
+            case '1':
+                if ($env === self::FLEXIBLE_ENV) {
+                    $output->writeln('You can not use '
+                                     . 'Cloud SQL First Generation with '
+                                     . self::FLEXIBLE_ENV . '.');
+                    return self::DEFAULT_ERROR;
+                }
+                $db_connection_pattern = '%s:%s';
+                break;
+            case '2':
+                $db_region = $input->getOption('db_region');
+                if (! in_array($db_region, self::$availableDbRegions)) {
+                    $q = new ChoiceQuestion(
+                        'Please select the region of your Cloud SQL instance '
+                        . '(defaults to ' . self::DEFAULT_DB_REGION . ')',
+                        self::$availableDbRegions,
+                        self::DEFAULT_DB_REGION
+                    );
+                    $q->setErrorMessage('DB region %s is invalid.');
+                    $db_region = $helper->ask($input, $output, $q);
+                    $output->writeln('Using a db_region: ' . $db_region
+                                     . '');
+                }
+                $db_connection_pattern = "%s:$db_region:%s";
+                break;
+            default:
+                $output->writeln(
+                    sprintf(
+                        'Invalid value for sql_gen: %s.',
+                        $sql_gen
+                    )
+                );
+                return self::DEFAULT_ERROR;
+        }
 
         $output->writeln('Downloading the WordPress archive...');
         $wpUrl = $input->getOption('wordpress_url');
         $project->downloadArchive('the WordPress archive', $wpUrl);
         if (!$this->report($output, $project)) {
             return self::DEFAULT_ERROR;
         }
-
         $output->writeln('Downloading the Batcache plugin...');
         $project->downloadArchive(
             'Batcache plugin', self::LATEST_BATCACHE,
@@ -301,6 +364,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
         $params = array();
         $this->askParameters($keys, $params, $input, $output, $helper);
+        $params['db_connection'] = sprintf(
+            $db_connection_pattern,
+            $params['project_id'],
+            $params['db_instance']
+        );
         $q = new ConfirmationQuestion(
             'Do you want to use the same db user and password for '
             . 'local run? (Y/n)',

appengine/wordpress/src/files/flexible/app.yaml

@@ -2,7 +2,7 @@ runtime: php
 vm: true
 
 beta_settings:
-  cloud_sql_instances: {{project_id}}:us-central1:{{db_instance}}
+  cloud_sql_instances: {{db_connection}}
 
 runtime_config:
   document_root: wordpress

appengine/wordpress/src/files/flexible/wp-config.php

@@ -70,25 +70,22 @@
 // ** MySQL settings - You can get this info from your web host ** //
 if ($onGae) {
     /** Production environment */
+    define('DB_HOST', ':/cloudsql/{{db_connection}}');
     /** The name of the database for WordPress */
     define('DB_NAME', '{{db_name}}');
     /** MySQL database username */
     define('DB_USER', '{{db_user}}');
     /** MySQL database password */
     define('DB_PASSWORD', '{{db_password}}');
-    define(
-        'DB_HOST',
-        'localhost:/cloudsql/{{project_id}}:us-central1:{{db_instance}}'
-    );
 } else {
     /** Local environment */
+    define('DB_HOST', '127.0.0.1');
     /** The name of the database for WordPress */
     define('DB_NAME', '{{db_name}}');
     /** MySQL database username */
     define('DB_USER', '{{local_db_user}}');
     /** MySQL database password */
     define('DB_PASSWORD', '{{local_db_password}}');
-    define('DB_HOST', '127.0.0.1');
 }
 
 /** Database Charset to use in creating database tables. */

appengine/wordpress/src/files/standard/wp-config.php

@@ -53,7 +53,7 @@
     /** The name of the Cloud SQL database for WordPress */
     define('DB_NAME', '{{db_name}}');
     /** Production login info */
-    define('DB_HOST', ':/cloudsql/{{project_id}}:{{db_instance}}');
+    define('DB_HOST', ':/cloudsql/{{db_connection}}');
     define('DB_USER', '{{db_user}}');
     define('DB_PASSWORD', '{{db_password}}');
 } else {