Upgrades everything to env flex! (GoogleCloudPlatform#231)

* Upgrade endpoints to env flex (GoogleCloudPlatform#230)

* WIP for endpoints on env:flex

* updates tests for endpoints app - requires 'gcloud beta app deploy'

* updates google/cloud-tools version for semantic versioning

* upgrade pubsub sample to env:flex (GoogleCloudPlatform#228)

* upgrades symfony sample to env:flex (GoogleCloudPlatform#227)

* upgrades symfony sample to env:flex

* updates google/cloud-tools version for semantic versioning

* upgrade sendgrid sample to env flex (GoogleCloudPlatform#226)

* upgrades staticcontent sample to env:flex (GoogleCloudPlatform#225)

* upgradces twilio sample to env:flex (GoogleCloudPlatform#224)

* update analytics sample for env:flex (GoogleCloudPlatform#222)

* updates datastore sample to env:flex (GoogleCloudPlatform#221)

* updates Mailgun sample for env:flex (GoogleCloudPlatform#220)

* upgrades Mailjet sample for env:flex (GoogleCloudPlatform#219)

* updates cloudsql sample to env:flex (GoogleCloudPlatform#218)

* updates drupal sample for env:flex (GoogleCloudPlatform#217)

* adds proper cs

Author: bshaffer

appengine/flexible/analytics/app.yaml

@@ -1,5 +1,5 @@
 runtime: php
-vm: true
+env: flex
 
 runtime_config:
-  document_root: web
+  document_root: web

appengine/flexible/analytics/tests/DeployTest.php

@@ -0,0 +1,34 @@
+
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+namespace Google\Cloud\Samples\AppEngine\Analytics;
+
+use Google\Cloud\TestUtils\AppEngineDeploymentTrait;
+
+class DeployTest extends \PHPUnit_Framework_TestCase
+{
+    use AppEngineDeploymentTrait;
+
+    public function testIndex()
+    {
+        // Access the modules app top page.
+        $resp = $this->client->get('/');
+        $this->assertEquals('200', $resp->getStatusCode(),
+            'top page status code');
+        $this->assertContains('returned 200', (string) $resp->getBody(),
+            'top page content');
+    }
+}

appengine/flexible/analytics/tests/LocalTest.php

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-namespace Google\Cloud\Test;
+namespace Google\Cloud\Samples\AppEngine\Analytics;
 
 use Silex\WebTestCase;
 

appengine/flexible/cloudsql/README.md

@@ -19,35 +19,23 @@ composer install
 
 Before you can run or deploy the sample, you will need to do the following:
 
-1. Create a [First Generation Cloud SQL](https://cloud.google.com/sql/docs/create-instance) instance. You can do this from the [Cloud Console](https://console.developers.google.com) or via the [Cloud SDK](https://cloud.google.com/sdk). To create it via the SDK use the following command:
+1. Create a [Second Generation Cloud SQL](https://cloud.google.com/sql/docs/create-instance) instance. You can do this from the [Cloud Console](https://console.developers.google.com) or via the [Cloud SDK](https://cloud.google.com/sdk). To create it via the SDK use the following command:
 
-        $ gcloud sql instances create YOUR_INSTANCE_NAME
+        $ gcloud beta sql instances create YOUR_INSTANCE_NAME --tier=db-f1-micro --activation-policy=ALWAYS
 
-1. Set the root password on your Cloud SQL instance:
+	> Note: the `--tier` option is required to create a `Second Generation` instance. See the
+	  full list of available tiers by running `gcloud sql tiers list`
 
-        $ gcloud sql instances set-root-password YOUR_INSTANCE_NAME --password YOUR_INSTANCE_ROOT_PASSWORD
-
-1. Update the connection string in `app.yaml` with your configuration values. These values are used when the application is deployed.
-
-## Run locally
-
-To run locally, you can either run your own MySQL server locally and set the connection string in `app.yaml`, or you can [connect to your CloudSQL instance externally](https://cloud.google.com/sql/docs/external#appaccess).
+2. Set the root password on your Cloud SQL instance:
 
-```sh
-cd php-docs-samples/appengine/standard/cloudsql
+        $ gcloud sql instances set-root-password YOUR_INSTANCE_NAME --password YOUR_INSTANCE_ROOT_PASSWORD
 
-# set local mysql connection parameters
-export MYSQL_DSN="mysql:host=127.0.0.1;port=3306;dbname=guestbook"
-export MYSQL_USERNAME=root
-export MYSQL_PASSWORD=
+3. Install and run the [CloudSQL Proxy](https://cloud.google.com/sql/docs/mysql-connect-proxy)
 
-php -S localhost:8080
-```
+4. Create a database for this example
 
-> be sure the `MYSQL_` environment variables are appropriate for your mysql instance
+        $ mysql -h 127.0.0.1 -u root -p -e "CREATE DATABASE ;"
 
-Now you can view the app running at [http://localhost:8080](http://localhost:8080)
-in your browser.
 
 ## Deploy to App Engine
 
@@ -57,6 +45,16 @@ in your browser.
 
 **Deploy with gcloud**
 
+1. Update `app.yaml` with the configuration values for `USER`, `PASSWORD`, and
+   `DATABASE` with the values you used during setup.
+
+1. Get the CloudSQL connection name
+
+    $ gcloud beta sql instances describe YOUR_INSTANCE_NAME | grep connectionName
+
+1. Update `app.yaml` with the configuration value for `CONNECTION_NAME` you retrieved
+   at the end up setup.
+
 ```
 gcloud config set project YOUR_PROJECT_ID
 gcloud app deploy
@@ -65,3 +63,28 @@ gcloud app browse
 
 The last command will open `https://{YOUR_PROJECT_ID}.appspot.com/`
 in your browser.
+
+## Run locally
+
+1.  Ensure the [CloudSQL Proxy](https://cloud.google.com/sql/docs/external#proxy) is
+    installed and running.
+
+1.  Set the following environment variables with the configuration values for
+    `USER`, `PASSWORD`, and `DATABASE` you used during setup:
+
+    ```sh
+    # set local mysql connection parameters
+    export MYSQL_DSN="mysql:host=127.0.0.1;port=3306;dbname=DATABASE"
+    export MYSQL_USERNAME=USER
+    export MYSQL_PASSWORD=PASSWORD
+    ```
+
+1.  Run the application
+
+    ```sh
+    cd php-docs-samples/appengine/standard/cloudsql
+    php -S localhost:8080
+    ```
+
+Now you can view the app running at [http://localhost:8080](http://localhost:8080)
+in your browser.

appengine/flexible/cloudsql/app.yaml

@@ -1,5 +1,17 @@
 runtime: php
-vm: true
+env: flex
 
-runtime_config:
-  document_root: web
+#[START env]
+env_variables:
+    # Replace USER, PASSWORD, DATABASE, and CONNECTION_NAME with the
+    # values obtained when configuring your Cloud SQL instance.
+    MYSQL_DSN: mysql:dbname=DATABASE;unix_socket=/cloudsql/CONNECTION_NAME
+    MYSQL_USER: USER
+    MYSQL_PASSWORD: PASSWORD
+#[END env]
+
+#[START cloudsql_settings]
+# Use the connection name obtained when configuring your Cloud SQL instance.
+beta_settings:
+    cloud_sql_instances: "CONNECTION_NAME"
+#[END cloudsql_settings]

appengine/flexible/cloudsql/composer.json

@@ -5,6 +5,7 @@
     },
     "require-dev": {
         "google/cloud-tools": "<=1.0",
+        "paragonie/random_compat": "^2.0",
         "phpunit/phpunit": "~4"
     }
 }