Merge pull request #80 from jskeet/common-protos

Update common protos to reflect googleapis repo
googleapis · Sep 21, 2016 · 56422a4 · 56422a4
2 parents dc95f3f + 7088515
commit 56422a4
Show file tree

Hide file tree

Showing 25 changed files with 2,115 additions and 333 deletions.
diff --git a/src/Google.Api.CommonProtos/Api/Annotations.cs b/src/Google.Api.CommonProtos/Api/Annotations.cs
@@ -33,8 +33,8 @@ static AnnotationsReflection() {
             "Chxnb29nbGUvYXBpL2Fubm90YXRpb25zLnByb3RvEgpnb29nbGUuYXBpGhVn",
             "b29nbGUvYXBpL2h0dHAucHJvdG8aIGdvb2dsZS9wcm90b2J1Zi9kZXNjcmlw",
             "dG9yLnByb3RvOkUKBGh0dHASHi5nb29nbGUucHJvdG9idWYuTWV0aG9kT3B0",
-            "aW9ucxiwyrwiIAEoCzIULmdvb2dsZS5hcGkuSHR0cFJ1bGVCJAoOY29tLmdv",
-            "b2dsZS5hcGlCEEFubm90YXRpb25zUHJvdG9QAWIGcHJvdG8z"));
+            "aW9ucxiwyrwiIAEoCzIULmdvb2dsZS5hcGkuSHR0cFJ1bGVCKwoOY29tLmdv",
+            "b2dsZS5hcGlCEEFubm90YXRpb25zUHJvdG9QAaICBEdBUEliBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Google.Api.HttpReflection.Descriptor, pbr::FileDescriptor.DescriptorProtoFileDescriptor, },
           new pbr::GeneratedClrTypeInfo(null, null));

diff --git a/src/Google.Api.CommonProtos/Api/Auth.cs b/src/Google.Api.CommonProtos/Api/Auth.cs
@@ -41,8 +41,8 @@ static AuthReflection() {
             "ZGVyEgoKAmlkGAEgASgJEg4KBmlzc3VlchgCIAEoCRIQCghqd2tzX3VyaRgD",
             "IAEoCSItChFPQXV0aFJlcXVpcmVtZW50cxIYChBjYW5vbmljYWxfc2NvcGVz",
             "GAEgASgJIjkKD0F1dGhSZXF1aXJlbWVudBITCgtwcm92aWRlcl9pZBgBIAEo",
-            "CRIRCglhdWRpZW5jZXMYAiABKAlCHQoOY29tLmdvb2dsZS5hcGlCCUF1dGhQ",
-            "cm90b1ABYgZwcm90bzM="));
+            "CRIRCglhdWRpZW5jZXMYAiABKAlCJAoOY29tLmdvb2dsZS5hcGlCCUF1dGhQ",
+            "cm90b1ABogIER0FQSWIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Google.Api.AnnotationsReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
@@ -107,7 +107,9 @@ public Authentication Clone() {
         = pb::FieldCodec.ForMessage(26, global::Google.Api.AuthenticationRule.Parser);
     private readonly pbc::RepeatedField<global::Google.Api.AuthenticationRule> rules_ = new pbc::RepeatedField<global::Google.Api.AuthenticationRule>();
     /// <summary>
-    ///  Individual rules for authentication.
+    ///  A list of authentication rules that apply to individual API methods.
+    ///
+    ///  **NOTE:** All service configuration rules follow "last one wins" order.
     /// </summary>
     public pbc::RepeatedField<global::Google.Api.AuthenticationRule> Rules {
       get { return rules_; }
@@ -266,8 +268,13 @@ public string Selector {
     public const int AllowWithoutCredentialFieldNumber = 5;
     private bool allowWithoutCredential_;
     /// <summary>
-    ///  Whether to allow requests without a credential.  If quota is enabled, an
-    ///  API key is required for such request to pass the quota check.
+    ///  Whether to allow requests without a credential. The credential can be
+    ///  an OAuth token, Google cookies (first-party auth) or EndUserCreds.
+    ///
+    ///  For requests without credentials, if the service control environment is
+    ///  specified, each incoming request **must** be associated with a service
+    ///  consumer. This can be done by passing an API key that belongs to a consumer
+    ///  project.
     /// </summary>
     public bool AllowWithoutCredential {
       get { return allowWithoutCredential_; }

diff --git a/src/Google.Api.CommonProtos/Api/Backend.cs b/src/Google.Api.CommonProtos/Api/Backend.cs
@@ -33,8 +33,8 @@ static BackendReflection() {
             "Chhnb29nbGUvYXBpL2JhY2tlbmQucHJvdG8SCmdvb2dsZS5hcGkiMQoHQmFj",
             "a2VuZBImCgVydWxlcxgBIAMoCzIXLmdvb2dsZS5hcGkuQmFja2VuZFJ1bGUi",
             "QgoLQmFja2VuZFJ1bGUSEAoIc2VsZWN0b3IYASABKAkSDwoHYWRkcmVzcxgC",
-            "IAEoCRIQCghkZWFkbGluZRgDIAEoAUIgCg5jb20uZ29vZ2xlLmFwaUIMQmFj",
-            "a2VuZFByb3RvUAFiBnByb3RvMw=="));
+            "IAEoCRIQCghkZWFkbGluZRgDIAEoAUInCg5jb20uZ29vZ2xlLmFwaUIMQmFj",
+            "a2VuZFByb3RvUAGiAgRHQVBJYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
@@ -82,8 +82,9 @@ public Backend Clone() {
         = pb::FieldCodec.ForMessage(10, global::Google.Api.BackendRule.Parser);
     private readonly pbc::RepeatedField<global::Google.Api.BackendRule> rules_ = new pbc::RepeatedField<global::Google.Api.BackendRule>();
     /// <summary>
-    ///  A list of backend rules providing configuration for individual API
-    ///  elements.
+    ///  A list of API backend rules that apply to individual API methods.
+    ///
+    ///  **NOTE:** All service configuration rules follow "last one wins" order.
     /// </summary>
     public pbc::RepeatedField<global::Google.Api.BackendRule> Rules {
       get { return rules_; }