From 650caad718bb063f189405c23972dc9818886358 Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Mon, 26 Aug 2019 16:23:51 -0700
Subject: [PATCH] Synchronize new proto/yaml changes.

PiperOrigin-RevId: 265565344
---
 google/iam/v1/iam_policy.proto |  2 +-
 google/iam/v1/options.proto    | 10 +++++++---
 google/iam/v1/policy.proto     |  9 ++++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/google/iam/v1/iam_policy.proto b/google/iam/v1/iam_policy.proto
index 8825cdc7..7fee0c39 100644
--- a/google/iam/v1/iam_policy.proto
+++ b/google/iam/v1/iam_policy.proto
@@ -113,7 +113,7 @@ message GetIamPolicyRequest {
 
   // OPTIONAL: A `GetPolicyOptions` object for specifying options to
   // `GetIamPolicy`. This field is only used by Cloud IAM.
-  google.iam.v1.GetPolicyOptions options = 2;
+  GetPolicyOptions options = 2;
 }
 
 // Request message for `TestIamPermissions` method.
diff --git a/google/iam/v1/options.proto b/google/iam/v1/options.proto
index 24e88636..a4e17e58 100644
--- a/google/iam/v1/options.proto
+++ b/google/iam/v1/options.proto
@@ -30,8 +30,12 @@ option php_namespace = "Google\\Cloud\\Iam\\V1";
 // Encapsulates settings provided to GetIamPolicy.
 message GetPolicyOptions {
   // Optional. The policy format version to be returned.
-  // Acceptable values are 0 and 1.
-  // If the value is 0, or the field is omitted, policy format version 1 will be
-  // returned.
+  //
+  // Valid values are 0, 1, and 3. Requests specifying an invalid value will be
+  // rejected.
+  //
+  // Requests for policies with any conditional bindings must specify version 3.
+  // Policies without any conditional bindings may specify any valid value or
+  // leave the field unset.
   int32 requested_policy_version = 1;
 }
diff --git a/google/iam/v1/policy.proto b/google/iam/v1/policy.proto
index 4aef8aec..a5e4803f 100644
--- a/google/iam/v1/policy.proto
+++ b/google/iam/v1/policy.proto
@@ -74,7 +74,14 @@ option php_namespace = "Google\\Cloud\\Iam\\V1";
 // For a description of IAM and its features, see the
 // [IAM developer's guide](https://cloud.google.com/iam/docs).
 message Policy {
-  // Deprecated.
+  // Specifies the format of the policy.
+  //
+  // Valid values are 0, 1, and 3. Requests specifying an invalid value will be
+  // rejected.
+  //
+  // Policies with any conditional bindings must specify version 3. Policies
+  // without any conditional bindings may specify any valid value or leave the
+  // field unset.
   int32 version = 1;
 
   // Associates a list of `members` to a `role`.