diff --git a/README.md b/README.md index 8d320d30..2cf2a848 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:24.2.0') +implementation platform('com.google.cloud:libraries-bom:24.3.0') implementation 'com.google.cloud:google-cloud-redis' ``` diff --git a/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java b/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java index 9262a5bf..09011d99 100644 --- a/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java +++ b/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java @@ -186,6 +186,7 @@ public void getInstanceTest() throws Exception { .setAlternativeLocationId("alternativeLocationId1787141949") .setRedisVersion("redisVersion-1972584739") .setReservedIpRange("reservedIpRange575015950") + .setSecondaryIpRange("secondaryIpRange-1937131454") .setHost("host3208616") .setPort(3446913) .setCurrentLocationId("currentLocationId-1808505335") @@ -248,6 +249,7 @@ public void getInstanceTest2() throws Exception { .setAlternativeLocationId("alternativeLocationId1787141949") .setRedisVersion("redisVersion-1972584739") .setReservedIpRange("reservedIpRange575015950") + .setSecondaryIpRange("secondaryIpRange-1937131454") .setHost("host3208616") .setPort(3446913) .setCurrentLocationId("currentLocationId-1808505335") @@ -384,6 +386,7 @@ public void createInstanceTest() throws Exception { .setAlternativeLocationId("alternativeLocationId1787141949") .setRedisVersion("redisVersion-1972584739") .setReservedIpRange("reservedIpRange575015950") + .setSecondaryIpRange("secondaryIpRange-1937131454") .setHost("host3208616") .setPort(3446913) .setCurrentLocationId("currentLocationId-1808505335") @@ -460,6 +463,7 @@ public void createInstanceTest2() throws Exception { .setAlternativeLocationId("alternativeLocationId1787141949") .setRedisVersion("redisVersion-1972584739") .setReservedIpRange("reservedIpRange575015950") + .setSecondaryIpRange("secondaryIpRange-1937131454") .setHost("host3208616") .setPort(3446913) .setCurrentLocationId("currentLocationId-1808505335") @@ -536,6 +540,7 @@ public void updateInstanceTest() throws Exception { .setAlternativeLocationId("alternativeLocationId1787141949") .setRedisVersion("redisVersion-1972584739") .setReservedIpRange("reservedIpRange575015950") + .setSecondaryIpRange("secondaryIpRange-1937131454") .setHost("host3208616") .setPort(3446913) .setCurrentLocationId("currentLocationId-1808505335") @@ -609,6 +614,7 @@ public void upgradeInstanceTest() throws Exception { .setAlternativeLocationId("alternativeLocationId1787141949") .setRedisVersion("redisVersion-1972584739") .setReservedIpRange("reservedIpRange575015950") + .setSecondaryIpRange("secondaryIpRange-1937131454") .setHost("host3208616") .setPort(3446913) .setCurrentLocationId("currentLocationId-1808505335") @@ -682,6 +688,7 @@ public void upgradeInstanceTest2() throws Exception { .setAlternativeLocationId("alternativeLocationId1787141949") .setRedisVersion("redisVersion-1972584739") .setReservedIpRange("reservedIpRange575015950") + .setSecondaryIpRange("secondaryIpRange-1937131454") .setHost("host3208616") .setPort(3446913) .setCurrentLocationId("currentLocationId-1808505335") @@ -755,6 +762,7 @@ public void importInstanceTest() throws Exception { .setAlternativeLocationId("alternativeLocationId1787141949") .setRedisVersion("redisVersion-1972584739") .setReservedIpRange("reservedIpRange575015950") + .setSecondaryIpRange("secondaryIpRange-1937131454") .setHost("host3208616") .setPort(3446913) .setCurrentLocationId("currentLocationId-1808505335") @@ -828,6 +836,7 @@ public void exportInstanceTest() throws Exception { .setAlternativeLocationId("alternativeLocationId1787141949") .setRedisVersion("redisVersion-1972584739") .setReservedIpRange("reservedIpRange575015950") + .setSecondaryIpRange("secondaryIpRange-1937131454") .setHost("host3208616") .setPort(3446913) .setCurrentLocationId("currentLocationId-1808505335") @@ -901,6 +910,7 @@ public void failoverInstanceTest() throws Exception { .setAlternativeLocationId("alternativeLocationId1787141949") .setRedisVersion("redisVersion-1972584739") .setReservedIpRange("reservedIpRange575015950") + .setSecondaryIpRange("secondaryIpRange-1937131454") .setHost("host3208616") .setPort(3446913) .setCurrentLocationId("currentLocationId-1808505335") @@ -976,6 +986,7 @@ public void failoverInstanceTest2() throws Exception { .setAlternativeLocationId("alternativeLocationId1787141949") .setRedisVersion("redisVersion-1972584739") .setReservedIpRange("reservedIpRange575015950") + .setSecondaryIpRange("secondaryIpRange-1937131454") .setHost("host3208616") .setPort(3446913) .setCurrentLocationId("currentLocationId-1808505335") @@ -1135,6 +1146,7 @@ public void rescheduleMaintenanceTest() throws Exception { .setAlternativeLocationId("alternativeLocationId1787141949") .setRedisVersion("redisVersion-1972584739") .setReservedIpRange("reservedIpRange575015950") + .setSecondaryIpRange("secondaryIpRange-1937131454") .setHost("host3208616") .setPort(3446913) .setCurrentLocationId("currentLocationId-1808505335") @@ -1215,6 +1227,7 @@ public void rescheduleMaintenanceTest2() throws Exception { .setAlternativeLocationId("alternativeLocationId1787141949") .setRedisVersion("redisVersion-1972584739") .setReservedIpRange("reservedIpRange575015950") + .setSecondaryIpRange("secondaryIpRange-1937131454") .setHost("host3208616") .setPort(3446913) .setCurrentLocationId("currentLocationId-1808505335") diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java index faeb3c38..57d3f714 100644 --- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java +++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java @@ -162,226 +162,226 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "d_mask.proto\032\037google/protobuf/timestamp." + "proto\032\033google/type/dayofweek.proto\032\033goog" + "le/type/timeofday.proto\".\n\010NodeInfo\022\017\n\002i" - + "d\030\001 \001(\tB\003\340A\003\022\021\n\004zone\030\002 \001(\tB\003\340A\003\"\204\021\n\010Inst" + + "d\030\001 \001(\tB\003\340A\003\022\021\n\004zone\030\002 \001(\tB\003\340A\003\"\245\021\n\010Inst" + "ance\022\021\n\004name\030\001 \001(\tB\003\340A\002\022\024\n\014display_name\030" + "\002 \001(\t\022@\n\006labels\030\003 \003(\01320.google.cloud.red" + "is.v1beta1.Instance.LabelsEntry\022\030\n\013locat" + "ion_id\030\004 \001(\tB\003\340A\001\022$\n\027alternative_locatio" + "n_id\030\005 \001(\tB\003\340A\001\022\032\n\rredis_version\030\007 \001(\tB\003" - + "\340A\001\022\036\n\021reserved_ip_range\030\t \001(\tB\003\340A\001\022\021\n\004h" - + "ost\030\n \001(\tB\003\340A\003\022\021\n\004port\030\013 \001(\005B\003\340A\003\022 \n\023cur" - + "rent_location_id\030\014 \001(\tB\003\340A\003\0224\n\013create_ti" - + "me\030\r \001(\0132\032.google.protobuf.TimestampB\003\340A" - + "\003\022>\n\005state\030\016 \001(\0162*.google.cloud.redis.v1" - + "beta1.Instance.StateB\003\340A\003\022\033\n\016status_mess" - + "age\030\017 \001(\tB\003\340A\003\022R\n\rredis_configs\030\020 \003(\01326." - + "google.cloud.redis.v1beta1.Instance.Redi" - + "sConfigsEntryB\003\340A\001\022<\n\004tier\030\021 \001(\0162).googl" - + "e.cloud.redis.v1beta1.Instance.TierB\003\340A\002" - + "\022\033\n\016memory_size_gb\030\022 \001(\005B\003\340A\002\022\037\n\022authori" - + "zed_network\030\024 \001(\tB\003\340A\001\022%\n\030persistence_ia" - + "m_identity\030\025 \001(\tB\003\340A\003\022K\n\014connect_mode\030\026 " - + "\001(\01620.google.cloud.redis.v1beta1.Instanc" - + "e.ConnectModeB\003\340A\001\022\031\n\014auth_enabled\030\027 \001(\010" - + "B\003\340A\001\022H\n\017server_ca_certs\030\031 \003(\0132*.google." - + "cloud.redis.v1beta1.TlsCertificateB\003\340A\003\022" - + "`\n\027transit_encryption_mode\030\032 \001(\0162:.googl" - + "e.cloud.redis.v1beta1.Instance.TransitEn" - + "cryptionModeB\003\340A\001\022N\n\022maintenance_policy\030" - + "\033 \001(\0132-.google.cloud.redis.v1beta1.Maint" - + "enancePolicyB\003\340A\001\022R\n\024maintenance_schedul" - + "e\030\034 \001(\0132/.google.cloud.redis.v1beta1.Mai" - + "ntenanceScheduleB\003\340A\003\022\032\n\rreplica_count\030\037" - + " \001(\005B\003\340A\001\0228\n\005nodes\030 \003(\0132$.google.cloud." - + "redis.v1beta1.NodeInfoB\003\340A\003\022\032\n\rread_endp" - + "oint\030! \001(\tB\003\340A\003\022\037\n\022read_endpoint_port\030\" " - + "\001(\005B\003\340A\003\022V\n\022read_replicas_mode\030# \001(\01625.g" - + "oogle.cloud.redis.v1beta1.Instance.ReadR" - + "eplicasModeB\003\340A\001\022N\n\022persistence_config\030%" - + " \001(\0132-.google.cloud.redis.v1beta1.Persis" - + "tenceConfigB\003\340A\001\032-\n\013LabelsEntry\022\013\n\003key\030\001" - + " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0323\n\021RedisConfigsE" - + "ntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\224\001\n" - + "\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\014\n\010CREATIN" - + "G\020\001\022\t\n\005READY\020\002\022\014\n\010UPDATING\020\003\022\014\n\010DELETING" - + "\020\004\022\r\n\tREPAIRING\020\005\022\017\n\013MAINTENANCE\020\006\022\r\n\tIM" - + "PORTING\020\010\022\020\n\014FAILING_OVER\020\n\"8\n\004Tier\022\024\n\020T" - + "IER_UNSPECIFIED\020\000\022\t\n\005BASIC\020\001\022\017\n\013STANDARD" - + "_HA\020\003\"[\n\013ConnectMode\022\034\n\030CONNECT_MODE_UNS" - + "PECIFIED\020\000\022\022\n\016DIRECT_PEERING\020\001\022\032\n\026PRIVAT" - + "E_SERVICE_ACCESS\020\002\"i\n\025TransitEncryptionM" - + "ode\022\'\n#TRANSIT_ENCRYPTION_MODE_UNSPECIFI" - + "ED\020\000\022\031\n\025SERVER_AUTHENTICATION\020\001\022\014\n\010DISAB" - + "LED\020\002\"m\n\020ReadReplicasMode\022\"\n\036READ_REPLIC" - + "AS_MODE_UNSPECIFIED\020\000\022\032\n\026READ_REPLICAS_D" - + "ISABLED\020\001\022\031\n\025READ_REPLICAS_ENABLED\020\002:`\352A" - + "]\n\035redis.googleapis.com/Instance\022\"2/v1beta1/{pa" - + "rent=projects/*/locations/*}/instances:\010" - + "instance\332A\033parent,instance_id,instance\312A" - + ":\n#google.cloud.redis.v1beta1.Instance\022\023" - + "google.protobuf.Any\022\206\002\n\016UpdateInstance\0221" - + ".google.cloud.redis.v1beta1.UpdateInstan" - + "ceRequest\032\035.google.longrunning.Operation" - + "\"\241\001\202\323\344\223\002G2;/v1beta1/{instance.name=proje" - + "cts/*/locations/*/instances/*}:\010instance" - + "\332A\024update_mask,instance\312A:\n#google.cloud" - + ".redis.v1beta1.Instance\022\023google.protobuf" - + ".Any\022\376\001\n\017UpgradeInstance\0222.google.cloud." - + "redis.v1beta1.UpgradeInstanceRequest\032\035.g" - + "oogle.longrunning.Operation\"\227\001\202\323\344\223\002?\":/v" - + "1beta1/{name=projects/*/locations/*/inst" - + "ances/*}:upgrade:\001*\332A\022name,redis_version" - + "\312A:\n#google.cloud.redis.v1beta1.Instance" - + "\022\023google.protobuf.Any\022\372\001\n\016ImportInstance" - + "\0221.google.cloud.redis.v1beta1.ImportInst" - + "anceRequest\032\035.google.longrunning.Operati" - + "on\"\225\001\202\323\344\223\002>\"9/v1beta1/{name=projects/*/l" - + "ocations/*/instances/*}:import:\001*\332A\021name" - + ",input_config\312A:\n#google.cloud.redis.v1b" - + "eta1.Instance\022\023google.protobuf.Any\022\373\001\n\016E" - + "xportInstance\0221.google.cloud.redis.v1bet" - + "a1.ExportInstanceRequest\032\035.google.longru" - + "nning.Operation\"\226\001\202\323\344\223\002>\"9/v1beta1/{name" - + "=projects/*/locations/*/instances/*}:exp" - + "ort:\001*\332A\022name,output_config\312A:\n#google.c" - + "loud.redis.v1beta1.Instance\022\023google.prot" - + "obuf.Any\022\210\002\n\020FailoverInstance\0223.google.c" - + "loud.redis.v1beta1.FailoverInstanceReque" - + "st\032\035.google.longrunning.Operation\"\237\001\202\323\344\223" - + "\002@\";/v1beta1/{name=projects/*/locations/" - + "*/instances/*}:failover:\001*\332A\031name,data_p" - + "rotection_mode\312A:\n#google.cloud.redis.v1" - + "beta1.Instance\022\023google.protobuf.Any\022\324\001\n\016" - + "DeleteInstance\0221.google.cloud.redis.v1be" - + "ta1.DeleteInstanceRequest\032\035.google.longr" - + "unning.Operation\"p\202\323\344\223\0024*2/v1beta1/{name" - + "=projects/*/locations/*/instances/*}\332A\004n" - + "ame\312A,\n\025google.protobuf.Empty\022\023google.pr" - + "otobuf.Any\022\252\002\n\025RescheduleMaintenance\0228.g" - + "oogle.cloud.redis.v1beta1.RescheduleMain" - + "tenanceRequest\032\035.google.longrunning.Oper" - + "ation\"\267\001\202\323\344\223\002M\"H/v1beta1/{name=projects/" - + "*/locations/*/instances/*}:rescheduleMai" - + "ntenance:\001*\332A$name, reschedule_type, sch" - + "edule_time\312A:\n#google.cloud.redis.v1beta" - + "1.Instance\022\023google.protobuf.Any\032H\312A\024redi" - + "s.googleapis.com\322A.https://www.googleapi" - + "s.com/auth/cloud-platformB\177\n\036com.google." - + "cloud.redis.v1beta1B\032CloudRedisServiceBe" - + "taProtoP\001Z?google.golang.org/genproto/go" - + "ogleapis/cloud/redis/v1beta1;redisb\006prot" - + "o3" + + "\340A\001\022\036\n\021reserved_ip_range\030\t \001(\tB\003\340A\001\022\037\n\022s" + + "econdary_ip_range\030\036 \001(\tB\003\340A\001\022\021\n\004host\030\n \001" + + "(\tB\003\340A\003\022\021\n\004port\030\013 \001(\005B\003\340A\003\022 \n\023current_lo" + + "cation_id\030\014 \001(\tB\003\340A\003\0224\n\013create_time\030\r \001(" + + "\0132\032.google.protobuf.TimestampB\003\340A\003\022>\n\005st" + + "ate\030\016 \001(\0162*.google.cloud.redis.v1beta1.I" + + "nstance.StateB\003\340A\003\022\033\n\016status_message\030\017 \001" + + "(\tB\003\340A\003\022R\n\rredis_configs\030\020 \003(\01326.google." + + "cloud.redis.v1beta1.Instance.RedisConfig" + + "sEntryB\003\340A\001\022<\n\004tier\030\021 \001(\0162).google.cloud" + + ".redis.v1beta1.Instance.TierB\003\340A\002\022\033\n\016mem" + + "ory_size_gb\030\022 \001(\005B\003\340A\002\022\037\n\022authorized_net" + + "work\030\024 \001(\tB\003\340A\001\022%\n\030persistence_iam_ident" + + "ity\030\025 \001(\tB\003\340A\003\022K\n\014connect_mode\030\026 \001(\01620.g" + + "oogle.cloud.redis.v1beta1.Instance.Conne" + + "ctModeB\003\340A\001\022\031\n\014auth_enabled\030\027 \001(\010B\003\340A\001\022H" + + "\n\017server_ca_certs\030\031 \003(\0132*.google.cloud.r" + + "edis.v1beta1.TlsCertificateB\003\340A\003\022`\n\027tran" + + "sit_encryption_mode\030\032 \001(\0162:.google.cloud" + + ".redis.v1beta1.Instance.TransitEncryptio" + + "nModeB\003\340A\001\022N\n\022maintenance_policy\030\033 \001(\0132-" + + ".google.cloud.redis.v1beta1.MaintenanceP" + + "olicyB\003\340A\001\022R\n\024maintenance_schedule\030\034 \001(\013" + + "2/.google.cloud.redis.v1beta1.Maintenanc" + + "eScheduleB\003\340A\003\022\032\n\rreplica_count\030\037 \001(\005B\003\340" + + "A\001\0228\n\005nodes\030 \003(\0132$.google.cloud.redis.v" + + "1beta1.NodeInfoB\003\340A\003\022\032\n\rread_endpoint\030! " + + "\001(\tB\003\340A\003\022\037\n\022read_endpoint_port\030\" \001(\005B\003\340A" + + "\003\022V\n\022read_replicas_mode\030# \001(\01625.google.c" + + "loud.redis.v1beta1.Instance.ReadReplicas" + + "ModeB\003\340A\001\022N\n\022persistence_config\030% \001(\0132-." + + "google.cloud.redis.v1beta1.PersistenceCo" + + "nfigB\003\340A\001\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n" + + "\005value\030\002 \001(\t:\0028\001\0323\n\021RedisConfigsEntry\022\013\n" + + "\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\224\001\n\005State\022" + + "\025\n\021STATE_UNSPECIFIED\020\000\022\014\n\010CREATING\020\001\022\t\n\005" + + "READY\020\002\022\014\n\010UPDATING\020\003\022\014\n\010DELETING\020\004\022\r\n\tR" + + "EPAIRING\020\005\022\017\n\013MAINTENANCE\020\006\022\r\n\tIMPORTING" + + "\020\010\022\020\n\014FAILING_OVER\020\n\"8\n\004Tier\022\024\n\020TIER_UNS" + + "PECIFIED\020\000\022\t\n\005BASIC\020\001\022\017\n\013STANDARD_HA\020\003\"[" + + "\n\013ConnectMode\022\034\n\030CONNECT_MODE_UNSPECIFIE" + + "D\020\000\022\022\n\016DIRECT_PEERING\020\001\022\032\n\026PRIVATE_SERVI" + + "CE_ACCESS\020\002\"i\n\025TransitEncryptionMode\022\'\n#" + + "TRANSIT_ENCRYPTION_MODE_UNSPECIFIED\020\000\022\031\n" + + "\025SERVER_AUTHENTICATION\020\001\022\014\n\010DISABLED\020\002\"m" + + "\n\020ReadReplicasMode\022\"\n\036READ_REPLICAS_MODE" + + "_UNSPECIFIED\020\000\022\032\n\026READ_REPLICAS_DISABLED" + + "\020\001\022\031\n\025READ_REPLICAS_ENABLED\020\002:`\352A]\n\035redi" + + "s.googleapis.com/Instance\022\"2/v1beta1/{parent=pr" + + "ojects/*/locations/*}/instances:\010instanc" + + "e\332A\033parent,instance_id,instance\312A:\n#goog" + + "le.cloud.redis.v1beta1.Instance\022\023google." + + "protobuf.Any\022\206\002\n\016UpdateInstance\0221.google" + + ".cloud.redis.v1beta1.UpdateInstanceReque" + + "st\032\035.google.longrunning.Operation\"\241\001\202\323\344\223" + + "\002G2;/v1beta1/{instance.name=projects/*/l" + + "ocations/*/instances/*}:\010instance\332A\024upda" + + "te_mask,instance\312A:\n#google.cloud.redis." + + "v1beta1.Instance\022\023google.protobuf.Any\022\376\001" + + "\n\017UpgradeInstance\0222.google.cloud.redis.v" + + "1beta1.UpgradeInstanceRequest\032\035.google.l" + + "ongrunning.Operation\"\227\001\202\323\344\223\002?\":/v1beta1/" + + "{name=projects/*/locations/*/instances/*" + + "}:upgrade:\001*\332A\022name,redis_version\312A:\n#go" + + "ogle.cloud.redis.v1beta1.Instance\022\023googl" + + "e.protobuf.Any\022\372\001\n\016ImportInstance\0221.goog" + + "le.cloud.redis.v1beta1.ImportInstanceReq" + + "uest\032\035.google.longrunning.Operation\"\225\001\202\323" + + "\344\223\002>\"9/v1beta1/{name=projects/*/location" + + "s/*/instances/*}:import:\001*\332A\021name,input_" + + "config\312A:\n#google.cloud.redis.v1beta1.In" + + "stance\022\023google.protobuf.Any\022\373\001\n\016ExportIn" + + "stance\0221.google.cloud.redis.v1beta1.Expo" + + "rtInstanceRequest\032\035.google.longrunning.O" + + "peration\"\226\001\202\323\344\223\002>\"9/v1beta1/{name=projec" + + "ts/*/locations/*/instances/*}:export:\001*\332" + + "A\022name,output_config\312A:\n#google.cloud.re" + + "dis.v1beta1.Instance\022\023google.protobuf.An" + + "y\022\210\002\n\020FailoverInstance\0223.google.cloud.re" + + "dis.v1beta1.FailoverInstanceRequest\032\035.go" + + "ogle.longrunning.Operation\"\237\001\202\323\344\223\002@\";/v1" + + "beta1/{name=projects/*/locations/*/insta" + + "nces/*}:failover:\001*\332A\031name,data_protecti" + + "on_mode\312A:\n#google.cloud.redis.v1beta1.I" + + "nstance\022\023google.protobuf.Any\022\324\001\n\016DeleteI" + + "nstance\0221.google.cloud.redis.v1beta1.Del" + + "eteInstanceRequest\032\035.google.longrunning." + + "Operation\"p\202\323\344\223\0024*2/v1beta1/{name=projec" + + "ts/*/locations/*/instances/*}\332A\004name\312A,\n" + + "\025google.protobuf.Empty\022\023google.protobuf." + + "Any\022\252\002\n\025RescheduleMaintenance\0228.google.c" + + "loud.redis.v1beta1.RescheduleMaintenance" + + "Request\032\035.google.longrunning.Operation\"\267" + + "\001\202\323\344\223\002M\"H/v1beta1/{name=projects/*/locat" + + "ions/*/instances/*}:rescheduleMaintenanc" + + "e:\001*\332A$name, reschedule_type, schedule_t" + + "ime\312A:\n#google.cloud.redis.v1beta1.Insta" + + "nce\022\023google.protobuf.Any\032H\312A\024redis.googl" + + "eapis.com\322A.https://www.googleapis.com/a" + + "uth/cloud-platformB\177\n\036com.google.cloud.r" + + "edis.v1beta1B\032CloudRedisServiceBetaProto" + + "P\001Z?google.golang.org/genproto/googleapi" + + "s/cloud/redis/v1beta1;redisb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -419,6 +419,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "AlternativeLocationId", "RedisVersion", "ReservedIpRange", + "SecondaryIpRange", "Host", "Port", "CurrentLocationId", diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java index d4f11a48..eca3c7ae 100644 --- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java +++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java @@ -22,7 +22,7 @@ * * *
- * A Google Cloud Redis instance.
+ * A Memorystore for Redis instance.
  * 
* * Protobuf type {@code google.cloud.redis.v1beta1.Instance} @@ -44,6 +44,7 @@ private Instance() { alternativeLocationId_ = ""; redisVersion_ = ""; reservedIpRange_ = ""; + secondaryIpRange_ = ""; host_ = ""; currentLocationId_ = ""; state_ = 0; @@ -295,6 +296,13 @@ private Instance( maintenanceSchedule_ = subBuilder.buildPartial(); } + break; + } + case 242: + { + java.lang.String s = input.readStringRequireUtf8(); + + secondaryIpRange_ = s; break; } case 248: @@ -1785,6 +1793,63 @@ public com.google.protobuf.ByteString getReservedIpRangeBytes() { } } + public static final int SECONDARY_IP_RANGE_FIELD_NUMBER = 30; + private volatile java.lang.Object secondaryIpRange_; + /** + * + * + *
+   * Optional. Additional IP range for node placement. Required when enabling read
+   * replicas on an existing instance. For DIRECT_PEERING mode value must be a
+   * CIDR range of size /28, or "auto". For PRIVATE_SERVICE_ACCESS mode value
+   * must be the name of an allocated address range associated with the private
+   * service access connection, or "auto".
+   * 
+ * + * string secondary_ip_range = 30 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The secondaryIpRange. + */ + @java.lang.Override + public java.lang.String getSecondaryIpRange() { + java.lang.Object ref = secondaryIpRange_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + secondaryIpRange_ = s; + return s; + } + } + /** + * + * + *
+   * Optional. Additional IP range for node placement. Required when enabling read
+   * replicas on an existing instance. For DIRECT_PEERING mode value must be a
+   * CIDR range of size /28, or "auto". For PRIVATE_SERVICE_ACCESS mode value
+   * must be the name of an allocated address range associated with the private
+   * service access connection, or "auto".
+   * 
+ * + * string secondary_ip_range = 30 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for secondaryIpRange. + */ + @java.lang.Override + public com.google.protobuf.ByteString getSecondaryIpRangeBytes() { + java.lang.Object ref = secondaryIpRange_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + secondaryIpRange_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + public static final int HOST_FIELD_NUMBER = 10; private volatile java.lang.Object host_; /** @@ -2859,8 +2924,7 @@ public int getReadEndpointPort() { * * *
-   * Optional. Read replica mode. Can only be specified when trying to create the
-   * instance.
+   * Optional. Read replicas mode for the instance. Defaults to READ_REPLICAS_DISABLED.
    * 
* * @@ -2877,8 +2941,7 @@ public int getReadReplicasModeValue() { * * *
-   * Optional. Read replica mode. Can only be specified when trying to create the
-   * instance.
+   * Optional. Read replicas mode for the instance. Defaults to READ_REPLICAS_DISABLED.
    * 
* * @@ -3040,6 +3103,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (maintenanceSchedule_ != null) { output.writeMessage(28, getMaintenanceSchedule()); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(secondaryIpRange_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 30, secondaryIpRange_); + } if (replicaCount_ != 0) { output.writeInt32(31, replicaCount_); } @@ -3161,6 +3227,9 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(28, getMaintenanceSchedule()); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(secondaryIpRange_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(30, secondaryIpRange_); + } if (replicaCount_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(31, replicaCount_); } @@ -3203,6 +3272,7 @@ public boolean equals(final java.lang.Object obj) { if (!getAlternativeLocationId().equals(other.getAlternativeLocationId())) return false; if (!getRedisVersion().equals(other.getRedisVersion())) return false; if (!getReservedIpRange().equals(other.getReservedIpRange())) return false; + if (!getSecondaryIpRange().equals(other.getSecondaryIpRange())) return false; if (!getHost().equals(other.getHost())) return false; if (getPort() != other.getPort()) return false; if (!getCurrentLocationId().equals(other.getCurrentLocationId())) return false; @@ -3265,6 +3335,8 @@ public int hashCode() { hash = (53 * hash) + getRedisVersion().hashCode(); hash = (37 * hash) + RESERVED_IP_RANGE_FIELD_NUMBER; hash = (53 * hash) + getReservedIpRange().hashCode(); + hash = (37 * hash) + SECONDARY_IP_RANGE_FIELD_NUMBER; + hash = (53 * hash) + getSecondaryIpRange().hashCode(); hash = (37 * hash) + HOST_FIELD_NUMBER; hash = (53 * hash) + getHost().hashCode(); hash = (37 * hash) + PORT_FIELD_NUMBER; @@ -3429,7 +3501,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build * * *
-   * A Google Cloud Redis instance.
+   * A Memorystore for Redis instance.
    * 
* * Protobuf type {@code google.cloud.redis.v1beta1.Instance} @@ -3510,6 +3582,8 @@ public Builder clear() { reservedIpRange_ = ""; + secondaryIpRange_ = ""; + host_ = ""; port_ = 0; @@ -3615,6 +3689,7 @@ public com.google.cloud.redis.v1beta1.Instance buildPartial() { result.alternativeLocationId_ = alternativeLocationId_; result.redisVersion_ = redisVersion_; result.reservedIpRange_ = reservedIpRange_; + result.secondaryIpRange_ = secondaryIpRange_; result.host_ = host_; result.port_ = port_; result.currentLocationId_ = currentLocationId_; @@ -3745,6 +3820,10 @@ public Builder mergeFrom(com.google.cloud.redis.v1beta1.Instance other) { reservedIpRange_ = other.reservedIpRange_; onChanged(); } + if (!other.getSecondaryIpRange().isEmpty()) { + secondaryIpRange_ = other.secondaryIpRange_; + onChanged(); + } if (!other.getHost().isEmpty()) { host_ = other.host_; onChanged(); @@ -4830,6 +4909,132 @@ public Builder setReservedIpRangeBytes(com.google.protobuf.ByteString value) { return this; } + private java.lang.Object secondaryIpRange_ = ""; + /** + * + * + *
+     * Optional. Additional IP range for node placement. Required when enabling read
+     * replicas on an existing instance. For DIRECT_PEERING mode value must be a
+     * CIDR range of size /28, or "auto". For PRIVATE_SERVICE_ACCESS mode value
+     * must be the name of an allocated address range associated with the private
+     * service access connection, or "auto".
+     * 
+ * + * string secondary_ip_range = 30 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The secondaryIpRange. + */ + public java.lang.String getSecondaryIpRange() { + java.lang.Object ref = secondaryIpRange_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + secondaryIpRange_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + *
+     * Optional. Additional IP range for node placement. Required when enabling read
+     * replicas on an existing instance. For DIRECT_PEERING mode value must be a
+     * CIDR range of size /28, or "auto". For PRIVATE_SERVICE_ACCESS mode value
+     * must be the name of an allocated address range associated with the private
+     * service access connection, or "auto".
+     * 
+ * + * string secondary_ip_range = 30 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for secondaryIpRange. + */ + public com.google.protobuf.ByteString getSecondaryIpRangeBytes() { + java.lang.Object ref = secondaryIpRange_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + secondaryIpRange_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + *
+     * Optional. Additional IP range for node placement. Required when enabling read
+     * replicas on an existing instance. For DIRECT_PEERING mode value must be a
+     * CIDR range of size /28, or "auto". For PRIVATE_SERVICE_ACCESS mode value
+     * must be the name of an allocated address range associated with the private
+     * service access connection, or "auto".
+     * 
+ * + * string secondary_ip_range = 30 [(.google.api.field_behavior) = OPTIONAL]; + * + * @param value The secondaryIpRange to set. + * @return This builder for chaining. + */ + public Builder setSecondaryIpRange(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + secondaryIpRange_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * Optional. Additional IP range for node placement. Required when enabling read
+     * replicas on an existing instance. For DIRECT_PEERING mode value must be a
+     * CIDR range of size /28, or "auto". For PRIVATE_SERVICE_ACCESS mode value
+     * must be the name of an allocated address range associated with the private
+     * service access connection, or "auto".
+     * 
+ * + * string secondary_ip_range = 30 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return This builder for chaining. + */ + public Builder clearSecondaryIpRange() { + + secondaryIpRange_ = getDefaultInstance().getSecondaryIpRange(); + onChanged(); + return this; + } + /** + * + * + *
+     * Optional. Additional IP range for node placement. Required when enabling read
+     * replicas on an existing instance. For DIRECT_PEERING mode value must be a
+     * CIDR range of size /28, or "auto". For PRIVATE_SERVICE_ACCESS mode value
+     * must be the name of an allocated address range associated with the private
+     * service access connection, or "auto".
+     * 
+ * + * string secondary_ip_range = 30 [(.google.api.field_behavior) = OPTIONAL]; + * + * @param value The bytes for secondaryIpRange to set. + * @return This builder for chaining. + */ + public Builder setSecondaryIpRangeBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + secondaryIpRange_ = value; + onChanged(); + return this; + } + private java.lang.Object host_ = ""; /** * @@ -7917,8 +8122,7 @@ public Builder clearReadEndpointPort() { * * *
-     * Optional. Read replica mode. Can only be specified when trying to create the
-     * instance.
+     * Optional. Read replicas mode for the instance. Defaults to READ_REPLICAS_DISABLED.
      * 
* * @@ -7935,8 +8139,7 @@ public int getReadReplicasModeValue() { * * *
-     * Optional. Read replica mode. Can only be specified when trying to create the
-     * instance.
+     * Optional. Read replicas mode for the instance. Defaults to READ_REPLICAS_DISABLED.
      * 
* * @@ -7956,8 +8159,7 @@ public Builder setReadReplicasModeValue(int value) { * * *
-     * Optional. Read replica mode. Can only be specified when trying to create the
-     * instance.
+     * Optional. Read replicas mode for the instance. Defaults to READ_REPLICAS_DISABLED.
      * 
* * @@ -7979,8 +8181,7 @@ public com.google.cloud.redis.v1beta1.Instance.ReadReplicasMode getReadReplicasM * * *
-     * Optional. Read replica mode. Can only be specified when trying to create the
-     * instance.
+     * Optional. Read replicas mode for the instance. Defaults to READ_REPLICAS_DISABLED.
      * 
* * @@ -8004,8 +8205,7 @@ public Builder setReadReplicasMode( * * *
-     * Optional. Read replica mode. Can only be specified when trying to create the
-     * instance.
+     * Optional. Read replicas mode for the instance. Defaults to READ_REPLICAS_DISABLED.
      * 
* * diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceOrBuilder.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceOrBuilder.java index 5cf4f707..f9fad1c0 100644 --- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceOrBuilder.java +++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceOrBuilder.java @@ -283,6 +283,39 @@ public interface InstanceOrBuilder */ com.google.protobuf.ByteString getReservedIpRangeBytes(); + /** + * + * + *
+   * Optional. Additional IP range for node placement. Required when enabling read
+   * replicas on an existing instance. For DIRECT_PEERING mode value must be a
+   * CIDR range of size /28, or "auto". For PRIVATE_SERVICE_ACCESS mode value
+   * must be the name of an allocated address range associated with the private
+   * service access connection, or "auto".
+   * 
+ * + * string secondary_ip_range = 30 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The secondaryIpRange. + */ + java.lang.String getSecondaryIpRange(); + /** + * + * + *
+   * Optional. Additional IP range for node placement. Required when enabling read
+   * replicas on an existing instance. For DIRECT_PEERING mode value must be a
+   * CIDR range of size /28, or "auto". For PRIVATE_SERVICE_ACCESS mode value
+   * must be the name of an allocated address range associated with the private
+   * service access connection, or "auto".
+   * 
+ * + * string secondary_ip_range = 30 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for secondaryIpRange. + */ + com.google.protobuf.ByteString getSecondaryIpRangeBytes(); + /** * * @@ -1031,8 +1064,7 @@ public interface InstanceOrBuilder * * *
-   * Optional. Read replica mode. Can only be specified when trying to create the
-   * instance.
+   * Optional. Read replicas mode for the instance. Defaults to READ_REPLICAS_DISABLED.
    * 
* * @@ -1046,8 +1078,7 @@ public interface InstanceOrBuilder * * *
-   * Optional. Read replica mode. Can only be specified when trying to create the
-   * instance.
+   * Optional. Read replicas mode for the instance. Defaults to READ_REPLICAS_DISABLED.
    * 
* * diff --git a/proto-google-cloud-redis-v1beta1/src/main/proto/google/cloud/redis/v1beta1/cloud_redis.proto b/proto-google-cloud-redis-v1beta1/src/main/proto/google/cloud/redis/v1beta1/cloud_redis.proto index b84e0f7f..075a0635 100644 --- a/proto-google-cloud-redis-v1beta1/src/main/proto/google/cloud/redis/v1beta1/cloud_redis.proto +++ b/proto-google-cloud-redis-v1beta1/src/main/proto/google/cloud/redis/v1beta1/cloud_redis.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -229,7 +229,7 @@ message NodeInfo { string zone = 2 [(google.api.field_behavior) = OUTPUT_ONLY]; } -// A Google Cloud Redis instance. +// A Memorystore for Redis instance. message Instance { option (google.api.resource) = { type: "redis.googleapis.com/Instance" @@ -372,6 +372,13 @@ message Instance { // the default block size is /28. string reserved_ip_range = 9 [(google.api.field_behavior) = OPTIONAL]; + // Optional. Additional IP range for node placement. Required when enabling read + // replicas on an existing instance. For DIRECT_PEERING mode value must be a + // CIDR range of size /28, or "auto". For PRIVATE_SERVICE_ACCESS mode value + // must be the name of an allocated address range associated with the private + // service access connection, or "auto". + string secondary_ip_range = 30 [(google.api.field_behavior) = OPTIONAL]; + // Output only. Hostname or IP address of the exposed Redis endpoint used by // clients to connect to the service. string host = 10 [(google.api.field_behavior) = OUTPUT_ONLY]; @@ -479,8 +486,7 @@ message Instance { // endpoint. Standard tier only. Write requests should target 'port'. int32 read_endpoint_port = 34 [(google.api.field_behavior) = OUTPUT_ONLY]; - // Optional. Read replica mode. Can only be specified when trying to create the - // instance. + // Optional. Read replicas mode for the instance. Defaults to READ_REPLICAS_DISABLED. ReadReplicasMode read_replicas_mode = 35 [(google.api.field_behavior) = OPTIONAL]; // Optional. Persistence configuration parameters