Fix flex memcache sample (GoogleCloudPlatform#837)

Author: bshaffer

.kokoro/secrets-example.sh

@@ -105,6 +105,11 @@ export CLOUD_TASKS_APPENGINE_QUEUE=
 export CLOUD_TASKS_LOCATION=
 export CLOUD_TASKS_PULL_QUEUE=
 
+# Redislabs Memcache
+export MEMCACHE_USERNAME=
+export MEMCACHE_PASSWORD=
+export MEMCACHE_ENDPOINT=
+
 # WordPress
 export WORDPRESS_DB_INSTANCE_NAME=
 export WORDPRESS_DB_USER=$CLOUDSQL_USER

.kokoro/secrets.sh.enc

@@ -25,25 +25,16 @@
 $app->register(new TwigServiceProvider());
 $app['twig.path'] = [ __DIR__ ];
 $app['memcached'] = function () {
-    if (getenv('USE_GAE_MEMCACHE')) {
-        $host = getenv('GAE_MEMCACHE_HOST') ?: 'localhost';
-        $port = getenv('GAE_MEMCACHE_PORT') ?: '11211';
-    } else {
-        $server = getenv('MEMCACHE_SERVER') ?: 'localhost:11211';
-        list($host, $port) = explode(':', $server);
-    }
+    # [START gae_flex_redislabs_memcache]
+    $endpoint = getenv('MEMCACHE_ENDPOINT');
     $username = getenv('MEMCACHE_USERNAME');
     $password = getenv('MEMCACHE_PASSWORD');
-    # [START gae_flex_redislabs_memcache]
-    // $host = 'YOUR_MEMCACHE_HOST';
-    // $port = 'YOUR_MEMCACHE_PORT';
-    // $username = 'OPTIONAL_MEMCACHE_USERNAME';
-    // $password = 'OPTIONAL_MEMCACHE_PASSWORD';
     $memcached = new Memcached;
     if ($username && $password) {
         $memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
         $memcached->setSaslAuthData($username, $password);
     }
+    list($host, $port) = explode(':', $endpoint);
     if (!$memcached->addServer($host, $port)) {
         throw new Exception("Failed to add server $host:$port");
     }

appengine/flexible/memcache/app.php

@@ -1,15 +1,13 @@
 runtime: php
-vm: true
+env: flex
 
 runtime_config:
   document_root: web
 
 # [START gae_flex_redislabs_memcache_yaml]
 env_variables:
-  # If you are using the App Engine Memcache service (currently in alpha),
-  # uncomment this section and comment out the other Memcache variables.
-  # USE_GAE_MEMCACHE: 1
-  MEMCACHE_SERVER: your-memcache-server
+  # Set your memcache endpoint here. This should be in the format "host:port"
+  MEMCACHE_ENDPOINT: "YOUR_MEMCACHE_ENDPOINT"
   # If you are using a Memcached server with SASL authentiation enabled,
   # fill in these values with your username and password.
   MEMCACHE_USERNAME: ""

appengine/flexible/memcache/app.yaml

@@ -4,10 +4,10 @@
         "twig/twig": "^1.24"
     },
     "require-dev": {
+        "google/cloud-tools": "^0.9.0",
         "gecko-packages/gecko-memcache-mock": "^2.0",
-        "google/cloud-tools": "^0.6",
         "paragonie/random_compat": "^2.0",
-        "guzzlehttp/guzzle": "^6.3",
-        "monolog/monolog": "^1.19"
+        "monolog/monolog": "^1.19",
+        "symfony/yaml": "~3.0|~4.0"
     }
 }

appengine/flexible/memcache/composer.json

@@ -17,12 +17,14 @@
 namespace Google\Cloud\Test\Memcache;
 
 use Google\Cloud\TestUtils\AppEngineDeploymentTrait;
+use Google\Cloud\TestUtils\TestTrait;
 use Google\Cloud\TestUtils\FileUtil;
 use Symfony\Component\Yaml\Yaml;
 use PHPUnit\Framework\TestCase;
 
 class DeployTest extends TestCase
 {
+    use TestTrait;
     use AppEngineDeploymentTrait;
 
     public static function beforeDeploy()
@@ -31,19 +33,10 @@ public static function beforeDeploy()
         self::$gcloudWrapper->setDir($tmpDir);
         chdir($tmpDir);
 
-        $user = getenv('MEMCACHE_USERNAME');
-        $password = getenv('MEMCACHE_PASSWORD');
-        $server = getenv('MEMCACHE_SERVER');
-
-        if (empty($user) || empty($password) || empty($server)) {
-            self::markTestSkipped('Must set MEMCACHE_USERNAME, ' .
-                'MEMCACHE_PASSWORD, and MEMCACHE_SERVER');
-        }
-
         $appYaml = Yaml::parse(file_get_contents('app.yaml'));
-        $appYaml['env_variables']['MEMCACHE_USERNAME'] = $user;
-        $appYaml['env_variables']['MEMCACHE_PASSWORD'] = $password;
-        $appYaml['env_variables']['MEMCACHE_SERVER'] = $server;
+        $appYaml['env_variables']['MEMCACHE_ENDPOINT'] = self::requireEnv('MEMCACHE_ENDPOINT');
+        $appYaml['env_variables']['MEMCACHE_USERNAME'] = self::requireEnv('MEMCACHE_USERNAME');
+        $appYaml['env_variables']['MEMCACHE_PASSWORD'] = self::requireEnv('MEMCACHE_PASSWORD');
 
         file_put_contents('app.yaml', Yaml::dump($appYaml));
     }