Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-secretmanager'
If you are using Gradle without BOM, add this to your dependencies

```Groovy
implementation 'com.google.cloud:google-cloud-secretmanager:2.1.5'
implementation 'com.google.cloud:google-cloud-secretmanager:2.1.6'
```

If you are using SBT, add this to your dependencies

```Scala
libraryDependencies += "com.google.cloud" % "google-cloud-secretmanager" % "2.1.5"
libraryDependencies += "com.google.cloud" % "google-cloud-secretmanager" % "2.1.6"
```

## Authentication
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1596,6 +1596,7 @@ public final SecretVersion destroySecretVersion(DestroySecretVersionRequest requ
* SetIamPolicyRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setPolicy(Policy.newBuilder().build())
* .setUpdateMask(FieldMask.newBuilder().build())
* .build();
* Policy response = secretManagerServiceClient.setIamPolicy(request);
* }
Expand Down Expand Up @@ -1624,6 +1625,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
* SetIamPolicyRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setPolicy(Policy.newBuilder().build())
* .setUpdateMask(FieldMask.newBuilder().build())
* .build();
* ApiFuture<Policy> future =
* secretManagerServiceClient.setIamPolicyCallable().futureCall(request);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.google.api.gax.rpc.ApiClientHeaderProvider;
import com.google.api.gax.rpc.InvalidArgumentException;
import com.google.common.collect.Lists;
import com.google.iam.v1.AuditConfig;
import com.google.iam.v1.Binding;
import com.google.iam.v1.GetIamPolicyRequest;
import com.google.iam.v1.GetPolicyOptions;
Expand Down Expand Up @@ -191,6 +192,7 @@ public void createSecretTest() throws Exception {
.addAllTopics(new ArrayList<Topic>())
.setEtag("etag3123477")
.setRotation(Rotation.newBuilder().build())
.putAllVersionAliases(new HashMap<String, Long>())
.build();
mockSecretManagerService.addResponse(expectedResponse);

Expand Down Expand Up @@ -241,6 +243,7 @@ public void createSecretTest2() throws Exception {
.addAllTopics(new ArrayList<Topic>())
.setEtag("etag3123477")
.setRotation(Rotation.newBuilder().build())
.putAllVersionAliases(new HashMap<String, Long>())
.build();
mockSecretManagerService.addResponse(expectedResponse);

Expand Down Expand Up @@ -383,6 +386,7 @@ public void getSecretTest() throws Exception {
.addAllTopics(new ArrayList<Topic>())
.setEtag("etag3123477")
.setRotation(Rotation.newBuilder().build())
.putAllVersionAliases(new HashMap<String, Long>())
.build();
mockSecretManagerService.addResponse(expectedResponse);

Expand Down Expand Up @@ -427,6 +431,7 @@ public void getSecretTest2() throws Exception {
.addAllTopics(new ArrayList<Topic>())
.setEtag("etag3123477")
.setRotation(Rotation.newBuilder().build())
.putAllVersionAliases(new HashMap<String, Long>())
.build();
mockSecretManagerService.addResponse(expectedResponse);

Expand Down Expand Up @@ -471,6 +476,7 @@ public void updateSecretTest() throws Exception {
.addAllTopics(new ArrayList<Topic>())
.setEtag("etag3123477")
.setRotation(Rotation.newBuilder().build())
.putAllVersionAliases(new HashMap<String, Long>())
.build();
mockSecretManagerService.addResponse(expectedResponse);

Expand Down Expand Up @@ -1095,6 +1101,7 @@ public void setIamPolicyTest() throws Exception {
Policy.newBuilder()
.setVersion(351608024)
.addAllBindings(new ArrayList<Binding>())
.addAllAuditConfigs(new ArrayList<AuditConfig>())
.setEtag(ByteString.EMPTY)
.build();
mockSecretManagerService.addResponse(expectedResponse);
Expand All @@ -1103,6 +1110,7 @@ public void setIamPolicyTest() throws Exception {
SetIamPolicyRequest.newBuilder()
.setResource(ProjectName.of("[PROJECT]").toString())
.setPolicy(Policy.newBuilder().build())
.setUpdateMask(FieldMask.newBuilder().build())
.build();

Policy actualResponse = client.setIamPolicy(request);
Expand All @@ -1114,6 +1122,7 @@ public void setIamPolicyTest() throws Exception {

Assert.assertEquals(request.getResource(), actualRequest.getResource());
Assert.assertEquals(request.getPolicy(), actualRequest.getPolicy());
Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask());
Assert.assertTrue(
channelProvider.isHeaderSent(
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
Expand All @@ -1130,6 +1139,7 @@ public void setIamPolicyExceptionTest() throws Exception {
SetIamPolicyRequest.newBuilder()
.setResource(ProjectName.of("[PROJECT]").toString())
.setPolicy(Policy.newBuilder().build())
.setUpdateMask(FieldMask.newBuilder().build())
.build();
client.setIamPolicy(request);
Assert.fail("No exception raised");
Expand All @@ -1144,6 +1154,7 @@ public void getIamPolicyTest() throws Exception {
Policy.newBuilder()
.setVersion(351608024)
.addAllBindings(new ArrayList<Binding>())
.addAllAuditConfigs(new ArrayList<AuditConfig>())
.setEtag(ByteString.EMPTY)
.build();
mockSecretManagerService.addResponse(expectedResponse);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
internal_static_google_cloud_secretmanager_v1_Secret_LabelsEntry_descriptor;
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_google_cloud_secretmanager_v1_Secret_LabelsEntry_fieldAccessorTable;
static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_cloud_secretmanager_v1_Secret_VersionAliasesEntry_descriptor;
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_google_cloud_secretmanager_v1_Secret_VersionAliasesEntry_fieldAccessorTable;
static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_cloud_secretmanager_v1_SecretVersion_descriptor;
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
Expand Down Expand Up @@ -105,7 +109,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "google/api/annotations.proto\032\037google/api"
+ "/field_behavior.proto\032\031google/api/resour"
+ "ce.proto\032\036google/protobuf/duration.proto"
+ "\032\037google/protobuf/timestamp.proto\"\336\004\n\006Se"
+ "\032\037google/protobuf/timestamp.proto\"\356\005\n\006Se"
+ "cret\022\021\n\004name\030\001 \001(\tB\003\340A\003\022G\n\013replication\030\002"
+ " \001(\0132*.google.cloud.secretmanager.v1.Rep"
+ "licationB\006\340A\005\340A\002\0224\n\013create_time\030\003 \001(\0132\032."
Expand All @@ -117,70 +121,74 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "stampB\003\340A\001H\000\022-\n\003ttl\030\007 \001(\0132\031.google.proto"
+ "buf.DurationB\003\340A\004H\000\022\021\n\004etag\030\010 \001(\tB\003\340A\001\022>"
+ "\n\010rotation\030\t \001(\0132\'.google.cloud.secretma"
+ "nager.v1.RotationB\003\340A\001\032-\n\013LabelsEntry\022\013\n"
+ "\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001:M\352AJ\n#secr"
+ "etmanager.googleapis.com/Secret\022#project"
+ "s/{project}/secrets/{secret}B\014\n\nexpirati"
+ "on\"\242\004\n\rSecretVersion\022\021\n\004name\030\001 \001(\tB\003\340A\003\022"
+ "4\n\013create_time\030\002 \001(\0132\032.google.protobuf.T"
+ "imestampB\003\340A\003\0225\n\014destroy_time\030\003 \001(\0132\032.go"
+ "ogle.protobuf.TimestampB\003\340A\003\022F\n\005state\030\004 "
+ "\001(\01622.google.cloud.secretmanager.v1.Secr"
+ "etVersion.StateB\003\340A\003\022L\n\022replication_stat"
+ "us\030\005 \001(\01320.google.cloud.secretmanager.v1"
+ ".ReplicationStatus\022\021\n\004etag\030\006 \001(\tB\003\340A\003\022.\n"
+ "!client_specified_payload_checksum\030\007 \001(\010"
+ "B\003\340A\003\"H\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\013\n"
+ "\007ENABLED\020\001\022\014\n\010DISABLED\020\002\022\r\n\tDESTROYED\020\003:"
+ "n\352Ak\n*secretmanager.googleapis.com/Secre"
+ "tVersion\022=projects/{project}/secrets/{se"
+ "cret}/versions/{secret_version}\"\220\004\n\013Repl"
+ "ication\022I\n\tautomatic\030\001 \001(\01324.google.clou"
+ "d.secretmanager.v1.Replication.Automatic"
+ "H\000\022N\n\014user_managed\030\002 \001(\01326.google.cloud."
+ "secretmanager.v1.Replication.UserManaged"
+ "H\000\032o\n\tAutomatic\022b\n\033customer_managed_encr"
+ "yption\030\001 \001(\01328.google.cloud.secretmanage"
+ "r.v1.CustomerManagedEncryptionB\003\340A\001\032\345\001\n\013"
+ "UserManaged\022U\n\010replicas\030\001 \003(\0132>.google.c"
+ "loud.secretmanager.v1.Replication.UserMa"
+ "naged.ReplicaB\003\340A\002\032\177\n\007Replica\022\020\n\010locatio"
+ "n\030\001 \001(\t\022b\n\033customer_managed_encryption\030\002"
+ " \001(\01328.google.cloud.secretmanager.v1.Cus"
+ "tomerManagedEncryptionB\003\340A\001B\r\n\013replicati"
+ "on\"6\n\031CustomerManagedEncryption\022\031\n\014kms_k"
+ "ey_name\030\001 \001(\tB\003\340A\002\"\353\004\n\021ReplicationStatus"
+ "\022U\n\tautomatic\030\001 \001(\[email protected]"
+ "tmanager.v1.ReplicationStatus.AutomaticS"
+ "tatusH\000\022Z\n\014user_managed\030\002 \001(\0132B.google.c"
+ "loud.secretmanager.v1.ReplicationStatus."
+ "UserManagedStatusH\000\032{\n\017AutomaticStatus\022h"
+ "\n\033customer_managed_encryption\030\001 \001(\0132>.go"
+ "ogle.cloud.secretmanager.v1.CustomerMana"
+ "gedEncryptionStatusB\003\340A\003\032\217\002\n\021UserManaged"
+ "Status\022g\n\010replicas\030\001 \003(\0132P.google.cloud."
+ "secretmanager.v1.ReplicationStatus.UserM"
+ "anagedStatus.ReplicaStatusB\003\340A\003\032\220\001\n\rRepl"
+ "icaStatus\022\025\n\010location\030\001 \001(\tB\003\340A\003\022h\n\033cust"
+ "omer_managed_encryption\030\002 \001(\0132>.google.c"
+ "loud.secretmanager.v1.CustomerManagedEnc"
+ "ryptionStatusB\003\340A\003B\024\n\022replication_status"
+ "\"D\n\037CustomerManagedEncryptionStatus\022!\n\024k"
+ "ms_key_version_name\030\001 \001(\tB\003\340A\002\"_\n\005Topic\022"
+ "\021\n\004name\030\001 \001(\tB\003\340A\002:C\352A@\n\033pubsub.googleap"
+ "is.com/Topic\022!projects/{project}/topics/"
+ "{topic}\"\200\001\n\010Rotation\022;\n\022next_rotation_ti"
+ "me\030\001 \001(\0132\032.google.protobuf.TimestampB\003\340A"
+ "\001\0227\n\017rotation_period\030\002 \001(\0132\031.google.prot"
+ "obuf.DurationB\003\340A\004\"L\n\rSecretPayload\022\014\n\004d"
+ "ata\030\001 \001(\014\022\035\n\013data_crc32c\030\002 \001(\003B\003\340A\001H\000\210\001\001"
+ "B\016\n\014_data_crc32cB\355\001\n!com.google.cloud.se"
+ "cretmanager.v1B\016ResourcesProtoP\001ZJgoogle"
+ ".golang.org/genproto/googleapis/cloud/se"
+ "cretmanager/v1;secretmanager\370\001\001\242\002\003GSM\252\002\035"
+ "Google.Cloud.SecretManager.V1\312\002\035Google\\C"
+ "loud\\SecretManager\\V1\352\002 Google::Cloud::S"
+ "ecretManager::V1b\006proto3"
+ "nager.v1.RotationB\003\340A\001\022W\n\017version_aliase"
+ "s\030\013 \003(\01329.google.cloud.secretmanager.v1."
+ "Secret.VersionAliasesEntryB\003\340A\001\032-\n\013Label"
+ "sEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0325"
+ "\n\023VersionAliasesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va"
+ "lue\030\002 \001(\003:\0028\001:M\352AJ\n#secretmanager.google"
+ "apis.com/Secret\022#projects/{project}/secr"
+ "ets/{secret}B\014\n\nexpiration\"\242\004\n\rSecretVer"
+ "sion\022\021\n\004name\030\001 \001(\tB\003\340A\003\0224\n\013create_time\030\002"
+ " \001(\0132\032.google.protobuf.TimestampB\003\340A\003\0225\n"
+ "\014destroy_time\030\003 \001(\0132\032.google.protobuf.Ti"
+ "mestampB\003\340A\003\022F\n\005state\030\004 \001(\01622.google.clo"
+ "ud.secretmanager.v1.SecretVersion.StateB"
+ "\003\340A\003\022L\n\022replication_status\030\005 \001(\01320.googl"
+ "e.cloud.secretmanager.v1.ReplicationStat"
+ "us\022\021\n\004etag\030\006 \001(\tB\003\340A\003\022.\n!client_specifie"
+ "d_payload_checksum\030\007 \001(\010B\003\340A\003\"H\n\005State\022\025"
+ "\n\021STATE_UNSPECIFIED\020\000\022\013\n\007ENABLED\020\001\022\014\n\010DI"
+ "SABLED\020\002\022\r\n\tDESTROYED\020\003:n\352Ak\n*secretmana"
+ "ger.googleapis.com/SecretVersion\022=projec"
+ "ts/{project}/secrets/{secret}/versions/{"
+ "secret_version}\"\220\004\n\013Replication\022I\n\tautom"
+ "atic\030\001 \001(\01324.google.cloud.secretmanager."
+ "v1.Replication.AutomaticH\000\022N\n\014user_manag"
+ "ed\030\002 \001(\01326.google.cloud.secretmanager.v1"
+ ".Replication.UserManagedH\000\032o\n\tAutomatic\022"
+ "b\n\033customer_managed_encryption\030\001 \001(\01328.g"
+ "oogle.cloud.secretmanager.v1.CustomerMan"
+ "agedEncryptionB\003\340A\001\032\345\001\n\013UserManaged\022U\n\010r"
+ "eplicas\030\001 \003(\0132>.google.cloud.secretmanag"
+ "er.v1.Replication.UserManaged.ReplicaB\003\340"
+ "A\002\032\177\n\007Replica\022\020\n\010location\030\001 \001(\t\022b\n\033custo"
+ "mer_managed_encryption\030\002 \001(\01328.google.cl"
+ "oud.secretmanager.v1.CustomerManagedEncr"
+ "yptionB\003\340A\001B\r\n\013replication\"6\n\031CustomerMa"
+ "nagedEncryption\022\031\n\014kms_key_name\030\001 \001(\tB\003\340"
+ "A\002\"\353\004\n\021ReplicationStatus\022U\n\tautomatic\030\001 "
+ "\001(\[email protected]"
+ "icationStatus.AutomaticStatusH\000\022Z\n\014user_"
+ "managed\030\002 \001(\0132B.google.cloud.secretmanag"
+ "er.v1.ReplicationStatus.UserManagedStatu"
+ "sH\000\032{\n\017AutomaticStatus\022h\n\033customer_manag"
+ "ed_encryption\030\001 \001(\0132>.google.cloud.secre"
+ "tmanager.v1.CustomerManagedEncryptionSta"
+ "tusB\003\340A\003\032\217\002\n\021UserManagedStatus\022g\n\010replic"
+ "as\030\001 \003(\0132P.google.cloud.secretmanager.v1"
+ ".ReplicationStatus.UserManagedStatus.Rep"
+ "licaStatusB\003\340A\003\032\220\001\n\rReplicaStatus\022\025\n\010loc"
+ "ation\030\001 \001(\tB\003\340A\003\022h\n\033customer_managed_enc"
+ "ryption\030\002 \001(\0132>.google.cloud.secretmanag"
+ "er.v1.CustomerManagedEncryptionStatusB\003\340"
+ "A\003B\024\n\022replication_status\"D\n\037CustomerMana"
+ "gedEncryptionStatus\022!\n\024kms_key_version_n"
+ "ame\030\001 \001(\tB\003\340A\002\"_\n\005Topic\022\021\n\004name\030\001 \001(\tB\003\340"
+ "A\002:C\352A@\n\033pubsub.googleapis.com/Topic\022!pr"
+ "ojects/{project}/topics/{topic}\"\200\001\n\010Rota"
+ "tion\022;\n\022next_rotation_time\030\001 \001(\0132\032.googl"
+ "e.protobuf.TimestampB\003\340A\001\0227\n\017rotation_pe"
+ "riod\030\002 \001(\0132\031.google.protobuf.DurationB\003\340"
+ "A\004\"L\n\rSecretPayload\022\014\n\004data\030\001 \001(\014\022\035\n\013dat"
+ "a_crc32c\030\002 \001(\003B\003\340A\001H\000\210\001\001B\016\n\014_data_crc32c"
+ "B\355\001\n!com.google.cloud.secretmanager.v1B\016"
+ "ResourcesProtoP\001ZJgoogle.golang.org/genp"
+ "roto/googleapis/cloud/secretmanager/v1;s"
+ "ecretmanager\370\001\001\242\002\003GSM\252\002\035Google.Cloud.Sec"
+ "retManager.V1\312\002\035Google\\Cloud\\SecretManag"
+ "er\\V1\352\002 Google::Cloud::SecretManager::V1"
+ "b\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
Expand All @@ -207,6 +215,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
"Ttl",
"Etag",
"Rotation",
"VersionAliases",
"Expiration",
});
internal_static_google_cloud_secretmanager_v1_Secret_LabelsEntry_descriptor =
Expand All @@ -217,6 +226,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
new java.lang.String[] {
"Key", "Value",
});
internal_static_google_cloud_secretmanager_v1_Secret_VersionAliasesEntry_descriptor =
internal_static_google_cloud_secretmanager_v1_Secret_descriptor.getNestedTypes().get(1);
internal_static_google_cloud_secretmanager_v1_Secret_VersionAliasesEntry_fieldAccessorTable =
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_cloud_secretmanager_v1_Secret_VersionAliasesEntry_descriptor,
new java.lang.String[] {
"Key", "Value",
});
internal_static_google_cloud_secretmanager_v1_SecretVersion_descriptor =
getDescriptor().getMessageTypes().get(1);
internal_static_google_cloud_secretmanager_v1_SecretVersion_fieldAccessorTable =
Expand Down
Loading