From acfc5dc744ecb2b5e4d94cab028de0428a88d827 Mon Sep 17 00:00:00 2001
From: "Brian J. Watson" <brianwatson@google.com>
Date: Tue, 27 Sep 2016 09:15:54 -0700
Subject: [PATCH] Add LRO service config. Update Pub/Sub. Remove unneeded
 context. (#155)

---
 google/cloud/speech/cloud_speech.yaml | 12 +-----------
 google/iam/iam.yaml                   |  6 ------
 google/longrunning/longrunning.yaml   | 12 ++++++++++++
 google/pubsub/pubsub.yaml             | 12 +-----------
 4 files changed, 14 insertions(+), 28 deletions(-)
 create mode 100644 google/longrunning/longrunning.yaml

diff --git a/google/cloud/speech/cloud_speech.yaml b/google/cloud/speech/cloud_speech.yaml
index 590a6384..7fed440d 100644
--- a/google/cloud/speech/cloud_speech.yaml
+++ b/google/cloud/speech/cloud_speech.yaml
@@ -12,18 +12,8 @@ documentation:
 
 apis:
 - name: google.cloud.speech.v1beta1.Speech
-# TODO get LRO API call support added for Speech
-#- name: google.longrunning.Operations
+- name: google.longrunning.Operations
 
-# Pass origin and project RpcServerExtensions to the backend.
-context:
-  rules:
-  - selector: '*'
-    requested:
-    - google.rpc.context.ProjectContext
-    - google.rpc.context.OriginContext
-
-# Auth section.
 authentication:
   rules:
     - selector: '*'
diff --git a/google/iam/iam.yaml b/google/iam/iam.yaml
index b9714e7b..ccff586b 100644
--- a/google/iam/iam.yaml
+++ b/google/iam/iam.yaml
@@ -19,9 +19,3 @@ authentication:
       oauth:
         canonical_scopes: https://www.googleapis.com/auth/iam,
                           https://www.googleapis.com/auth/cloud-platform
-
-context:
-  rules:
-  - selector: '*'
-    requested:
-    - google.rpc.context.OriginContext
diff --git a/google/longrunning/longrunning.yaml b/google/longrunning/longrunning.yaml
new file mode 100644
index 00000000..74543bc0
--- /dev/null
+++ b/google/longrunning/longrunning.yaml
@@ -0,0 +1,12 @@
+type: google.api.Service
+config_version: 1
+name: longrunning.googleapis.com
+title: Google Long Running Operations API
+
+apis:
+- name: google.longrunning.Operations
+
+# Documentation section
+documentation:
+  overview:
+    (== include google/longrunning/README.md ==)
diff --git a/google/pubsub/pubsub.yaml b/google/pubsub/pubsub.yaml
index 258083c0..dbe5a498 100644
--- a/google/pubsub/pubsub.yaml
+++ b/google/pubsub/pubsub.yaml
@@ -1,7 +1,7 @@
 # Google Cloud Pub/Sub API service configuration
 
 type: google.api.Service
-config_version: 1
+config_version: 3
 name: pubsub.googleapis.com
 
 title: Google Cloud Pub/Sub API
@@ -34,19 +34,9 @@ apis:
 - name: google.pubsub.v1.Publisher
 - name: google.pubsub.v1.Subscriber
 
-# Pass origin and project RpcServerExtensions to the backend.
-context:
-  rules:
-  - selector: '*'
-    requested:
-    - google.rpc.context.OriginContext
-    - google.rpc.context.ProjectContext
-
-# Auth section
 authentication:
   rules:
     - selector: '*'
       oauth:
         canonical_scopes: https://www.googleapis.com/auth/pubsub,
                           https://www.googleapis.com/auth/cloud-platform
-