updates to PubSub standard region tags (GoogleCloudPlatform#610)

alixhami · bshaffer · commit dc908ccdb04e · 2018-05-21T15:07:39.000-07:00
diff --git a/pubsub/api/src/functions/create_push_subscription.php b/pubsub/api/src/functions/create_push_subscription.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START create_push_subscription]
+# [START pubsub_create_push_subscription]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -45,4 +45,4 @@ function create_push_subscription($projectId, $topicName, $subscriptionName, $en
         'endpoint' => $endpoint
     ]);
 }
-# [END create_push_subscription]
+# [END pubsub_create_push_subscription]
diff --git a/pubsub/api/src/functions/create_subscription.php b/pubsub/api/src/functions/create_subscription.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START create_subscription]
+# [START pubsub_create_pull_subscription]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -44,4 +44,4 @@ function create_subscription($projectId, $topicName, $subscriptionName)
 
     printf('Subscription created: %s' . PHP_EOL, $subscription->name());
 }
-# [END create_subscription]
+# [END pubsub_create_pull_subscription]
diff --git a/pubsub/api/src/functions/create_topic.php b/pubsub/api/src/functions/create_topic.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START create_topic]
+# [START pubsub_create_topic]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -41,4 +41,4 @@ function create_topic($projectId, $topicName)
 
     printf('Topic created: %s' . PHP_EOL, $topic->name());
 }
-# [END create_topic]
+# [END pubsub_create_topic]
diff --git a/pubsub/api/src/functions/delete_subscription.php b/pubsub/api/src/functions/delete_subscription.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START delete_subscription]
+# [START pubsub_delete_subscription]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -42,4 +42,4 @@ function delete_subscription($projectId, $subscriptionName)
 
     printf('Subscription deleted: %s' . PHP_EOL, $subscription->name());
 }
-# [END delete_subscription]
+# [END pubsub_delete_subscription]
diff --git a/pubsub/api/src/functions/delete_topic.php b/pubsub/api/src/functions/delete_topic.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START delete_topic]
+# [START pubsub_delete_topic]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -42,4 +42,4 @@ function delete_topic($projectId, $topicName)
 
     printf('Topic deleted: %s' . PHP_EOL, $topic->name());
 }
-# [END delete_topic]
+# [END pubsub_delete_topic]
diff --git a/pubsub/api/src/functions/get_subscription_policy.php b/pubsub/api/src/functions/get_subscription_policy.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START get_subscription_policy]
+# [START pubsub_get_subscription_policy]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -41,4 +41,4 @@ function get_subscription_policy($projectId, $subscriptionName)
     $policy = $subscription->iam()->policy();
     print_r($policy);
 }
-# [END get_subscription_policy]
+# [END pubsub_get_subscription_policy]
diff --git a/pubsub/api/src/functions/get_topic_policy.php b/pubsub/api/src/functions/get_topic_policy.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START get_topic_policy]
+# [START pubsub_get_topic_policy]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -41,4 +41,4 @@ function get_topic_policy($projectId, $topicName)
     $policy = $topic->iam()->policy();
     print_r($policy);
 }
-# [END get_topic_policy]
+# [END pubsub_get_topic_policy]
diff --git a/pubsub/api/src/functions/list_subscriptions.php b/pubsub/api/src/functions/list_subscriptions.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START list_subscriptions]
+# [START pubsub_list_subscriptions]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -40,4 +40,4 @@ function list_subscriptions($projectId)
         printf('Subscription: %s' . PHP_EOL, $subscription->name());
     }
 }
-# [END list_subscriptions]
+# [END pubsub_list_subscriptions]
diff --git a/pubsub/api/src/functions/list_topics.php b/pubsub/api/src/functions/list_topics.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START list_topics]
+# [START pubsub_list_topics]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -40,4 +40,4 @@ function list_topics($projectId)
         printf('Topic: %s' . PHP_EOL, $topic->name());
     }
 }
-# [END list_topics]
+# [END pubsub_list_topics]
diff --git a/pubsub/api/src/functions/publish_message.php b/pubsub/api/src/functions/publish_message.php
@@ -23,7 +23,8 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START publish_message]
+# [START pubsub_publish]
+# [START pubsub_quickstart_publisher]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -42,4 +43,5 @@ function publish_message($projectId, $topicName, $message)
     $topic->publish(['data' => $message]);
     print('Message published' . PHP_EOL);
 }
-# [END publish_message]
+# [END pubsub_publish]
+# [END pubsub_quickstart_publisher]
diff --git a/pubsub/api/src/functions/pull_messages.php b/pubsub/api/src/functions/pull_messages.php
@@ -23,7 +23,8 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START pull_message]
+# [START pubsub_subscriber_sync_pull]
+# [START pubsub_quickstart_subscriber]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -44,4 +45,5 @@ function pull_messages($projectId, $subscriptionName)
         $subscription->acknowledge($message);
     }
 }
-# [END pull_message]
+# [END pubsub_subscriber_sync_pull]
+# [END pubsub_quickstart_subscriber]
diff --git a/pubsub/api/src/functions/set_subscription_policy.php b/pubsub/api/src/functions/set_subscription_policy.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START set_subscription_policy]
+# [START pubsub_set_subscription_policy]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -50,4 +50,4 @@ function set_subscription_policy($projectId, $subscriptionName, $userEmail)
         $userEmail,
         $subscriptionName);
 }
-# [END set_subscription_policy]
+# [END pubsub_set_subscription_policy]
diff --git a/pubsub/api/src/functions/set_topic_policy.php b/pubsub/api/src/functions/set_topic_policy.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START set_topic_policy]
+# [START pubsub_set_topic_policy]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -50,4 +50,4 @@ function set_topic_policy($projectId, $topicName, $userEmail)
         $userEmail,
         $topicName);
 }
-# [END set_topic_policy]
+# [END pubsub_set_topic_policy]
diff --git a/pubsub/api/src/functions/test_subscription_permissions.php b/pubsub/api/src/functions/test_subscription_permissions.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START test_subscription_permissions]
+# [START pubsub_test_subscription_permissions]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -46,4 +46,4 @@ function test_subscription_permissions($projectId, $subscriptionName)
         printf('Permission: %s' . PHP_EOL, $permission);
     }
 }
-# [END test_subscription_permissions]
+# [END pubsub_test_subscription_permissions]
diff --git a/pubsub/api/src/functions/test_topic_permissions.php b/pubsub/api/src/functions/test_topic_permissions.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\PubSub;
 
-# [START test_topic_permissions]
+# [START pubsub_test_topic_permissions]
 use Google\Cloud\PubSub\PubSubClient;
 
 /**
@@ -47,4 +47,4 @@ function test_topic_permissions($projectId, $topicName)
         printf('Permission: %s' . PHP_EOL, $permission);
     }
 }
-# [END test_topic_permissions]
+# [END pubsub_test_topic_permissions]
diff --git a/pubsub/quickstart/quickstart.php b/pubsub/quickstart/quickstart.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-# [START pubsub_quickstart]
+# [START pubsub_quickstart_create_topic]
 # Includes the autoloader for libraries installed with composer
 require __DIR__ . '/vendor/autoload.php';
 
@@ -37,5 +37,5 @@
 $topic = $pubsub->createTopic($topicName);
 
 echo 'Topic ' . $topic->name() . ' created.';
-# [END pubsub_quickstart]
+# [END pubsub_quickstart_create_topic]
 return $topic;

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`namespace Google\Cloud\Samples\PubSub;`
`25`	`25`
`26`		`-# [START list_subscriptions]`
	`26`	`+# [START pubsub_list_subscriptions]`
`27`	`27`	`use Google\Cloud\PubSub\PubSubClient;`
`28`	`28`
`29`	`29`	`/**`
`@@ -40,4 +40,4 @@ function list_subscriptions($projectId)`
`40`	`40`	`printf('Subscription: %s' . PHP_EOL, $subscription->name());`
`41`	`41`	`}`
`42`	`42`	`}`
`43`		`-# [END list_subscriptions]`
	`43`	`+# [END pubsub_list_subscriptions]`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@`
`23`	`23`
`24`	`24`	`namespace Google\Cloud\Samples\PubSub;`
`25`	`25`
`26`		`-# [START pull_message]`
	`26`	`+# [START pubsub_subscriber_sync_pull]`
	`27`	`+# [START pubsub_quickstart_subscriber]`
`27`	`28`	`use Google\Cloud\PubSub\PubSubClient;`
`28`	`29`
`29`	`30`	`/**`
`@@ -44,4 +45,5 @@ function pull_messages($projectId, $subscriptionName)`
`44`	`45`	`$subscription->acknowledge($message);`
`45`	`46`	`}`
`46`	`47`	`}`
`47`		`-# [END pull_message]`
	`48`	`+# [END pubsub_subscriber_sync_pull]`
	`49`	`+# [END pubsub_quickstart_subscriber]`