Fix cloudsql README and app.yamls (GoogleCloudPlatform#642)

Author: bshaffer

appengine/php72/cloudsql/README.md

@@ -10,33 +10,28 @@ Before you can run or deploy the sample, you will need to do the following:
 
         $ gcloud sql instances create YOUR_INSTANCE_NAME
 
-1. Set the root password on your Cloud SQL instance:
+1. Create a database for the sample, for instance `cloudsql_sample`:
 
-        $ gcloud sql instances set-root-password YOUR_INSTANCE_NAME --password YOUR_INSTANCE_ROOT_PASSWORD
+        $ gcloud sql databases create cloudsql_sample --instance=YOUR_INSTANCE_NAME
 
-1. Update the connection string in `app.yaml` with your configuration values. These values are used when the application is deployed.
+1. Set the root password on your Cloud SQL instance:
 
-## Run locally
+        $ gcloud sql users set-password root --host % --instance YOUR_INSTANCE_NAME --password YOUR_INSTANCE_ROOT_PASSWORD
 
-You can connect to a local database instance by setting the `CLOUDSQL_` environment variables
-to your local instance. Alternatively, you can set them to your Cloud instances, but you will need
-to create a firewall rule for this, which may be a safety concern.
+1. Clone the repository and CD into the directory for this sample
 
-```sh
-cd php-docs-samples/appengine/php72/cloudsql
+        git clone https://github.com/GoogleCloudPlatform/php-docs-samples.git
+        cd php-docs-samples/appengine/php72/cloudsql
 
-# set local connection parameters
-export CLOUDSQL_USERNAME=root
-export CLOUDSQL_PASSWORD=
-export CLOUDSQL_DSN="mysql:host=localhost;dbname=guestbook"
+1. Update `app.yaml` (or if you're using CloudSQL with PostgreSQL, update `app-postgres.yaml`)
+   with your configuration values. These values are used when the application is deployed:
 
-php -S localhost:8080
-```
-
-> be sure the `CLOUDSQL_` environment variables are appropriate for your MySQL or PostgreSQL instance.
-
-Now you can view the app running at [http://localhost:8080](http://localhost:8080)
-in your browser.
+        env_variables:
+            # Replace USER, PASSWORD, DATABASE, and CONNECTION_NAME with the
+            # values obtained when configuring your Cloud SQL instance.
+            CLOUDSQL_USER: USER
+            CLOUDSQL_PASSWORD: PASSWORD
+            CLOUDSQL_DSN: "mysql:dbname=DATABASE;unix_socket=/cloudsql/CONNECTION_NAME"
 
 ## Deploy to App Engine
 
@@ -46,11 +41,54 @@ in your browser.
 
 **Deploy with gcloud**
 
-```
+If you haven't already, authenticate gcloud using your Google account and
+configure gcloud to use your project ID:
+
+```sh
+gcloud auth login
 gcloud config set project YOUR_PROJECT_ID
+```
+
+Next, deploy your application:
+
+```sh
 gcloud app deploy
 gcloud app browse
 ```
 
 The last command will open `https://{YOUR_PROJECT_ID}.appspot.com/`
 in your browser.
+
+If your CloudSQL instance is running PostgreSQL instead of MySQL, deploy using
+`app-postgres.yaml` instead:
+
+```sh
+gcloud app deploy app-postgres.yaml
+```
+
+## Run locally
+
+To run the sample locally, you will want to use the [CloudSQL proxy](https://cloud.google.com/sql/docs/mysql/sql-proxy#install).
+The CloudSQL proxy allows you to connect to your CloudSQL instance locally without
+having to set up firewall rules.
+
+```sh
+./cloud_sql_proxy \
+    -instances YOUR_INSTANCE_NAME \
+    -dir /cloudsql \
+    -credentials /path/to/your_service_account_credentials.json
+```
+
+Then set your CloudSQL environment variables and run the PHP web server:
+
+```sh
+# set local connection parameters (but replace the uppercase words!)
+export CLOUDSQL_USERNAME=USER
+export CLOUDSQL_PASSWORD=PASSWORD
+export CLOUDSQL_DSN="mysql:dbname=DATABASE;unix_socket=/cloudsql/CONNECTION_NAME"
+
+php -S localhost:8080
+```
+
+Now you can view the app running at [http://localhost:8080](http://localhost:8080)
+in your browser.

appengine/php72/cloudsql/app-postgres.yaml

@@ -3,10 +3,6 @@
 
 runtime: php72
 
-handlers:
-- url: /
-  script: index.php
-
 # [START gae_cloudsql_postgres_env]
 env_variables:
   # Replace USER, PASSWORD, DATABASE, and CONNECTION_NAME with the
@@ -15,9 +11,3 @@ env_variables:
   CLOUDSQL_PASSWORD: PASSWORD
   CLOUDSQL_DSN: "pgsql:dbname=DATABASE;host=/cloudsql/CONNECTION_NAME"
 # [END gae_cloudsql_postgres_env]
-
-# [START gae_cloudsql_postgres_settings]
-# Use the connection name obtained when configuring your Cloud SQL instance.
-beta_settings:
-    cloud_sql_instances: "CONNECTION_NAME"
-# [END gae_cloudsql_postgres_settings]

appengine/php72/cloudsql/app.yaml

@@ -3,10 +3,6 @@
 
 runtime: php72
 
-handlers:
-- url: /
-  script: index.php
-
 # [START gae_cloudsql_mysql_env]
 env_variables:
   # Replace USER, PASSWORD, DATABASE, and CONNECTION_NAME with the
@@ -16,8 +12,3 @@ env_variables:
   CLOUDSQL_DSN: "mysql:dbname=DATABASE;unix_socket=/cloudsql/CONNECTION_NAME"
 # [END gae_cloudsql_mysql_env]
 
-# [START gae_cloudsql_mysql_settings]
-# Use the connection name obtained when configuring your Cloud SQL instance.
-beta_settings:
-    cloud_sql_instances: "CONNECTION_NAME"
-# [END gae_cloudsql_mysql_settings]

appengine/php72/cloudsql/test/DeployMySQLTest.php

@@ -59,7 +59,6 @@ public static function beforeDeploy()
         $appYaml = Yaml::parse($appYamlContents);
         $appYaml['env_variables']['CLOUDSQL_USER'] = $user;
         $appYaml['env_variables']['CLOUDSQL_PASSWORD'] = $password;
-        $appYaml['beta_settings']['cloud_sql_instances'] = $connectionName;
         $appYaml['env_variables']['CLOUDSQL_DSN'] = str_replace(
             ['DATABASE', 'CONNECTION_NAME'],
             [$database, $connectionName],

appengine/php72/cloudsql/test/DeployPostgresTest.php

@@ -59,7 +59,6 @@ public static function beforeDeploy()
         $appYaml = Yaml::parse($appYamlContents);
         $appYaml['env_variables']['CLOUDSQL_USER'] = $user;
         $appYaml['env_variables']['CLOUDSQL_PASSWORD'] = $password;
-        $appYaml['beta_settings']['cloud_sql_instances'] = $connectionName;
         $appYaml['env_variables']['CLOUDSQL_DSN'] = str_replace(
             ['DATABASE', 'CONNECTION_NAME'],
             [$database, $connectionName],