refactor pubsub sample for flex (GoogleCloudPlatform#292)

Author: bshaffer

appengine/flexible/pubsub/README.md

@@ -3,47 +3,5 @@
 ## Description
 
 This sample demonstrates how to invoke PubSub from Google App Engine Flexible
-Environment.
-
-The sample code lives in [a parent pubsub directory](../../../pubsub/app).
-Only one configuration file differs: `app.yaml`.
-
-## Register your application
-
-## Configuration
-
-- Edit `app.yaml`.  Replace `YOUR_PROJECT_ID` with your google project id.
-
-- Copy `app.yaml` into [../../../pubsub/app](../../../pubsub/app).  Ex:
-```sh
-~/gitrepos/php-docs-samples/appengine/flexible/pubsub$ cp -f app.yaml ../../../pubsub/app
-~/gitrepos/php-docs-samples/appengine/flexible/pubsub$ cd ../../../pubsub/app
-~/gitrepos/php-docs-samples/pubsub$
-```
-
-- Follow the [Prerequisite Instructions](../../../pubsub/app/README.md#prerequisites)
-
-## Deploy the application to App Engine
-
-```
-$ gcloud app deploy --set-default --project YOUR_PROJECT_ID
-```
-
-Then access the following URL:
-  https://{YOUR_PROJECT_NAME}.appspot.com/
-
-## Run the application locally
-
-```
-/usr/bin/php -S localhost:8910 -t web
-```
-
-## Contributing changes
-
-* See [CONTRIBUTING.md](../../../CONTRIBUTING.md)
-
-## Licensing
-
-* See [LICENSE](../../../LICENSE)
-
+Environment. See the section **Deploy to App Engine Flexible** in [Google PubSub PHP Sample Application](../../../pubsub/app).
 

pubsub/app/README.md

@@ -66,7 +66,16 @@ Then access the following URL:
 
 ## Deploy to App Engine Flexible
 
-See the instructions [here](../appengine/flexible/pubsub/README.md).
+- Change `YOUR_PROJECT_ID` in `app.yaml.flexible` to your project ID.
+
+Run the following gcloud command to deploy your app:
+
+```
+$ gcloud app deploy app.yaml.flexible
+```
+
+Then access the following URL:
+  https://{YOUR_PROJECT_NAME}.appspot.com/
 
 ## Run using Dev Appserver
 

pubsub/app/app.php

@@ -36,6 +36,8 @@
 
 $app->get('/fetch_messages', function () use ($app) {
     // get PUSH pubsub messages
+    $projectId = $app['project_id'];
+    $subscriptionName = $app['subscription'];
     $datastore = $app['datastore'];
     $query = $datastore->query()->kind('PubSubPushMessage');
     $messages = [];
@@ -48,10 +50,12 @@
     if ($pushKeys) {
         $datastore->deleteBatch($pushKeys);
     }
-
+    # [START pull]
     // get PULL pubsub messages
-    $pubsub = $app['pubsub'];
-    $subscription = $pubsub->subscription($app['subscription']);
+    $pubsub = new PubSubClient([
+        'projectId' => $projectId,
+    ]);
+    $subscription = $pubsub->subscription($subscriptionName);
     $pullMessages = [];
     foreach ($subscription->pull(['returnImmediately' => true]) as $pullMessage) {
         $pullMessages[] = $pullMessage;
@@ -61,11 +65,12 @@
     if ($pullMessages) {
         $subscription->acknowledgeBatch($pullMessages);
     }
-
+    # [END pull]
     return new JsonResponse($messages);
 });
 
 $app->post('/receive_message', function () use ($app) {
+    # [START receive]
     // pull the message from the post body
     $json = $app['request']->getContent();
     $request = json_decode($json, true);
@@ -75,23 +80,30 @@
     ) {
         return new Response('', 400);
     }
+    # [END receive]
     // store the push message in datastore
     $datastore = $app['datastore'];
     $message = $datastore->entity('PubSubPushMessage', [
         'message' => $message
     ]);
     $datastore->insert($message);
-
     return new Response();
 });
 
 $app->post('/send_message', function () use ($app) {
+    $projectId = $app['project_id'];
+    $topicName = $app['topic'];
+    # [START send]
     if ($message = $app['request']->get('message')) {
-        $pubsub = $app['pubsub'];
-        $topic = $pubsub->topic($app['topic']);
+        // Publish the pubsub message to the topic
+        $pubsub = new PubSubClient([
+            'projectId' => $projectId,
+        ]);
+        $topic = $pubsub->topic($topicName);
         $response = $topic->publish(['data' => $message]);
         return new Response('', 204);
     }
+    # [END send]
     return new Response('', 400);
 });
 
@@ -101,10 +113,4 @@
     ]);
 };
 
-$app['pubsub'] = function () use ($app) {
-    return new PubSubClient([
-        'projectId' => $app['project_id'],
-    ]);
-};
-
 return $app;

appengine/flexible/pubsub/app.yaml pubsub/app/app.yaml.flexibleappengine/flexible/pubsub/app.yaml renamed to pubsub/app/app.yaml.flexible

@@ -0,0 +1,5 @@
+{
+    "message": {
+        "data": "SGVsbG8sIFdvcmxkIQ=="
+    }
+}

pubsub/app/sample_message.json

@@ -26,7 +26,7 @@ class DeployAppEngineFlexTest extends \PHPUnit_Framework_TestCase
     public function beforeDeploy()
     {
         $tmpDir = FileUtil::cloneDirectoryIntoTmp(__DIR__ . '/..');
-        FileUtil::copyDir(__DIR__ . '/../../../appengine/flexible/pubsub', $tmpDir);
+        copy(__DIR__ . '/../app.yaml.flexible', $tmpDir . '/app.yaml');
         self::$gcloudWrapper->setDir($tmpDir);
         chdir($tmpDir);
     }