Skip to content

Commit 1d1e8ef

Browse files
rmehta19rmehta19
committed
Merge branch 'main' into plumb-mtls-endpoint
2 parents 2afdbbc + 2562a7d commit 1d1e8ef

File tree

78 files changed

+547
-116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+547
-116
lines changed

‎generation_config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
googleapis_commitish: fbbbf5023815f9a662c85aa8af8f3b72467fcb6f
1+
googleapis_commitish: 66ab6ceb69178f5368b130949eaf518b7c28352f
22
# the libraries are ordered with respect to library name, which is
33
# java-{library.library_name} or java-{library.api-shortname} when
44
# library.library_name is not defined.

‎hermetic_build/library_generation/cli/entry_point.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def main(ctx):
5050
)
5151
@click.option(
5252
"--repository-path",
53+
"--output",
5354
type=str,
5455
default=".",
5556
show_default=True,
@@ -62,6 +63,7 @@ def main(ctx):
6263
)
6364
@click.option(
6465
"--api-definitions-path",
66+
"--api-root",
6567
type=str,
6668
default=".",
6769
show_default=True,

‎java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogProto.java‎

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -115,50 +115,55 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
115115
+ "key_name\030\005 \001(\t\022Y\n\037service_account_delega"
116116
+ "tion_info\030\006 \003(\01320.google.cloud.audit.Ser"
117117
+ "viceAccountDelegationInfo\022\031\n\021principal_s"
118-
+ "ubject\030\010 \001(\t\"\226\001\n\021AuthorizationInfo\022\020\n\010re"
118+
+ "ubject\030\010 \001(\t\"\330\002\n\021AuthorizationInfo\022\020\n\010re"
119119
+ "source\030\001 \001(\t\022\022\n\npermission\030\002 \001(\t\022\017\n\007gran"
120120
+ "ted\030\003 \001(\010\022J\n\023resource_attributes\030\005 \001(\0132-"
121121
+ ".google.rpc.context.AttributeContext.Res"
122-
+ "ource\"\365\001\n\017RequestMetadata\022\021\n\tcaller_ip\030\001"
123-
+ " \001(\t\022\"\n\032caller_supplied_user_agent\030\002 \001(\t"
124-
+ "\022\026\n\016caller_network\030\003 \001(\t\022H\n\022request_attr"
125-
+ "ibutes\030\007 \001(\0132,.google.rpc.context.Attrib"
126-
+ "uteContext.Request\022I\n\026destination_attrib"
127-
+ "utes\030\010 \001(\0132).google.rpc.context.Attribut"
128-
+ "eContext.Peer\"I\n\020ResourceLocation\022\031\n\021cur"
129-
+ "rent_locations\030\001 \003(\t\022\032\n\022original_locatio"
130-
+ "ns\030\002 \003(\t\"\303\003\n\034ServiceAccountDelegationInf"
131-
+ "o\022\031\n\021principal_subject\030\003 \001(\t\022e\n\025first_pa"
132-
+ "rty_principal\030\001 \001(\0132D.google.cloud.audit"
133-
+ ".ServiceAccountDelegationInfo.FirstParty"
134-
+ "PrincipalH\000\022e\n\025third_party_principal\030\002 \001"
135-
+ "(\0132D.google.cloud.audit.ServiceAccountDe"
136-
+ "legationInfo.ThirdPartyPrincipalH\000\032a\n\023Fi"
137-
+ "rstPartyPrincipal\022\027\n\017principal_email\030\001 \001"
138-
+ "(\t\0221\n\020service_metadata\030\002 \001(\0132\027.google.pr"
139-
+ "otobuf.Struct\032J\n\023ThirdPartyPrincipal\0223\n\022"
140-
+ "third_party_claims\030\001 \001(\0132\027.google.protob"
141-
+ "uf.StructB\013\n\tAuthority\"d\n\023PolicyViolatio"
142-
+ "nInfo\022M\n\031org_policy_violation_info\030\001 \001(\013"
143-
+ "2*.google.cloud.audit.OrgPolicyViolation"
144-
+ "Info\"\262\002\n\026OrgPolicyViolationInfo\022-\n\007paylo"
145-
+ "ad\030\001 \001(\0132\027.google.protobuf.StructB\003\340A\001\022\032"
146-
+ "\n\rresource_type\030\002 \001(\tB\003\340A\001\022X\n\rresource_t"
147-
+ "ags\030\003 \003(\0132<.google.cloud.audit.OrgPolicy"
148-
+ "ViolationInfo.ResourceTagsEntryB\003\340A\001\022>\n\016"
149-
+ "violation_info\030\004 \003(\0132!.google.cloud.audi"
150-
+ "t.ViolationInfoB\003\340A\001\0323\n\021ResourceTagsEntr"
151-
+ "y\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\227\002\n\rVi"
152-
+ "olationInfo\022\027\n\nconstraint\030\001 \001(\tB\003\340A\001\022\032\n\r"
153-
+ "error_message\030\002 \001(\tB\003\340A\001\022\032\n\rchecked_valu"
154-
+ "e\030\003 \001(\tB\003\340A\001\022F\n\013policy_type\030\004 \001(\0162,.goog"
155-
+ "le.cloud.audit.ViolationInfo.PolicyTypeB"
156-
+ "\003\340A\001\"m\n\nPolicyType\022\033\n\027POLICY_TYPE_UNSPEC"
157-
+ "IFIED\020\000\022\026\n\022BOOLEAN_CONSTRAINT\020\001\022\023\n\017LIST_"
158-
+ "CONSTRAINT\020\002\022\025\n\021CUSTOM_CONSTRAINT\020\003Be\n\026c"
159-
+ "om.google.cloud.auditB\rAuditLogProtoP\001Z7"
160-
+ "google.golang.org/genproto/googleapis/cl"
161-
+ "oud/audit;audit\370\001\001b\006proto3"
122+
+ "ource\022M\n\017permission_type\030\007 \001(\01624.google."
123+
+ "cloud.audit.AuthorizationInfo.Permission"
124+
+ "Type\"q\n\016PermissionType\022\037\n\033PERMISSION_TYP"
125+
+ "E_UNSPECIFIED\020\000\022\016\n\nADMIN_READ\020\001\022\017\n\013ADMIN"
126+
+ "_WRITE\020\002\022\r\n\tDATA_READ\020\003\022\016\n\nDATA_WRITE\020\004\""
127+
+ "\365\001\n\017RequestMetadata\022\021\n\tcaller_ip\030\001 \001(\t\022\""
128+
+ "\n\032caller_supplied_user_agent\030\002 \001(\t\022\026\n\016ca"
129+
+ "ller_network\030\003 \001(\t\022H\n\022request_attributes"
130+
+ "\030\007 \001(\0132,.google.rpc.context.AttributeCon"
131+
+ "text.Request\022I\n\026destination_attributes\030\010"
132+
+ " \001(\0132).google.rpc.context.AttributeConte"
133+
+ "xt.Peer\"I\n\020ResourceLocation\022\031\n\021current_l"
134+
+ "ocations\030\001 \003(\t\022\032\n\022original_locations\030\002 \003"
135+
+ "(\t\"\303\003\n\034ServiceAccountDelegationInfo\022\031\n\021p"
136+
+ "rincipal_subject\030\003 \001(\t\022e\n\025first_party_pr"
137+
+ "incipal\030\001 \001(\0132D.google.cloud.audit.Servi"
138+
+ "ceAccountDelegationInfo.FirstPartyPrinci"
139+
+ "palH\000\022e\n\025third_party_principal\030\002 \001(\0132D.g"
140+
+ "oogle.cloud.audit.ServiceAccountDelegati"
141+
+ "onInfo.ThirdPartyPrincipalH\000\032a\n\023FirstPar"
142+
+ "tyPrincipal\022\027\n\017principal_email\030\001 \001(\t\0221\n\020"
143+
+ "service_metadata\030\002 \001(\0132\027.google.protobuf"
144+
+ ".Struct\032J\n\023ThirdPartyPrincipal\0223\n\022third_"
145+
+ "party_claims\030\001 \001(\0132\027.google.protobuf.Str"
146+
+ "uctB\013\n\tAuthority\"d\n\023PolicyViolationInfo\022"
147+
+ "M\n\031org_policy_violation_info\030\001 \001(\0132*.goo"
148+
+ "gle.cloud.audit.OrgPolicyViolationInfo\"\262"
149+
+ "\002\n\026OrgPolicyViolationInfo\022-\n\007payload\030\001 \001"
150+
+ "(\0132\027.google.protobuf.StructB\003\340A\001\022\032\n\rreso"
151+
+ "urce_type\030\002 \001(\tB\003\340A\001\022X\n\rresource_tags\030\003 "
152+
+ "\003(\0132<.google.cloud.audit.OrgPolicyViolat"
153+
+ "ionInfo.ResourceTagsEntryB\003\340A\001\022>\n\016violat"
154+
+ "ion_info\030\004 \003(\0132!.google.cloud.audit.Viol"
155+
+ "ationInfoB\003\340A\001\0323\n\021ResourceTagsEntry\022\013\n\003k"
156+
+ "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\227\002\n\rViolatio"
157+
+ "nInfo\022\027\n\nconstraint\030\001 \001(\tB\003\340A\001\022\032\n\rerror_"
158+
+ "message\030\002 \001(\tB\003\340A\001\022\032\n\rchecked_value\030\003 \001("
159+
+ "\tB\003\340A\001\022F\n\013policy_type\030\004 \001(\0162,.google.clo"
160+
+ "ud.audit.ViolationInfo.PolicyTypeB\003\340A\001\"m"
161+
+ "\n\nPolicyType\022\033\n\027POLICY_TYPE_UNSPECIFIED\020"
162+
+ "\000\022\026\n\022BOOLEAN_CONSTRAINT\020\001\022\023\n\017LIST_CONSTR"
163+
+ "AINT\020\002\022\025\n\021CUSTOM_CONSTRAINT\020\003Be\n\026com.goo"
164+
+ "gle.cloud.auditB\rAuditLogProtoP\001Z7google"
165+
+ ".golang.org/genproto/googleapis/cloud/au"
166+
+ "dit;audit\370\001\001b\006proto3"
162167
};
163168
descriptor =
164169
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -211,7 +216,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
211216
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
212217
internal_static_google_cloud_audit_AuthorizationInfo_descriptor,
213218
new java.lang.String[] {
214-
"Resource", "Permission", "Granted", "ResourceAttributes",
219+
"Resource", "Permission", "Granted", "ResourceAttributes", "PermissionType",
215220
});
216221
internal_static_google_cloud_audit_RequestMetadata_descriptor =
217222
getDescriptor().getMessageTypes().get(3);

0 commit comments

Comments
 (0)