From 2b95602996fe7f1bb9a135351c8fa036bd8a6130 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Thu, 20 Jun 2024 14:19:24 -0400 Subject: [PATCH 1/3] chore: add iam logging --- library_generation/generate_library.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/library_generation/generate_library.sh b/library_generation/generate_library.sh index f6875bfe6d..ecf8c64a50 100755 --- a/library_generation/generate_library.sh +++ b/library_generation/generate_library.sh @@ -143,7 +143,7 @@ folder_name=$(extract_folder_name "${destination_path}") pushd "${output_folder}" find_depth="" case "${proto_path}" in - "google/api" | "google/cloud" | "google/iam/v1" | "google/rpc") + "google/api" | "google/cloud" | "google/rpc") find_depth="-maxdepth 1" ;; esac @@ -273,14 +273,6 @@ case "${proto_path}" in "google/devtools/containeranalysis/v1beta1"*) proto_files="${proto_files} google/devtools/containeranalysis/v1beta1/cvss/cvss.proto" ;; - "google/iam/v1") - # these protos are excluded from //google/iam/v1:google-iam-v1-java - prefix="google/iam/v1" - protos="${prefix}/options.proto ${prefix}/policy.proto" - for removed_proto in ${protos}; do - proto_files="${proto_files//${removed_proto}/}" - done - ;; esac # copy proto files to proto-*/src/main/proto for proto_src in ${proto_files}; do From c2c7177de7592ac0b40f787327d78f3923133e04 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Thu, 20 Jun 2024 14:20:06 -0400 Subject: [PATCH 2/3] modify owlbot cli --- java-iam/.OwlBot-hermetic.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/java-iam/.OwlBot-hermetic.yaml b/java-iam/.OwlBot-hermetic.yaml index 907bd5cd5e..0ea858eb78 100644 --- a/java-iam/.OwlBot-hermetic.yaml +++ b/java-iam/.OwlBot-hermetic.yaml @@ -17,10 +17,6 @@ deep-remove-regex: - "/java-iam/grpc-google-.*/src" - "/java-iam/proto-google-.*/src" -deep-preserve-regex: - - "/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging" - - "/java-iam/proto-google-iam-v1/src/main/proto/google/iam/v1" - deep-copy-regex: - source: "/google/iam/(v.*)/.*-java/grpc-google-.*/src" dest: "/owl-bot-staging/java-iam/$1/grpc-google-iam-$1/src" From 5e6d198b7a595c51fddf1d66a9cc109b92dceafa Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Thu, 20 Jun 2024 18:35:47 +0000 Subject: [PATCH 3/3] regenerate iam --- java-iam/.repo-metadata.json | 2 +- .../com/google/iam/v1/logging/AuditData.java | 195 +++++++------- .../iam/v1/logging/AuditDataOrBuilder.java | 3 +- .../google/iam/v1/logging/AuditDataProto.java | 20 +- .../google/iam/v1/logging/audit_data.proto | 5 +- .../main/proto/google/iam/v1/options.proto | 25 +- .../src/main/proto/google/iam/v1/policy.proto | 251 +++++++++++++++--- 7 files changed, 333 insertions(+), 168 deletions(-) diff --git a/java-iam/.repo-metadata.json b/java-iam/.repo-metadata.json index c3194cecd8..1758363ab3 100644 --- a/java-iam/.repo-metadata.json +++ b/java-iam/.repo-metadata.json @@ -5,7 +5,7 @@ "api_description": "Manages access control for Google Cloud Platform resources", "client_documentation": "https://cloud.google.com/java/docs/reference/proto-google-iam-v1/latest/overview", "release_level": "stable", - "transport": "grpc", + "transport": "both", "language": "java", "repo": "googleapis/sdk-platform-java", "repo_short": "java-iam", diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditData.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditData.java index 268cbc4d2b..85f9ce4883 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditData.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditData.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/iam/v1/logging/audit_data.proto +// Protobuf Java Version: 3.25.3 package com.google.iam.v1.logging; /** @@ -47,63 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) { return new AuditData(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - - private AuditData( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 18: - { - com.google.iam.v1.PolicyDelta.Builder subBuilder = null; - if (policyDelta_ != null) { - subBuilder = policyDelta_.toBuilder(); - } - policyDelta_ = - input.readMessage(com.google.iam.v1.PolicyDelta.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(policyDelta_); - policyDelta_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.iam.v1.logging.AuditDataProto .internal_static_google_iam_v1_logging_AuditData_descriptor; @@ -119,6 +63,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.iam.v1.logging.AuditData.Builder.class); } + private int bitField0_; public static final int POLICY_DELTA_FIELD_NUMBER = 2; private com.google.iam.v1.PolicyDelta policyDelta_; /** @@ -134,7 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { */ @java.lang.Override public boolean hasPolicyDelta() { - return policyDelta_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -162,7 +107,7 @@ public com.google.iam.v1.PolicyDelta getPolicyDelta() { */ @java.lang.Override public com.google.iam.v1.PolicyDeltaOrBuilder getPolicyDeltaOrBuilder() { - return getPolicyDelta(); + return policyDelta_ == null ? com.google.iam.v1.PolicyDelta.getDefaultInstance() : policyDelta_; } private byte memoizedIsInitialized = -1; @@ -179,10 +124,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (policyDelta_ != null) { + if (((bitField0_ & 0x00000001) != 0)) { output.writeMessage(2, getPolicyDelta()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -191,10 +136,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (policyDelta_ != null) { + if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPolicyDelta()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -213,7 +158,7 @@ public boolean equals(final java.lang.Object obj) { if (hasPolicyDelta()) { if (!getPolicyDelta().equals(other.getPolicyDelta())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -228,7 +173,7 @@ public int hashCode() { hash = (37 * hash) + POLICY_DELTA_FIELD_NUMBER; hash = (53 * hash) + getPolicyDelta().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -368,16 +313,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} + if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { + getPolicyDeltaFieldBuilder(); + } } @java.lang.Override public Builder clear() { super.clear(); - if (policyDeltaBuilder_ == null) { - policyDelta_ = null; - } else { - policyDelta_ = null; + bitField0_ = 0; + policyDelta_ = null; + if (policyDeltaBuilder_ != null) { + policyDeltaBuilder_.dispose(); policyDeltaBuilder_ = null; } return this; @@ -406,15 +353,24 @@ public com.google.iam.v1.logging.AuditData build() { @java.lang.Override public com.google.iam.v1.logging.AuditData buildPartial() { com.google.iam.v1.logging.AuditData result = new com.google.iam.v1.logging.AuditData(this); - if (policyDeltaBuilder_ == null) { - result.policyDelta_ = policyDelta_; - } else { - result.policyDelta_ = policyDeltaBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v1.logging.AuditData result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.policyDelta_ = + policyDeltaBuilder_ == null ? policyDelta_ : policyDeltaBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + result.bitField0_ |= to_bitField0_; + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -463,7 +419,7 @@ public Builder mergeFrom(com.google.iam.v1.logging.AuditData other) { if (other.hasPolicyDelta()) { mergePolicyDelta(other.getPolicyDelta()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -478,20 +434,42 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.iam.v1.logging.AuditData parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 18: + { + input.readMessage(getPolicyDeltaFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.iam.v1.logging.AuditData) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } + private int bitField0_; + private com.google.iam.v1.PolicyDelta policyDelta_; private com.google.protobuf.SingleFieldBuilderV3< com.google.iam.v1.PolicyDelta, @@ -510,7 +488,7 @@ public Builder mergeFrom( * @return Whether the policyDelta field is set. */ public boolean hasPolicyDelta() { - return policyDeltaBuilder_ != null || policyDelta_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -547,11 +525,11 @@ public Builder setPolicyDelta(com.google.iam.v1.PolicyDelta value) { throw new NullPointerException(); } policyDelta_ = value; - onChanged(); } else { policyDeltaBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -566,11 +544,11 @@ public Builder setPolicyDelta(com.google.iam.v1.PolicyDelta value) { public Builder setPolicyDelta(com.google.iam.v1.PolicyDelta.Builder builderForValue) { if (policyDeltaBuilder_ == null) { policyDelta_ = builderForValue.build(); - onChanged(); } else { policyDeltaBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -584,19 +562,20 @@ public Builder setPolicyDelta(com.google.iam.v1.PolicyDelta.Builder builderForVa */ public Builder mergePolicyDelta(com.google.iam.v1.PolicyDelta value) { if (policyDeltaBuilder_ == null) { - if (policyDelta_ != null) { - policyDelta_ = - com.google.iam.v1.PolicyDelta.newBuilder(policyDelta_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && policyDelta_ != null + && policyDelta_ != com.google.iam.v1.PolicyDelta.getDefaultInstance()) { + getPolicyDeltaBuilder().mergeFrom(value); } else { policyDelta_ = value; } - onChanged(); } else { policyDeltaBuilder_.mergeFrom(value); } - + if (policyDelta_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } return this; } /** @@ -609,14 +588,13 @@ public Builder mergePolicyDelta(com.google.iam.v1.PolicyDelta value) { * .google.iam.v1.PolicyDelta policy_delta = 2; */ public Builder clearPolicyDelta() { - if (policyDeltaBuilder_ == null) { - policyDelta_ = null; - onChanged(); - } else { - policyDelta_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + policyDelta_ = null; + if (policyDeltaBuilder_ != null) { + policyDeltaBuilder_.dispose(); policyDeltaBuilder_ = null; } - + onChanged(); return this; } /** @@ -629,7 +607,7 @@ public Builder clearPolicyDelta() { * .google.iam.v1.PolicyDelta policy_delta = 2; */ public com.google.iam.v1.PolicyDelta.Builder getPolicyDeltaBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getPolicyDeltaFieldBuilder().getBuilder(); } @@ -709,7 +687,18 @@ public AuditData parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AuditData(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataOrBuilder.java index 8076902f48..fc36bcab08 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataOrBuilder.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/iam/v1/logging/audit_data.proto +// Protobuf Java Version: 3.25.3 package com.google.iam.v1.logging; public interface AuditDataOrBuilder diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataProto.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataProto.java index 7a5309a6ca..e93d753477 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataProto.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataProto.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/iam/v1/logging/audit_data.proto +// Protobuf Java Version: 3.25.3 package com.google.iam.v1.logging; public final class AuditDataProto { @@ -41,20 +42,18 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { static { java.lang.String[] descriptorData = { "\n&google/iam/v1/logging/audit_data.proto" - + "\022\025google.iam.v1.logging\032\034google/api/anno" - + "tations.proto\032\032google/iam/v1/policy.prot" - + "o\"=\n\tAuditData\0220\n\014policy_delta\030\002 \001(\0132\032.g" - + "oogle.iam.v1.PolicyDeltaB\211\001\n\031com.google." - + "iam.v1.loggingB\016AuditDataProtoP\001Z