From aba788114b246d97c8aa3ed6879ee9684840f5d3 Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Thu, 7 Dec 2023 15:24:20 -0600 Subject: [PATCH] Restore version --- .../registry/v1beta1/attributes.proto | 16 +-- .../vulcanize/registry/v1beta1/attributes.ts | 106 +++++++++++++----- 2 files changed, 85 insertions(+), 37 deletions(-) diff --git a/proto/vulcanize/registry/v1beta1/attributes.proto b/proto/vulcanize/registry/v1beta1/attributes.proto index ecfb8ec..d72b2fd 100644 --- a/proto/vulcanize/registry/v1beta1/attributes.proto +++ b/proto/vulcanize/registry/v1beta1/attributes.proto @@ -54,8 +54,9 @@ message ApplicationRecord { message DnsRecord { string type = 1 [(gogoproto.moretags) = "json:\"type\" yaml:\"type\""]; string name = 2 [(gogoproto.moretags) = "json:\"name\" yaml:\"name\""]; - string resource_type = 3 [(gogoproto.moretags) = "json:\"resourceType\" yaml:\"resourceType\""]; - string value = 4 [(gogoproto.moretags) = "json:\"value\" yaml:\"value\""]; + string version = 3 [(gogoproto.moretags) = "json:\"version\" yaml:\"version\""]; + string resource_type = 4 [(gogoproto.moretags) = "json:\"resourceType\" yaml:\"resourceType\""]; + string value = 5 [(gogoproto.moretags) = "json:\"value\" yaml:\"value\""]; string meta = 20 [(gogoproto.moretags) = "json:\"meta\" yaml:\"meta\""]; repeated string tags = 21 [(gogoproto.moretags) = "json:\"tags\" yaml:\"tags\""]; } @@ -63,15 +64,16 @@ message DnsRecord { message ApplicationDeploymentRequest { string type = 1 [(gogoproto.moretags) = "json:\"type\" yaml:\"type\""]; string name = 2 [(gogoproto.moretags) = "json:\"name\" yaml:\"name\""]; - string version = 4 [(gogoproto.moretags) = "json:\"version\" yaml:\"version\""]; - string application = 5 [(gogoproto.moretags) = "json:\"application\" yaml:\"application\""]; - string dns = 6 [(gogoproto.moretags) = "json:\"dns\" yaml:\"dns\""]; - string config = 7 [(gogoproto.moretags) = "json:\"config\" yaml:\"config\""]; + string version = 3 [(gogoproto.moretags) = "json:\"version\" yaml:\"version\""]; + string application = 4 [(gogoproto.moretags) = "json:\"application\" yaml:\"application\""]; + string dns = 5 [(gogoproto.moretags) = "json:\"dns\" yaml:\"dns\""]; + string config = 6 [(gogoproto.moretags) = "json:\"config\" yaml:\"config\""]; + repeated string crn = 7 [(gogoproto.moretags) = "json:\"crn\" yaml:\"crn\""]; string meta = 20 [(gogoproto.moretags) = "json:\"meta\" yaml:\"meta\""]; repeated string tags = 21 [(gogoproto.moretags) = "json:\"tags\" yaml:\"tags\""]; } -message WebAppDeploymentRecord { +message ApplicationDeploymentRecord { string type = 1 [(gogoproto.moretags) = "json:\"type\" yaml:\"type\""]; string name = 2 [(gogoproto.moretags) = "json:\"name\" yaml:\"name\""]; string description = 3 [(gogoproto.moretags) = "json:\"description\" yaml:\"description\""]; diff --git a/src/proto/vulcanize/registry/v1beta1/attributes.ts b/src/proto/vulcanize/registry/v1beta1/attributes.ts index 526a1dc..112dc01 100644 --- a/src/proto/vulcanize/registry/v1beta1/attributes.ts +++ b/src/proto/vulcanize/registry/v1beta1/attributes.ts @@ -951,6 +951,7 @@ export namespace vulcanize.registry.v1beta1 { constructor(data?: any[] | { type?: string; name?: string; + version?: string; resource_type?: string; value?: string; meta?: string; @@ -965,6 +966,9 @@ export namespace vulcanize.registry.v1beta1 { if ("name" in data && data.name != undefined) { this.name = data.name; } + if ("version" in data && data.version != undefined) { + this.version = data.version; + } if ("resource_type" in data && data.resource_type != undefined) { this.resource_type = data.resource_type; } @@ -991,18 +995,24 @@ export namespace vulcanize.registry.v1beta1 { set name(value: string) { pb_1.Message.setField(this, 2, value); } - get resource_type() { + get version() { return pb_1.Message.getFieldWithDefault(this, 3, "") as string; } - set resource_type(value: string) { + set version(value: string) { pb_1.Message.setField(this, 3, value); } - get value() { + get resource_type() { return pb_1.Message.getFieldWithDefault(this, 4, "") as string; } - set value(value: string) { + set resource_type(value: string) { pb_1.Message.setField(this, 4, value); } + get value() { + return pb_1.Message.getFieldWithDefault(this, 5, "") as string; + } + set value(value: string) { + pb_1.Message.setField(this, 5, value); + } get meta() { return pb_1.Message.getFieldWithDefault(this, 20, "") as string; } @@ -1018,6 +1028,7 @@ export namespace vulcanize.registry.v1beta1 { static fromObject(data: { type?: string; name?: string; + version?: string; resource_type?: string; value?: string; meta?: string; @@ -1030,6 +1041,9 @@ export namespace vulcanize.registry.v1beta1 { if (data.name != null) { message.name = data.name; } + if (data.version != null) { + message.version = data.version; + } if (data.resource_type != null) { message.resource_type = data.resource_type; } @@ -1048,6 +1062,7 @@ export namespace vulcanize.registry.v1beta1 { const data: { type?: string; name?: string; + version?: string; resource_type?: string; value?: string; meta?: string; @@ -1059,6 +1074,9 @@ export namespace vulcanize.registry.v1beta1 { if (this.name != null) { data.name = this.name; } + if (this.version != null) { + data.version = this.version; + } if (this.resource_type != null) { data.resource_type = this.resource_type; } @@ -1081,10 +1099,12 @@ export namespace vulcanize.registry.v1beta1 { writer.writeString(1, this.type); if (this.name.length) writer.writeString(2, this.name); + if (this.version.length) + writer.writeString(3, this.version); if (this.resource_type.length) - writer.writeString(3, this.resource_type); + writer.writeString(4, this.resource_type); if (this.value.length) - writer.writeString(4, this.value); + writer.writeString(5, this.value); if (this.meta.length) writer.writeString(20, this.meta); if (this.tags.length) @@ -1105,9 +1125,12 @@ export namespace vulcanize.registry.v1beta1 { message.name = reader.readString(); break; case 3: - message.resource_type = reader.readString(); + message.version = reader.readString(); break; case 4: + message.resource_type = reader.readString(); + break; + case 5: message.value = reader.readString(); break; case 20: @@ -1137,11 +1160,12 @@ export namespace vulcanize.registry.v1beta1 { application?: string; dns?: string; config?: string; + crn?: string[]; meta?: string; tags?: string[]; }) { super(); - pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [21], this.#one_of_decls); + pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [7, 21], this.#one_of_decls); if (!Array.isArray(data) && typeof data == "object") { if ("type" in data && data.type != undefined) { this.type = data.type; @@ -1161,6 +1185,9 @@ export namespace vulcanize.registry.v1beta1 { if ("config" in data && data.config != undefined) { this.config = data.config; } + if ("crn" in data && data.crn != undefined) { + this.crn = data.crn; + } if ("meta" in data && data.meta != undefined) { this.meta = data.meta; } @@ -1182,27 +1209,33 @@ export namespace vulcanize.registry.v1beta1 { pb_1.Message.setField(this, 2, value); } get version() { - return pb_1.Message.getFieldWithDefault(this, 4, "") as string; + return pb_1.Message.getFieldWithDefault(this, 3, "") as string; } set version(value: string) { - pb_1.Message.setField(this, 4, value); + pb_1.Message.setField(this, 3, value); } get application() { - return pb_1.Message.getFieldWithDefault(this, 5, "") as string; + return pb_1.Message.getFieldWithDefault(this, 4, "") as string; } set application(value: string) { - pb_1.Message.setField(this, 5, value); + pb_1.Message.setField(this, 4, value); } get dns() { - return pb_1.Message.getFieldWithDefault(this, 6, "") as string; + return pb_1.Message.getFieldWithDefault(this, 5, "") as string; } set dns(value: string) { - pb_1.Message.setField(this, 6, value); + pb_1.Message.setField(this, 5, value); } get config() { - return pb_1.Message.getFieldWithDefault(this, 7, "") as string; + return pb_1.Message.getFieldWithDefault(this, 6, "") as string; } set config(value: string) { + pb_1.Message.setField(this, 6, value); + } + get crn() { + return pb_1.Message.getFieldWithDefault(this, 7, []) as string[]; + } + set crn(value: string[]) { pb_1.Message.setField(this, 7, value); } get meta() { @@ -1224,6 +1257,7 @@ export namespace vulcanize.registry.v1beta1 { application?: string; dns?: string; config?: string; + crn?: string[]; meta?: string; tags?: string[]; }): ApplicationDeploymentRequest { @@ -1246,6 +1280,9 @@ export namespace vulcanize.registry.v1beta1 { if (data.config != null) { message.config = data.config; } + if (data.crn != null) { + message.crn = data.crn; + } if (data.meta != null) { message.meta = data.meta; } @@ -1262,6 +1299,7 @@ export namespace vulcanize.registry.v1beta1 { application?: string; dns?: string; config?: string; + crn?: string[]; meta?: string; tags?: string[]; } = {}; @@ -1283,6 +1321,9 @@ export namespace vulcanize.registry.v1beta1 { if (this.config != null) { data.config = this.config; } + if (this.crn != null) { + data.crn = this.crn; + } if (this.meta != null) { data.meta = this.meta; } @@ -1300,13 +1341,15 @@ export namespace vulcanize.registry.v1beta1 { if (this.name.length) writer.writeString(2, this.name); if (this.version.length) - writer.writeString(4, this.version); + writer.writeString(3, this.version); if (this.application.length) - writer.writeString(5, this.application); + writer.writeString(4, this.application); if (this.dns.length) - writer.writeString(6, this.dns); + writer.writeString(5, this.dns); if (this.config.length) - writer.writeString(7, this.config); + writer.writeString(6, this.config); + if (this.crn.length) + writer.writeRepeatedString(7, this.crn); if (this.meta.length) writer.writeString(20, this.meta); if (this.tags.length) @@ -1326,18 +1369,21 @@ export namespace vulcanize.registry.v1beta1 { case 2: message.name = reader.readString(); break; - case 4: + case 3: message.version = reader.readString(); break; - case 5: + case 4: message.application = reader.readString(); break; - case 6: + case 5: message.dns = reader.readString(); break; - case 7: + case 6: message.config = reader.readString(); break; + case 7: + pb_1.Message.addToRepeatedField(message, 7, reader.readString()); + break; case 20: message.meta = reader.readString(); break; @@ -1356,7 +1402,7 @@ export namespace vulcanize.registry.v1beta1 { return ApplicationDeploymentRequest.deserialize(bytes); } } - export class WebAppDeploymentRecord extends pb_1.Message { + export class ApplicationDeploymentRecord extends pb_1.Message { #one_of_decls: number[][] = []; constructor(data?: any[] | { type?: string; @@ -1476,8 +1522,8 @@ export namespace vulcanize.registry.v1beta1 { request?: string; meta?: string; tags?: string[]; - }): WebAppDeploymentRecord { - const message = new WebAppDeploymentRecord({}); + }): ApplicationDeploymentRecord { + const message = new ApplicationDeploymentRecord({}); if (data.type != null) { message.type = data.type; } @@ -1582,8 +1628,8 @@ export namespace vulcanize.registry.v1beta1 { if (!w) return writer.getResultBuffer(); } - static deserialize(bytes: Uint8Array | pb_1.BinaryReader): WebAppDeploymentRecord { - const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new WebAppDeploymentRecord(); + static deserialize(bytes: Uint8Array | pb_1.BinaryReader): ApplicationDeploymentRecord { + const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new ApplicationDeploymentRecord(); while (reader.nextField()) { if (reader.isEndGroup()) break; @@ -1626,8 +1672,8 @@ export namespace vulcanize.registry.v1beta1 { serializeBinary(): Uint8Array { return this.serialize(); } - static deserializeBinary(bytes: Uint8Array): WebAppDeploymentRecord { - return WebAppDeploymentRecord.deserialize(bytes); + static deserializeBinary(bytes: Uint8Array): ApplicationDeploymentRecord { + return ApplicationDeploymentRecord.deserialize(bytes); } } export class GeneralRecord extends pb_1.Message {