Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 5e741b1

Browse files
feat(v1beta1): add endpoint to OperationMetadata, upgrade_info to IsInstanceUpgradeableResponse (#47)
* feat: update third party protos with URLs and latest fields PiperOrigin-RevId: 333377977 Source-Author: Google APIs <[email protected]> Source-Date: Wed Sep 23 14:49:46 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 989670e868daaad6ce0306e6ec1b9ff40659c19e Source-Link: googleapis/googleapis@989670e * chore: allow proto interface changes Co-authored-by: Jeff Ching <[email protected]>
1 parent b4dff3d commit 5e741b1

File tree

20 files changed

+645
-94
lines changed

20 files changed

+645
-94
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ target/
1212

1313
# python utilities
1414
*.pyc
15-
__pycache__
15+
__pycache__
16+
17+
.flattened-pom.xml

google-cloud-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/NotebookServiceClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
// AUTO-GENERATED DOCUMENTATION AND SERVICE
4242
/**
43-
* Service Description: API service for Cloud AI Platform Notebooks.
43+
* Service Description: API v1beta1 service for Cloud AI Platform Notebooks.
4444
*
4545
* <p>This class provides the ability to make remote calls to the backing service through method
4646
* calls that map to API methods. Sample code to get started:

google-cloud-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* <p>===================== NotebookServiceClient =====================
2323
*
24-
* <p>Service Description: API service for Cloud AI Platform Notebooks.
24+
* <p>Service Description: API v1beta1 service for Cloud AI Platform Notebooks.
2525
*
2626
* <p>Sample for NotebookServiceClient:
2727
*

google-cloud-notebooks/src/test/java/com/google/cloud/notebooks/v1beta1/NotebookServiceClientTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,10 +1034,12 @@ public void reportInstanceInfoExceptionTest() throws Exception {
10341034
public void isInstanceUpgradeableTest() {
10351035
boolean upgradeable = true;
10361036
String upgradeVersion = "upgradeVersion1040155061";
1037+
String upgradeInfo = "upgradeInfo-1337232143";
10371038
IsInstanceUpgradeableResponse expectedResponse =
10381039
IsInstanceUpgradeableResponse.newBuilder()
10391040
.setUpgradeable(upgradeable)
10401041
.setUpgradeVersion(upgradeVersion)
1042+
.setUpgradeInfo(upgradeInfo)
10411043
.build();
10421044
mockNotebookService.addResponse(expectedResponse);
10431045

grpc-google-cloud-notebooks-v1beta1/src/main/java/com/google/cloud/notebooks/v1beta1/NotebookServiceGrpc.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
*
2828
* <pre>
29-
* API service for Cloud AI Platform Notebooks.
29+
* API v1beta1 service for Cloud AI Platform Notebooks.
3030
* </pre>
3131
*/
3232
@javax.annotation.Generated(
@@ -969,7 +969,7 @@ public NotebookServiceFutureStub newStub(
969969
*
970970
*
971971
* <pre>
972-
* API service for Cloud AI Platform Notebooks.
972+
* API v1beta1 service for Cloud AI Platform Notebooks.
973973
* </pre>
974974
*/
975975
public abstract static class NotebookServiceImplBase implements io.grpc.BindableService {
@@ -1362,7 +1362,7 @@ public final io.grpc.ServerServiceDefinition bindService() {
13621362
*
13631363
*
13641364
* <pre>
1365-
* API service for Cloud AI Platform Notebooks.
1365+
* API v1beta1 service for Cloud AI Platform Notebooks.
13661366
* </pre>
13671367
*/
13681368
public static final class NotebookServiceStub
@@ -1697,7 +1697,7 @@ public void deleteEnvironment(
16971697
*
16981698
*
16991699
* <pre>
1700-
* API service for Cloud AI Platform Notebooks.
1700+
* API v1beta1 service for Cloud AI Platform Notebooks.
17011701
* </pre>
17021702
*/
17031703
public static final class NotebookServiceBlockingStub
@@ -1962,7 +1962,7 @@ public com.google.longrunning.Operation deleteEnvironment(
19621962
*
19631963
*
19641964
* <pre>
1965-
* API service for Cloud AI Platform Notebooks.
1965+
* API v1beta1 service for Cloud AI Platform Notebooks.
19661966
* </pre>
19671967
*/
19681968
public static final class NotebookServiceFutureStub
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3+
<differences>
4+
<difference>
5+
<differenceType>7012</differenceType>
6+
<className>com/google/cloud/notebooks/v1beta1/*OrBuilder</className>
7+
<method>* get*(*)</method>
8+
</difference>
9+
<difference>
10+
<differenceType>7012</differenceType>
11+
<className>com/google/cloud/notebooks/v1beta1/*OrBuilder</className>
12+
<method>boolean contains*(*)</method>
13+
</difference>
14+
<difference>
15+
<differenceType>7012</differenceType>
16+
<className>com/google/cloud/notebooks/v1beta1/*OrBuilder</className>
17+
<method>boolean has*(*)</method>
18+
</difference>
19+
</differences>

proto-google-cloud-notebooks-v1beta1/src/main/java/com/google/cloud/notebooks/v1beta1/Instance.java

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -794,6 +794,36 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
794794
* <code>DELETED = 6;</code>
795795
*/
796796
DELETED(6),
797+
/**
798+
*
799+
*
800+
* <pre>
801+
* The instance is upgrading.
802+
* </pre>
803+
*
804+
* <code>UPGRADING = 7;</code>
805+
*/
806+
UPGRADING(7),
807+
/**
808+
*
809+
*
810+
* <pre>
811+
* The instance is being created.
812+
* </pre>
813+
*
814+
* <code>INITIALIZING = 8;</code>
815+
*/
816+
INITIALIZING(8),
817+
/**
818+
*
819+
*
820+
* <pre>
821+
* The instance is getting registered.
822+
* </pre>
823+
*
824+
* <code>REGISTERING = 9;</code>
825+
*/
826+
REGISTERING(9),
797827
UNRECOGNIZED(-1),
798828
;
799829

@@ -868,6 +898,36 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
868898
* <code>DELETED = 6;</code>
869899
*/
870900
public static final int DELETED_VALUE = 6;
901+
/**
902+
*
903+
*
904+
* <pre>
905+
* The instance is upgrading.
906+
* </pre>
907+
*
908+
* <code>UPGRADING = 7;</code>
909+
*/
910+
public static final int UPGRADING_VALUE = 7;
911+
/**
912+
*
913+
*
914+
* <pre>
915+
* The instance is being created.
916+
* </pre>
917+
*
918+
* <code>INITIALIZING = 8;</code>
919+
*/
920+
public static final int INITIALIZING_VALUE = 8;
921+
/**
922+
*
923+
*
924+
* <pre>
925+
* The instance is getting registered.
926+
* </pre>
927+
*
928+
* <code>REGISTERING = 9;</code>
929+
*/
930+
public static final int REGISTERING_VALUE = 9;
871931

872932
public final int getNumber() {
873933
if (this == UNRECOGNIZED) {
@@ -907,6 +967,12 @@ public static State forNumber(int value) {
907967
return STOPPED;
908968
case 6:
909969
return DELETED;
970+
case 7:
971+
return UPGRADING;
972+
case 8:
973+
return INITIALIZING;
974+
case 9:
975+
return REGISTERING;
910976
default:
911977
return null;
912978
}
@@ -1000,6 +1066,16 @@ public enum DiskType implements com.google.protobuf.ProtocolMessageEnum {
10001066
* <code>PD_SSD = 2;</code>
10011067
*/
10021068
PD_SSD(2),
1069+
/**
1070+
*
1071+
*
1072+
* <pre>
1073+
* Balanced persistent disk type.
1074+
* </pre>
1075+
*
1076+
* <code>PD_BALANCED = 3;</code>
1077+
*/
1078+
PD_BALANCED(3),
10031079
UNRECOGNIZED(-1),
10041080
;
10051081

@@ -1033,6 +1109,16 @@ public enum DiskType implements com.google.protobuf.ProtocolMessageEnum {
10331109
* <code>PD_SSD = 2;</code>
10341110
*/
10351111
public static final int PD_SSD_VALUE = 2;
1112+
/**
1113+
*
1114+
*
1115+
* <pre>
1116+
* Balanced persistent disk type.
1117+
* </pre>
1118+
*
1119+
* <code>PD_BALANCED = 3;</code>
1120+
*/
1121+
public static final int PD_BALANCED_VALUE = 3;
10361122

10371123
public final int getNumber() {
10381124
if (this == UNRECOGNIZED) {
@@ -1064,6 +1150,8 @@ public static DiskType forNumber(int value) {
10641150
return PD_STANDARD;
10651151
case 2:
10661152
return PD_SSD;
1153+
case 3:
1154+
return PD_BALANCED;
10671155
default:
10681156
return null;
10691157
}

proto-google-cloud-notebooks-v1beta1/src/main/java/com/google/cloud/notebooks/v1beta1/InstanceProto.java

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
5858
+ "/api/resource.proto\0320google/cloud/notebo"
5959
+ "oks/v1beta1/environment.proto\032\037google/pr"
6060
+ "otobuf/timestamp.proto\032\034google/api/annot"
61-
+ "ations.proto\"\370\017\n\010Instance\022\021\n\004name\030\001 \001(\tB"
61+
+ "ations.proto\"\274\020\n\010Instance\022\021\n\004name\030\001 \001(\tB"
6262
+ "\003\340A\003\022;\n\010vm_image\030\002 \001(\0132\'.google.cloud.no"
6363
+ "tebooks.v1beta1.VmImageH\000\022I\n\017container_i"
6464
+ "mage\030\003 \001(\0132..google.cloud.notebooks.v1be"
@@ -100,22 +100,24 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
100100
+ "\003\022\023\n\017NVIDIA_TESLA_P4\020\004\022\023\n\017NVIDIA_TESLA_T"
101101
+ "4\020\005\022\027\n\023NVIDIA_TESLA_T4_VWS\020\010\022\031\n\025NVIDIA_T"
102102
+ "ESLA_P100_VWS\020\t\022\027\n\023NVIDIA_TESLA_P4_VWS\020\n"
103-
+ "\022\n\n\006TPU_V2\020\006\022\n\n\006TPU_V3\020\007\"r\n\005State\022\025\n\021STA"
104-
+ "TE_UNSPECIFIED\020\000\022\014\n\010STARTING\020\001\022\020\n\014PROVIS"
105-
+ "IONING\020\002\022\n\n\006ACTIVE\020\003\022\014\n\010STOPPING\020\004\022\013\n\007ST"
106-
+ "OPPED\020\005\022\013\n\007DELETED\020\006\"B\n\010DiskType\022\031\n\025DISK"
107-
+ "_TYPE_UNSPECIFIED\020\000\022\017\n\013PD_STANDARD\020\001\022\n\n\006"
108-
+ "PD_SSD\020\002\"E\n\016DiskEncryption\022\037\n\033DISK_ENCRY"
109-
+ "PTION_UNSPECIFIED\020\000\022\010\n\004GMEK\020\001\022\010\n\004CMEK\020\002:"
110-
+ "O\352AL\n!notebooks.googleapis.com/Instance\022"
111-
+ "\'projects/{project}/instances/{instance}"
112-
+ "B\r\n\013environmentB\344\001\n\"com.google.cloud.not"
113-
+ "ebooks.v1beta1B\rInstanceProtoP\001ZGgoogle."
114-
+ "golang.org/genproto/googleapis/cloud/not"
115-
+ "ebooks/v1beta1;notebooks\252\002\036Google.Cloud."
116-
+ "Notebooks.V1Beta1\312\002\036Google\\Cloud\\Noteboo"
117-
+ "ks\\V1Beta1\352\002!Google::Cloud::Notebooks::V"
118-
+ "1beta1b\006proto3"
103+
+ "\022\n\n\006TPU_V2\020\006\022\n\n\006TPU_V3\020\007\"\244\001\n\005State\022\025\n\021ST"
104+
+ "ATE_UNSPECIFIED\020\000\022\014\n\010STARTING\020\001\022\020\n\014PROVI"
105+
+ "SIONING\020\002\022\n\n\006ACTIVE\020\003\022\014\n\010STOPPING\020\004\022\013\n\007S"
106+
+ "TOPPED\020\005\022\013\n\007DELETED\020\006\022\r\n\tUPGRADING\020\007\022\020\n\014"
107+
+ "INITIALIZING\020\010\022\017\n\013REGISTERING\020\t\"S\n\010DiskT"
108+
+ "ype\022\031\n\025DISK_TYPE_UNSPECIFIED\020\000\022\017\n\013PD_STA"
109+
+ "NDARD\020\001\022\n\n\006PD_SSD\020\002\022\017\n\013PD_BALANCED\020\003\"E\n\016"
110+
+ "DiskEncryption\022\037\n\033DISK_ENCRYPTION_UNSPEC"
111+
+ "IFIED\020\000\022\010\n\004GMEK\020\001\022\010\n\004CMEK\020\002:O\352AL\n!notebo"
112+
+ "oks.googleapis.com/Instance\022\'projects/{p"
113+
+ "roject}/instances/{instance}B\r\n\013environm"
114+
+ "entB\344\001\n\"com.google.cloud.notebooks.v1bet"
115+
+ "a1B\rInstanceProtoP\001ZGgoogle.golang.org/g"
116+
+ "enproto/googleapis/cloud/notebooks/v1bet"
117+
+ "a1;notebooks\252\002\036Google.Cloud.Notebooks.V1"
118+
+ "Beta1\312\002\036Google\\Cloud\\Notebooks\\V1beta1\352\002"
119+
+ "!Google::Cloud::Notebooks::V1beta1b\006prot"
120+
+ "o3"
119121
};
120122
descriptor =
121123
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

0 commit comments

Comments
 (0)