From e3c7e8fbdfb5d41a1c418f176679bf5b19f22f83 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 15 Jun 2021 16:01:31 -0700 Subject: [PATCH] feat(spanner): add processing_units to Instance resource (#1248) PiperOrigin-RevId: 378758342 Source-Author: Google APIs Source-Date: Thu Jun 10 16:19:06 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: d8698715e4f5b7c45505dadd679255987c260180 Source-Link: https://github.com/googleapis/googleapis/commit/d8698715e4f5b7c45505dadd679255987c260180 --- .../instance/v1/InstanceAdminClientTest.java | 5 + .../spanner/admin/instance/v1/Instance.java | 98 ++++++++ .../admin/instance/v1/InstanceOrBuilder.java | 15 ++ .../v1/SpannerInstanceAdminProto.java | 232 +++++++++--------- .../instance/v1/spanner_instance_admin.proto | 5 + synth.metadata | 6 +- 6 files changed, 246 insertions(+), 115 deletions(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java index 9306e37065..1b2d628b26 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java @@ -374,6 +374,7 @@ public void getInstanceTest() throws Exception { .setConfig(InstanceConfigName.of("[PROJECT]", "[INSTANCE_CONFIG]").toString()) .setDisplayName("displayName1714148973") .setNodeCount(1539922066) + .setProcessingUnits(-329117885) .putAllLabels(new HashMap()) .addAllEndpointUris(new ArrayList()) .build(); @@ -417,6 +418,7 @@ public void getInstanceTest2() throws Exception { .setConfig(InstanceConfigName.of("[PROJECT]", "[INSTANCE_CONFIG]").toString()) .setDisplayName("displayName1714148973") .setNodeCount(1539922066) + .setProcessingUnits(-329117885) .putAllLabels(new HashMap()) .addAllEndpointUris(new ArrayList()) .build(); @@ -460,6 +462,7 @@ public void createInstanceTest() throws Exception { .setConfig(InstanceConfigName.of("[PROJECT]", "[INSTANCE_CONFIG]").toString()) .setDisplayName("displayName1714148973") .setNodeCount(1539922066) + .setProcessingUnits(-329117885) .putAllLabels(new HashMap()) .addAllEndpointUris(new ArrayList()) .build(); @@ -517,6 +520,7 @@ public void createInstanceTest2() throws Exception { .setConfig(InstanceConfigName.of("[PROJECT]", "[INSTANCE_CONFIG]").toString()) .setDisplayName("displayName1714148973") .setNodeCount(1539922066) + .setProcessingUnits(-329117885) .putAllLabels(new HashMap()) .addAllEndpointUris(new ArrayList()) .build(); @@ -574,6 +578,7 @@ public void updateInstanceTest() throws Exception { .setConfig(InstanceConfigName.of("[PROJECT]", "[INSTANCE_CONFIG]").toString()) .setDisplayName("displayName1714148973") .setNodeCount(1539922066) + .setProcessingUnits(-329117885) .putAllLabels(new HashMap()) .addAllEndpointUris(new ArrayList()) .build(); diff --git a/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java b/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java index be60c8987a..f085c9f5ca 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java +++ b/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java @@ -131,6 +131,11 @@ private Instance( endpointUris_.add(s); break; } + case 72: + { + processingUnits_ = input.readInt32(); + break; + } default: { if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { @@ -525,6 +530,26 @@ public int getNodeCount() { return nodeCount_; } + public static final int PROCESSING_UNITS_FIELD_NUMBER = 9; + private int processingUnits_; + /** + * + * + *
+   * The number of processing units allocated to this instance. At most one of
+   * processing_units or node_count should be present in the message. This may
+   * be zero in API responses for instances that are not yet in state `READY`.
+   * 
+ * + * int32 processing_units = 9; + * + * @return The processingUnits. + */ + @java.lang.Override + public int getProcessingUnits() { + return processingUnits_; + } + public static final int STATE_FIELD_NUMBER = 6; private int state_; /** @@ -837,6 +862,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < endpointUris_.size(); i++) { com.google.protobuf.GeneratedMessageV3.writeString(output, 8, endpointUris_.getRaw(i)); } + if (processingUnits_ != 0) { + output.writeInt32(9, processingUnits_); + } unknownFields.writeTo(output); } @@ -880,6 +908,9 @@ public int getSerializedSize() { size += dataSize; size += 1 * getEndpointUrisList().size(); } + if (processingUnits_ != 0) { + size += com.google.protobuf.CodedOutputStream.computeInt32Size(9, processingUnits_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -900,6 +931,7 @@ public boolean equals(final java.lang.Object obj) { if (!getConfig().equals(other.getConfig())) return false; if (!getDisplayName().equals(other.getDisplayName())) return false; if (getNodeCount() != other.getNodeCount()) return false; + if (getProcessingUnits() != other.getProcessingUnits()) return false; if (state_ != other.state_) return false; if (!internalGetLabels().equals(other.internalGetLabels())) return false; if (!getEndpointUrisList().equals(other.getEndpointUrisList())) return false; @@ -922,6 +954,8 @@ public int hashCode() { hash = (53 * hash) + getDisplayName().hashCode(); hash = (37 * hash) + NODE_COUNT_FIELD_NUMBER; hash = (53 * hash) + getNodeCount(); + hash = (37 * hash) + PROCESSING_UNITS_FIELD_NUMBER; + hash = (53 * hash) + getProcessingUnits(); hash = (37 * hash) + STATE_FIELD_NUMBER; hash = (53 * hash) + state_; if (!internalGetLabels().getMap().isEmpty()) { @@ -1105,6 +1139,8 @@ public Builder clear() { nodeCount_ = 0; + processingUnits_ = 0; + state_ = 0; internalGetMutableLabels().clear(); @@ -1142,6 +1178,7 @@ public com.google.spanner.admin.instance.v1.Instance buildPartial() { result.config_ = config_; result.displayName_ = displayName_; result.nodeCount_ = nodeCount_; + result.processingUnits_ = processingUnits_; result.state_ = state_; result.labels_ = internalGetLabels(); result.labels_.makeImmutable(); @@ -1214,6 +1251,9 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.Instance other) { if (other.getNodeCount() != 0) { setNodeCount(other.getNodeCount()); } + if (other.getProcessingUnits() != 0) { + setProcessingUnits(other.getProcessingUnits()); + } if (other.state_ != 0) { setStateValue(other.getStateValue()); } @@ -1676,6 +1716,64 @@ public Builder clearNodeCount() { return this; } + private int processingUnits_; + /** + * + * + *
+     * The number of processing units allocated to this instance. At most one of
+     * processing_units or node_count should be present in the message. This may
+     * be zero in API responses for instances that are not yet in state `READY`.
+     * 
+ * + * int32 processing_units = 9; + * + * @return The processingUnits. + */ + @java.lang.Override + public int getProcessingUnits() { + return processingUnits_; + } + /** + * + * + *
+     * The number of processing units allocated to this instance. At most one of
+     * processing_units or node_count should be present in the message. This may
+     * be zero in API responses for instances that are not yet in state `READY`.
+     * 
+ * + * int32 processing_units = 9; + * + * @param value The processingUnits to set. + * @return This builder for chaining. + */ + public Builder setProcessingUnits(int value) { + + processingUnits_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * The number of processing units allocated to this instance. At most one of
+     * processing_units or node_count should be present in the message. This may
+     * be zero in API responses for instances that are not yet in state `READY`.
+     * 
+ * + * int32 processing_units = 9; + * + * @return This builder for chaining. + */ + public Builder clearProcessingUnits() { + + processingUnits_ = 0; + onChanged(); + return this; + } + private int state_ = 0; /** * diff --git a/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceOrBuilder.java b/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceOrBuilder.java index 65b0b6387e..a41182efe9 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceOrBuilder.java +++ b/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceOrBuilder.java @@ -129,6 +129,21 @@ public interface InstanceOrBuilder */ int getNodeCount(); + /** + * + * + *
+   * The number of processing units allocated to this instance. At most one of
+   * processing_units or node_count should be present in the message. This may
+   * be zero in API responses for instances that are not yet in state `READY`.
+   * 
+ * + * int32 processing_units = 9; + * + * @return The processingUnits. + */ + int getProcessingUnits(); + /** * * diff --git a/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java b/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java index b26d561ece..e0aca3251e 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java +++ b/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java @@ -117,119 +117,120 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "in.instance.v1.ReplicaInfo:`\352A]\n%spanner" + ".googleapis.com/InstanceConfig\0224projects" + "/{project}/instanceConfigs/{instance_con" - + "fig}\"\332\003\n\010Instance\022\014\n\004name\030\001 \001(\t\022:\n\006confi" + + "fig}\"\364\003\n\010Instance\022\014\n\004name\030\001 \001(\t\022:\n\006confi" + "g\030\002 \001(\tB*\372A\'\n%spanner.googleapis.com/Ins" + "tanceConfig\022\024\n\014display_name\030\003 \001(\t\022\022\n\nnod" - + "e_count\030\005 \001(\005\022D\n\005state\030\006 \001(\01620.google.sp" - + "anner.admin.instance.v1.Instance.StateB\003" - + "\340A\003\022F\n\006labels\030\007 \003(\01326.google.spanner.adm" - + "in.instance.v1.Instance.LabelsEntry\022\025\n\re" - + "ndpoint_uris\030\010 \003(\t\032-\n\013LabelsEntry\022\013\n\003key" - + "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"7\n\005State\022\025\n\021ST" - + "ATE_UNSPECIFIED\020\000\022\014\n\010CREATING\020\001\022\t\n\005READY" - + "\020\002:M\352AJ\n\037spanner.googleapis.com/Instance" - + "\022\'projects/{project}/instances/{instance" - + "}\"\210\001\n\032ListInstanceConfigsRequest\022C\n\006pare" - + "nt\030\001 \001(\tB3\340A\002\372A-\n+cloudresourcemanager.g" - + "oogleapis.com/Project\022\021\n\tpage_size\030\002 \001(\005" - + "\022\022\n\npage_token\030\003 \001(\t\"\202\001\n\033ListInstanceCon" - + "figsResponse\022J\n\020instance_configs\030\001 \003(\01320" - + ".google.spanner.admin.instance.v1.Instan" - + "ceConfig\022\027\n\017next_page_token\030\002 \001(\t\"W\n\030Get" - + "InstanceConfigRequest\022;\n\004name\030\001 \001(\tB-\340A\002" - + "\372A\'\n%spanner.googleapis.com/InstanceConf" - + "ig\"{\n\022GetInstanceRequest\0225\n\004name\030\001 \001(\tB\'" - + "\340A\002\372A!\n\037spanner.googleapis.com/Instance\022" - + ".\n\nfield_mask\030\002 \001(\0132\032.google.protobuf.Fi" - + "eldMask\"\271\001\n\025CreateInstanceRequest\022C\n\006par" - + "ent\030\001 \001(\tB3\340A\002\372A-\n+cloudresourcemanager." - + "googleapis.com/Project\022\030\n\013instance_id\030\002 " - + "\001(\tB\003\340A\002\022A\n\010instance\030\003 \001(\0132*.google.span" - + "ner.admin.instance.v1.InstanceB\003\340A\002\"\222\001\n\024" - + "ListInstancesRequest\022C\n\006parent\030\001 \001(\tB3\340A" - + "\002\372A-\n+cloudresourcemanager.googleapis.co" - + "m/Project\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_tok" - + "en\030\003 \001(\t\022\016\n\006filter\030\004 \001(\t\"o\n\025ListInstance" - + "sResponse\022=\n\tinstances\030\001 \003(\0132*.google.sp" - + "anner.admin.instance.v1.Instance\022\027\n\017next" - + "_page_token\030\002 \001(\t\"\217\001\n\025UpdateInstanceRequ" - + "est\022A\n\010instance\030\001 \001(\0132*.google.spanner.a" - + "dmin.instance.v1.InstanceB\003\340A\002\0223\n\nfield_" - + "mask\030\002 \001(\0132\032.google.protobuf.FieldMaskB\003" - + "\340A\002\"N\n\025DeleteInstanceRequest\0225\n\004name\030\001 \001" - + "(\tB\'\340A\002\372A!\n\037spanner.googleapis.com/Insta" - + "nce\"\345\001\n\026CreateInstanceMetadata\022<\n\010instan" - + "ce\030\001 \001(\0132*.google.spanner.admin.instance" - + ".v1.Instance\022.\n\nstart_time\030\002 \001(\0132\032.googl" - + "e.protobuf.Timestamp\022/\n\013cancel_time\030\003 \001(" - + "\0132\032.google.protobuf.Timestamp\022,\n\010end_tim" - + "e\030\004 \001(\0132\032.google.protobuf.Timestamp\"\345\001\n\026" - + "UpdateInstanceMetadata\022<\n\010instance\030\001 \001(\013" - + "2*.google.spanner.admin.instance.v1.Inst" - + "ance\022.\n\nstart_time\030\002 \001(\0132\032.google.protob" - + "uf.Timestamp\022/\n\013cancel_time\030\003 \001(\0132\032.goog" - + "le.protobuf.Timestamp\022,\n\010end_time\030\004 \001(\0132" - + "\032.google.protobuf.Timestamp2\277\020\n\rInstance" - + "Admin\022\314\001\n\023ListInstanceConfigs\022<.google.s" - + "panner.admin.instance.v1.ListInstanceCon" - + "figsRequest\032=.google.spanner.admin.insta" - + "nce.v1.ListInstanceConfigsResponse\"8\202\323\344\223" - + "\002)\022\'/v1/{parent=projects/*}/instanceConf" - + "igs\332A\006parent\022\271\001\n\021GetInstanceConfig\022:.goo" - + "gle.spanner.admin.instance.v1.GetInstanc" - + "eConfigRequest\0320.google.spanner.admin.in" - + "stance.v1.InstanceConfig\"6\202\323\344\223\002)\022\'/v1/{n" - + "ame=projects/*/instanceConfigs/*}\332A\004name" - + "\022\264\001\n\rListInstances\0226.google.spanner.admi" - + "n.instance.v1.ListInstancesRequest\0327.goo" - + "gle.spanner.admin.instance.v1.ListInstan" - + "cesResponse\"2\202\323\344\223\002#\022!/v1/{parent=project" - + "s/*}/instances\332A\006parent\022\241\001\n\013GetInstance\022" - + "4.google.spanner.admin.instance.v1.GetIn" - + "stanceRequest\032*.google.spanner.admin.ins" - + "tance.v1.Instance\"0\202\323\344\223\002#\022!/v1/{name=pro" - + "jects/*/instances/*}\332A\004name\022\234\002\n\016CreateIn" - + "stance\0227.google.spanner.admin.instance.v" - + "1.CreateInstanceRequest\032\035.google.longrun" - + "ning.Operation\"\261\001\202\323\344\223\002&\"!/v1/{parent=pro" - + "jects/*}/instances:\001*\332A\033parent,instance_" - + "id,instance\312Ad\n)google.spanner.admin.ins" - + "tance.v1.Instance\0227google.spanner.admin." - + "instance.v1.CreateInstanceMetadata\022\235\002\n\016U" - + "pdateInstance\0227.google.spanner.admin.ins" - + "tance.v1.UpdateInstanceRequest\032\035.google." - + "longrunning.Operation\"\262\001\202\323\344\223\002/2*/v1/{ins" - + "tance.name=projects/*/instances/*}:\001*\332A\023" - + "instance,field_mask\312Ad\n)google.spanner.a" - + "dmin.instance.v1.Instance\0227google.spanne" - + "r.admin.instance.v1.UpdateInstanceMetada" - + "ta\022\223\001\n\016DeleteInstance\0227.google.spanner.a" - + "dmin.instance.v1.DeleteInstanceRequest\032\026" - + ".google.protobuf.Empty\"0\202\323\344\223\002#*!/v1/{nam" - + "e=projects/*/instances/*}\332A\004name\022\232\001\n\014Set" - + "IamPolicy\022\".google.iam.v1.SetIamPolicyRe" - + "quest\032\025.google.iam.v1.Policy\"O\202\323\344\223\0027\"2/v" - + "1/{resource=projects/*/instances/*}:setI" - + "amPolicy:\001*\332A\017resource,policy\022\223\001\n\014GetIam" - + "Policy\022\".google.iam.v1.GetIamPolicyReque" - + "st\032\025.google.iam.v1.Policy\"H\202\323\344\223\0027\"2/v1/{" - + "resource=projects/*/instances/*}:getIamP" - + "olicy:\001*\332A\010resource\022\305\001\n\022TestIamPermissio" - + "ns\022(.google.iam.v1.TestIamPermissionsReq" - + "uest\032).google.iam.v1.TestIamPermissionsR" - + "esponse\"Z\202\323\344\223\002=\"8/v1/{resource=projects/" - + "*/instances/*}:testIamPermissions:\001*\332A\024r" - + "esource,permissions\032x\312A\026spanner.googleap" - + "is.com\322A\\https://www.googleapis.com/auth" - + "/cloud-platform,https://www.googleapis.c" - + "om/auth/spanner.adminB\215\002\n$com.google.spa" - + "nner.admin.instance.v1B\031SpannerInstanceA" - + "dminProtoP\001ZHgoogle.golang.org/genproto/" - + "googleapis/spanner/admin/instance/v1;ins" - + "tance\252\002&Google.Cloud.Spanner.Admin.Insta" - + "nce.V1\312\002&Google\\Cloud\\Spanner\\Admin\\Inst" - + "ance\\V1\352\002+Google::Cloud::Spanner::Admin:" - + ":Instance::V1b\006proto3" + + "e_count\030\005 \001(\005\022\030\n\020processing_units\030\t \001(\005\022" + + "D\n\005state\030\006 \001(\01620.google.spanner.admin.in" + + "stance.v1.Instance.StateB\003\340A\003\022F\n\006labels\030" + + "\007 \003(\01326.google.spanner.admin.instance.v1" + + ".Instance.LabelsEntry\022\025\n\rendpoint_uris\030\010" + + " \003(\t\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005valu" + + "e\030\002 \001(\t:\0028\001\"7\n\005State\022\025\n\021STATE_UNSPECIFIE" + + "D\020\000\022\014\n\010CREATING\020\001\022\t\n\005READY\020\002:M\352AJ\n\037spann" + + "er.googleapis.com/Instance\022\'projects/{pr" + + "oject}/instances/{instance}\"\210\001\n\032ListInst" + + "anceConfigsRequest\022C\n\006parent\030\001 \001(\tB3\340A\002\372" + + "A-\n+cloudresourcemanager.googleapis.com/" + + "Project\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token" + + "\030\003 \001(\t\"\202\001\n\033ListInstanceConfigsResponse\022J" + + "\n\020instance_configs\030\001 \003(\01320.google.spanne" + + "r.admin.instance.v1.InstanceConfig\022\027\n\017ne" + + "xt_page_token\030\002 \001(\t\"W\n\030GetInstanceConfig" + + "Request\022;\n\004name\030\001 \001(\tB-\340A\002\372A\'\n%spanner.g" + + "oogleapis.com/InstanceConfig\"{\n\022GetInsta" + + "nceRequest\0225\n\004name\030\001 \001(\tB\'\340A\002\372A!\n\037spanne" + + "r.googleapis.com/Instance\022.\n\nfield_mask\030" + + "\002 \001(\0132\032.google.protobuf.FieldMask\"\271\001\n\025Cr" + + "eateInstanceRequest\022C\n\006parent\030\001 \001(\tB3\340A\002" + + "\372A-\n+cloudresourcemanager.googleapis.com" + + "/Project\022\030\n\013instance_id\030\002 \001(\tB\003\340A\002\022A\n\010in" + + "stance\030\003 \001(\0132*.google.spanner.admin.inst" + + "ance.v1.InstanceB\003\340A\002\"\222\001\n\024ListInstancesR" + + "equest\022C\n\006parent\030\001 \001(\tB3\340A\002\372A-\n+cloudres" + + "ourcemanager.googleapis.com/Project\022\021\n\tp" + + "age_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\022\016\n\006fi" + + "lter\030\004 \001(\t\"o\n\025ListInstancesResponse\022=\n\ti" + + "nstances\030\001 \003(\0132*.google.spanner.admin.in" + + "stance.v1.Instance\022\027\n\017next_page_token\030\002 " + + "\001(\t\"\217\001\n\025UpdateInstanceRequest\022A\n\010instanc" + + "e\030\001 \001(\0132*.google.spanner.admin.instance." + + "v1.InstanceB\003\340A\002\0223\n\nfield_mask\030\002 \001(\0132\032.g" + + "oogle.protobuf.FieldMaskB\003\340A\002\"N\n\025DeleteI" + + "nstanceRequest\0225\n\004name\030\001 \001(\tB\'\340A\002\372A!\n\037sp" + + "anner.googleapis.com/Instance\"\345\001\n\026Create" + + "InstanceMetadata\022<\n\010instance\030\001 \001(\0132*.goo" + + "gle.spanner.admin.instance.v1.Instance\022." + + "\n\nstart_time\030\002 \001(\0132\032.google.protobuf.Tim" + + "estamp\022/\n\013cancel_time\030\003 \001(\0132\032.google.pro" + + "tobuf.Timestamp\022,\n\010end_time\030\004 \001(\0132\032.goog" + + "le.protobuf.Timestamp\"\345\001\n\026UpdateInstance" + + "Metadata\022<\n\010instance\030\001 \001(\0132*.google.span" + + "ner.admin.instance.v1.Instance\022.\n\nstart_" + + "time\030\002 \001(\0132\032.google.protobuf.Timestamp\022/" + + "\n\013cancel_time\030\003 \001(\0132\032.google.protobuf.Ti" + + "mestamp\022,\n\010end_time\030\004 \001(\0132\032.google.proto" + + "buf.Timestamp2\277\020\n\rInstanceAdmin\022\314\001\n\023List" + + "InstanceConfigs\022<.google.spanner.admin.i" + + "nstance.v1.ListInstanceConfigsRequest\032=." + + "google.spanner.admin.instance.v1.ListIns" + + "tanceConfigsResponse\"8\202\323\344\223\002)\022\'/v1/{paren" + + "t=projects/*}/instanceConfigs\332A\006parent\022\271" + + "\001\n\021GetInstanceConfig\022:.google.spanner.ad" + + "min.instance.v1.GetInstanceConfigRequest" + + "\0320.google.spanner.admin.instance.v1.Inst" + + "anceConfig\"6\202\323\344\223\002)\022\'/v1/{name=projects/*" + + "/instanceConfigs/*}\332A\004name\022\264\001\n\rListInsta" + + "nces\0226.google.spanner.admin.instance.v1." + + "ListInstancesRequest\0327.google.spanner.ad" + + "min.instance.v1.ListInstancesResponse\"2\202" + + "\323\344\223\002#\022!/v1/{parent=projects/*}/instances" + + "\332A\006parent\022\241\001\n\013GetInstance\0224.google.spann" + + "er.admin.instance.v1.GetInstanceRequest\032" + + "*.google.spanner.admin.instance.v1.Insta" + + "nce\"0\202\323\344\223\002#\022!/v1/{name=projects/*/instan" + + "ces/*}\332A\004name\022\234\002\n\016CreateInstance\0227.googl" + + "e.spanner.admin.instance.v1.CreateInstan" + + "ceRequest\032\035.google.longrunning.Operation" + + "\"\261\001\202\323\344\223\002&\"!/v1/{parent=projects/*}/insta" + + "nces:\001*\332A\033parent,instance_id,instance\312Ad" + + "\n)google.spanner.admin.instance.v1.Insta" + + "nce\0227google.spanner.admin.instance.v1.Cr" + + "eateInstanceMetadata\022\235\002\n\016UpdateInstance\022" + + "7.google.spanner.admin.instance.v1.Updat" + + "eInstanceRequest\032\035.google.longrunning.Op" + + "eration\"\262\001\202\323\344\223\002/2*/v1/{instance.name=pro" + + "jects/*/instances/*}:\001*\332A\023instance,field" + + "_mask\312Ad\n)google.spanner.admin.instance." + + "v1.Instance\0227google.spanner.admin.instan" + + "ce.v1.UpdateInstanceMetadata\022\223\001\n\016DeleteI" + + "nstance\0227.google.spanner.admin.instance." + + "v1.DeleteInstanceRequest\032\026.google.protob" + + "uf.Empty\"0\202\323\344\223\002#*!/v1/{name=projects/*/i" + + "nstances/*}\332A\004name\022\232\001\n\014SetIamPolicy\022\".go" + + "ogle.iam.v1.SetIamPolicyRequest\032\025.google" + + ".iam.v1.Policy\"O\202\323\344\223\0027\"2/v1/{resource=pr" + + "ojects/*/instances/*}:setIamPolicy:\001*\332A\017" + + "resource,policy\022\223\001\n\014GetIamPolicy\022\".googl" + + "e.iam.v1.GetIamPolicyRequest\032\025.google.ia" + + "m.v1.Policy\"H\202\323\344\223\0027\"2/v1/{resource=proje" + + "cts/*/instances/*}:getIamPolicy:\001*\332A\010res" + + "ource\022\305\001\n\022TestIamPermissions\022(.google.ia" + + "m.v1.TestIamPermissionsRequest\032).google." + + "iam.v1.TestIamPermissionsResponse\"Z\202\323\344\223\002" + + "=\"8/v1/{resource=projects/*/instances/*}" + + ":testIamPermissions:\001*\332A\024resource,permis" + + "sions\032x\312A\026spanner.googleapis.com\322A\\https" + + "://www.googleapis.com/auth/cloud-platfor" + + "m,https://www.googleapis.com/auth/spanne" + + "r.adminB\215\002\n$com.google.spanner.admin.ins" + + "tance.v1B\031SpannerInstanceAdminProtoP\001ZHg" + + "oogle.golang.org/genproto/googleapis/spa" + + "nner/admin/instance/v1;instance\252\002&Google" + + ".Cloud.Spanner.Admin.Instance.V1\312\002&Googl" + + "e\\Cloud\\Spanner\\Admin\\Instance\\V1\352\002+Goog" + + "le::Cloud::Spanner::Admin::Instance::V1b" + + "\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -268,7 +269,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_spanner_admin_instance_v1_Instance_descriptor, new java.lang.String[] { - "Name", "Config", "DisplayName", "NodeCount", "State", "Labels", "EndpointUris", + "Name", + "Config", + "DisplayName", + "NodeCount", + "ProcessingUnits", + "State", + "Labels", + "EndpointUris", }); internal_static_google_spanner_admin_instance_v1_Instance_LabelsEntry_descriptor = internal_static_google_spanner_admin_instance_v1_Instance_descriptor diff --git a/proto-google-cloud-spanner-admin-instance-v1/src/main/proto/google/spanner/admin/instance/v1/spanner_instance_admin.proto b/proto-google-cloud-spanner-admin-instance-v1/src/main/proto/google/spanner/admin/instance/v1/spanner_instance_admin.proto index 69043c1b37..5630d65327 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/src/main/proto/google/spanner/admin/instance/v1/spanner_instance_admin.proto +++ b/proto-google-cloud-spanner-admin-instance-v1/src/main/proto/google/spanner/admin/instance/v1/spanner_instance_admin.proto @@ -368,6 +368,11 @@ message Instance { // for more information about nodes. int32 node_count = 5; + // The number of processing units allocated to this instance. At most one of + // processing_units or node_count should be present in the message. This may + // be zero in API responses for instances that are not yet in state `READY`. + int32 processing_units = 9; + // Output only. The current instance state. For // [CreateInstance][google.spanner.admin.instance.v1.InstanceAdmin.CreateInstance], the state must be // either omitted or set to `CREATING`. For diff --git a/synth.metadata b/synth.metadata index 15c6a7ad2f..e900375721 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,15 +4,15 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-spanner.git", - "sha": "a8a6fdff06d74b77673644381de42f991cf07ca5" + "sha": "7d7f390604829c497f41c12fd51a44e0c2d23ea8" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "08c4eeb531c01ad031134dca94b18e3f7dd35902", - "internalRef": "378718217" + "sha": "d8698715e4f5b7c45505dadd679255987c260180", + "internalRef": "378758342" } }, {