[CHANGE ME] Re-generated to pick up changes from googleapis.

google/cloud/asset_v1/types/asset_service.py

@@ -863,7 +863,7 @@ class IamPolicyAnalysisQuery(proto.Message):
         access_selector (google.cloud.asset_v1.types.IamPolicyAnalysisQuery.AccessSelector):
             Optional. Specifies roles or permissions for
             analysis. This is optional.
-        options (google.cloud.asset_v1.types.IamPolicyAnalysisQuery.Options):
+        options_ (google.cloud.asset_v1.types.IamPolicyAnalysisQuery.Options):
             Optional. The query options.
     """
 
@@ -1035,7 +1035,7 @@ class Options(proto.Message):
 
     access_selector = proto.Field(proto.MESSAGE, number=4, message=AccessSelector,)
 
-    options = proto.Field(proto.MESSAGE, number=5, message=Options,)
+    options_ = proto.Field(proto.MESSAGE, number=5, message=Options,)
 
 
 class AnalyzeIamPolicyRequest(proto.Message):

google/cloud/asset_v1/types/assets.py

@@ -433,7 +433,7 @@ class IamPolicySearchResult(proto.Message):
 
             -  specify the ``scope`` field as this project in your
                search request.
-        policy (google.iam.v1.policy_pb2.Policy):
+        policy_ (google.iam.v1.policy_pb2.Policy):
             The IAM policy directly set on the given resource. Note that
             the original IAM policy can contain multiple bindings. This
             only contains the bindings that match the given query. For
@@ -496,7 +496,7 @@ class Permissions(proto.Message):
 
     project = proto.Field(proto.STRING, number=2)
 
-    policy = proto.Field(proto.MESSAGE, number=3, message=gi_policy.Policy,)
+    policy_ = proto.Field(proto.MESSAGE, number=3, message=gi_policy.Policy,)
 
     explanation = proto.Field(proto.MESSAGE, number=4, message=Explanation,)
 

google/cloud/asset_v1p1beta1/types/assets.py

@@ -104,7 +104,7 @@ class IamPolicySearchResult(proto.Message):
             bucket), the project field will indicate the project that
             contains the resource. If an IAM policy is set on a folder
             or orgnization, the project field will be empty.
-        policy (google.iam.v1.policy_pb2.Policy):
+        policy_ (google.iam.v1.policy_pb2.Policy):
             The IAM policy directly set on the given
             resource. Note that the original IAM policy can
             contain multiple bindings. This only contains
@@ -139,7 +139,7 @@ class Explanation(proto.Message):
 
     project = proto.Field(proto.STRING, number=3)
 
-    policy = proto.Field(proto.MESSAGE, number=4, message=giv_policy.Policy,)
+    policy_ = proto.Field(proto.MESSAGE, number=4, message=giv_policy.Policy,)
 
     explanation = proto.Field(proto.MESSAGE, number=5, message=Explanation,)
 

google/cloud/asset_v1p2beta1/types/assets.py

@@ -18,7 +18,7 @@
 import proto  # type: ignore
 
 
-from google.iam.v1 import policy_pb2 as policy  # type: ignore
+from google.iam.v1 import policy_pb2 as giv_policy  # type: ignore
 from google.protobuf import struct_pb2 as struct  # type: ignore
 from google.protobuf import timestamp_pb2 as timestamp  # type: ignore
 
@@ -105,7 +105,7 @@ class Asset(proto.Message):
 
     resource = proto.Field(proto.MESSAGE, number=3, message="Resource",)
 
-    iam_policy = proto.Field(proto.MESSAGE, number=4, message=policy.Policy,)
+    iam_policy = proto.Field(proto.MESSAGE, number=4, message=giv_policy.Policy,)
 
     ancestors = proto.RepeatedField(proto.STRING, number=6)
 

google/cloud/asset_v1p4beta1/types/asset_service.py

@@ -124,7 +124,7 @@ class AnalyzeIamPolicyRequest(proto.Message):
     Attributes:
         analysis_query (google.cloud.asset_v1p4beta1.types.IamPolicyAnalysisQuery):
             Required. The request query.
-        options (google.cloud.asset_v1p4beta1.types.AnalyzeIamPolicyRequest.Options):
+        options_ (google.cloud.asset_v1p4beta1.types.AnalyzeIamPolicyRequest.Options):
             Optional. The request options.
     """
 
@@ -235,7 +235,7 @@ class Options(proto.Message):
         proto.MESSAGE, number=1, message="IamPolicyAnalysisQuery",
     )
 
-    options = proto.Field(proto.MESSAGE, number=2, message=Options,)
+    options_ = proto.Field(proto.MESSAGE, number=2, message=Options,)
 
 
 class AnalyzeIamPolicyResponse(proto.Message):
@@ -338,7 +338,7 @@ class ExportIamPolicyAnalysisRequest(proto.Message):
     Attributes:
         analysis_query (google.cloud.asset_v1p4beta1.types.IamPolicyAnalysisQuery):
             Required. The request query.
-        options (google.cloud.asset_v1p4beta1.types.ExportIamPolicyAnalysisRequest.Options):
+        options_ (google.cloud.asset_v1p4beta1.types.ExportIamPolicyAnalysisRequest.Options):
             Optional. The request options.
         output_config (google.cloud.asset_v1p4beta1.types.IamPolicyAnalysisOutputConfig):
             Required. Output configuration indicating
@@ -434,7 +434,7 @@ class Options(proto.Message):
         proto.MESSAGE, number=1, message="IamPolicyAnalysisQuery",
     )
 
-    options = proto.Field(proto.MESSAGE, number=2, message=Options,)
+    options_ = proto.Field(proto.MESSAGE, number=2, message=Options,)
 
     output_config = proto.Field(
         proto.MESSAGE, number=3, message="IamPolicyAnalysisOutputConfig",

google/cloud/asset_v1p4beta1/types/assets.py

@@ -18,7 +18,7 @@
 import proto  # type: ignore
 
 
-from google.iam.v1 import policy_pb2 as policy  # type: ignore
+from google.iam.v1 import policy_pb2 as giv_policy  # type: ignore
 from google.rpc import code_pb2 as gr_code  # type: ignore
 
 
@@ -247,7 +247,7 @@ class IdentityList(proto.Message):
 
     attached_resource_full_name = proto.Field(proto.STRING, number=1)
 
-    iam_binding = proto.Field(proto.MESSAGE, number=2, message=policy.Binding,)
+    iam_binding = proto.Field(proto.MESSAGE, number=2, message=giv_policy.Binding,)
 
     access_control_lists = proto.RepeatedField(
         proto.MESSAGE, number=3, message=AccessControlList,

google/cloud/asset_v1p5beta1/types/assets.py

@@ -19,7 +19,7 @@
 
 
 from google.cloud.orgpolicy.v1 import orgpolicy_pb2 as orgpolicy  # type: ignore
-from google.iam.v1 import policy_pb2 as policy  # type: ignore
+from google.iam.v1 import policy_pb2 as giv_policy  # type: ignore
 from google.identity.accesscontextmanager.v1 import access_level_pb2 as giav_access_level  # type: ignore
 from google.identity.accesscontextmanager.v1 import access_policy_pb2 as giav_access_policy  # type: ignore
 from google.identity.accesscontextmanager.v1 import service_perimeter_pb2 as giav_service_perimeter  # type: ignore
@@ -80,7 +80,7 @@ class Asset(proto.Message):
 
     resource = proto.Field(proto.MESSAGE, number=3, message="Resource",)
 
-    iam_policy = proto.Field(proto.MESSAGE, number=4, message=policy.Policy,)
+    iam_policy = proto.Field(proto.MESSAGE, number=4, message=giv_policy.Policy,)
 
     org_policy = proto.RepeatedField(proto.MESSAGE, number=6, message=orgpolicy.Policy,)
 

scripts/fixup_asset_v1p4beta1_keywords.py

@@ -41,8 +41,8 @@ def partition(
 class assetCallTransformer(cst.CSTTransformer):
     CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata')
     METHOD_TO_PARAMS: Dict[str, Tuple[str]] = {
-    'analyze_iam_policy': ('analysis_query', 'options', ),
-    'export_iam_policy_analysis': ('analysis_query', 'output_config', 'options', ),
+    'analyze_iam_policy': ('analysis_query', 'options_', ),
+    'export_iam_policy_analysis': ('analysis_query', 'output_config', 'options_', ),
 
     }
 

synth.metadata

@@ -4,15 +4,15 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/python-asset.git",
-        "sha": "34278bf526384296e95196f755ab983c4efeca62"
+        "sha": "07780ca9af3184eac94d33455f0550431e37d93e"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "8ff7d794576311d3d68d4df2ac6da93bbfcd7476",
-        "internalRef": "366472163"
+        "sha": "2490be32f08cccc870862ea86920f58325795c89",
+        "internalRef": "366826395"
       }
     },
     {